fix etcd for kubeadm1.13

dersell · Dec 16, 2018 · 7405cff · 7405cff
1 parent ebca266
commit 7405cff
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 77 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -106,3 +106,6 @@ kubernetes_cloud_vsphere_default_password: ""
 kubernetes_cloud_vsphere_datacenters: []
 kubernetes_cloud_vsphere_network_options: []
 kubernetes_cloud_vsphere_disk_options: []
+
+#not use, changed in tasks
+all_etcd_on_master: false
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: check if etcd on first master
+  set_fact:
+    all_etcd_on_master: true
+  when: groups.etcd == groups.k8s_masters
+
+- debug: var=all_etcd_on_master
 
 - name: Load a variable file based on the OS type, or a default if not found. Using free-form to specify the file.
   include_vars: "{{ item }}"
@@ -54,13 +60,6 @@
   - inventory_hostname in groups.etcd
   - inventory_hostname not in groups.k8s_masters
 
-
-- name: include master with etcd prepare tasks
-  include_tasks: prepare_master_with_etcd.yml
-  when:
-    - inventory_hostname in groups.k8s_masters
-    - inventory_hostname in groups.etcd
-
 - name: include master tasks
   include_tasks: master.yml
   when: inventory_hostname in groups.k8s_masters

diff --git a/tasks/master-ha-bug-workaround.yml b/tasks/master-ha-bug-workaround.yml
diff --git a/tasks/master-ha.yml b/tasks/master-ha.yml
@@ -7,6 +7,8 @@
   with_items:
     - '{{ kubernetes_certs_dir }}/ca.crt'
     - '{{ kubernetes_certs_dir }}/ca.key'
+    - '{{ kubernetes_certs_dir }}/etcd/ca.crt'
+    - '{{ kubernetes_certs_dir }}/etcd/ca.key'
     - '{{ kubernetes_certs_dir }}/sa.key'
     - '{{ kubernetes_certs_dir }}/sa.pub'
     - '{{ kubernetes_certs_dir }}/front-proxy-ca.crt'

diff --git a/tasks/master.yml b/tasks/master.yml
@@ -13,6 +13,7 @@
     - '{{ kubernetes_etcd_apiserver_client_cert_file }}'
     - '{{ kubernetes_etcd_apiserver_client_key_file }}'
   register: etcd_apiserver_certs_register
+  when: all_etcd_on_master == false
 
 - name: copy etcd cert files to master nodes
   copy:
@@ -21,12 +22,12 @@
   with_items:
     - "{{ etcd_ca_certs_register.results }}"
     - "{{ etcd_apiserver_certs_register.results }}"
+  when: all_etcd_on_master == false
 
 - name: run preflight checks
   command: kubeadm init phase preflight --config {{ kubernetes_kubeadm_config_file }}
   when:
   - inventory_hostname == groups.k8s_masters[0]
-  - inventory_hostname not in groups.etcd
   register: master_preflight_register
   changed_when: false
   failed_when: false
@@ -37,26 +38,6 @@
   command: "kubeadm init --config {{ kubernetes_kubeadm_config_file }}"
   when:
   - inventory_hostname == groups.k8s_masters[0]
-  - inventory_hostname not in groups.etcd
-  - master_preflight_register.rc == 0
-  register: init_output
-
-- name: run preflight checks
-  command: kubeadm init phase preflight --config {{ kubernetes_kubeadm_config_file }} --ignore-preflight-errors=FileAvailable--etc-kubernetes-manifests-etcd.yaml,DirAvailable--var-etcd,Port-10250,Port-2379,Port-2380
-  when:
-  - inventory_hostname == groups.k8s_masters[0]
-  - inventory_hostname in groups.etcd
-  register: master_preflight_register
-  changed_when: false
-  failed_when: false
-
-- debug: var=master_preflight_register
-
-- name: initial at first master with started etcd
-  command: "kubeadm init --config {{ kubernetes_kubeadm_config_file }} --ignore-preflight-errors=FileAvailable--etc-kubernetes-manifests-etcd.yaml,DirAvailable--var-etcd,Port-10250,Port-2379,Port-2380"
-  when:
-  - inventory_hostname == groups.k8s_masters[0]
-  - inventory_hostname in groups.etcd
   - master_preflight_register.rc == 0
   register: init_output
 

diff --git a/tasks/prepare_master_with_etcd.yml b/tasks/prepare_master_with_etcd.yml
diff --git a/templates/clusterconfig.yaml.j2 b/templates/clusterconfig.yaml.j2
@@ -19,14 +19,6 @@ etcd:
 {% for san in kubernetes_etcd_peer_cert_sans %}
     - {{ san }}
 {% endfor %}
-    extraArgs:
-      initial-cluster: {{ kubernetes_etcd_initial_cluster | join(",") }}
-      initial-cluster-state: new
-      name: {{ kubernetes_etcd_name }}
-      listen-peer-urls: {{ kubernetes_etcd_listen_peer_urls }}
-      listen-client-urls: {{ kubernetes_etcd_listen_client_urls }}
-      advertise-client-urls: {{ kubernetes_etcd_advertise_client_urls }}
-      initial-advertise-peer-urls: {{ kubernetes_etcd_initial_advertise_peer_urls }}
 {% else %}
   external:
     endpoints: