diff options
| -rw-r--r-- | group_vars/k8s-emc/vars.yml | 6 | ||||
| -rw-r--r-- | roles/kubernetes-master/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/kubernetes-node/tasks/add.yml | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/group_vars/k8s-emc/vars.yml b/group_vars/k8s-emc/vars.yml index ab9604ec..a6102a41 100644 --- a/group_vars/k8s-emc/vars.yml +++ b/group_vars/k8s-emc/vars.yml @@ -4,9 +4,10 @@ docker_pkg_version: 17.03.2~ce-0~debian-stretch kubernetes: pkg_version: 1.9.2-00 - dedicated_master: False + dedicated_master: True + api_advertise_ip: 144.76.160.141 api_extra_sans: - - dione.spreadspace.org + - emc-master.spreadspace.org pod_ip_range: 172.18.0.0/16 pod_ip_range_size: 24 @@ -26,6 +27,7 @@ kubernetes: dione: 101 helene: 102 emc-stats: 120 + emc-master: 127 direct_net_zones: encoder: diff --git a/roles/kubernetes-master/tasks/main.yml b/roles/kubernetes-master/tasks/main.yml index f75ec11f..43c21cae 100644 --- a/roles/kubernetes-master/tasks/main.yml +++ b/roles/kubernetes-master/tasks/main.yml @@ -17,7 +17,7 @@ register: kubeadm_token_generate - name: set up kubernetes master - command: "kubeadm init --pod-network-cidr {{ kubernetes.pod_ip_range }} --service-cidr {{ kubernetes.service_ip_range }} {% if kubernetes.api_extra_sans | length > 0 %}--apiserver-cert-extra-sans {{ kubernetes.api_extra_sans | join(',') }}{% endif %} --token '{{ kubeadm_token_generate.stdout }}' --token-ttl 42m --skip-token-print" + command: "kubeadm init --pod-network-cidr {{ kubernetes.pod_ip_range }} --service-cidr {{ kubernetes.service_ip_range }} --apiserver-advertise-address {{ kubernetes.api_advertise_ip | default('0.0.0.0') }} {% if kubernetes.api_extra_sans | length > 0 %}--apiserver-cert-extra-sans {{ kubernetes.api_extra_sans | join(',') }}{% endif %} --token '{{ kubeadm_token_generate.stdout }}' --token-ttl 42m --skip-token-print" args: creates: /etc/kubernetes/pki/ca.crt register: kubeadm_init diff --git a/roles/kubernetes-node/tasks/add.yml b/roles/kubernetes-node/tasks/add.yml index c68a54cc..dd784b35 100644 --- a/roles/kubernetes-node/tasks/add.yml +++ b/roles/kubernetes-node/tasks/add.yml @@ -1,10 +1,12 @@ --- - name: get master vars set_fact: - kube_master_vars: "{{ hostvars[kubernetes_nodes_master] }}" + kube_bootstrap_token: "{{ hostvars[kubernetes_nodes_master].kube_bootstrap_token }}" + kube_bootstrap_ca_cert_hash: "{{ hostvars[kubernetes_nodes_master].kube_bootstrap_ca_cert_hash }}" + kube_master_addr: "{{ kubernetes.api_advertise_ip | default(hostvars[kubernetes_nodes_master].ansible_default_ipv4.address) }}" - name: join kubernetes node - command: "kubeadm join --token {{ kube_master_vars.kube_bootstrap_token }} {{ kube_master_vars.ansible_default_ipv4.address }}:6443 --discovery-token-ca-cert-hash {{ kube_master_vars.kube_bootstrap_ca_cert_hash }}" + command: "kubeadm join --token {{ kube_bootstrap_token }} {{ kube_master_addr }}:6443 --discovery-token-ca-cert-hash {{ kube_bootstrap_ca_cert_hash }}" args: creates: /etc/kubernetes/kubelet.conf register: kubeadm_join |