diff options
Diffstat (limited to 'roles/kubernetes')
| -rw-r--r-- | roles/kubernetes/net/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/kubernetes/net/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/kubernetes/node/tasks/add.yml | 6 | ||||
| -rw-r--r-- | roles/kubernetes/node/tasks/main.yml | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/roles/kubernetes/net/meta/main.yml b/roles/kubernetes/net/meta/main.yml index 03dfcb23..a3d4d97b 100644 --- a/roles/kubernetes/net/meta/main.yml +++ b/roles/kubernetes/net/meta/main.yml @@ -1,4 +1,4 @@ --- dependencies: - role: wireguard - when: k8s_remove_node is not defined + when: kubernetes_remove_node is not defined diff --git a/roles/kubernetes/net/tasks/main.yml b/roles/kubernetes/net/tasks/main.yml index 8c94292e..8aa7221e 100644 --- a/roles/kubernetes/net/tasks/main.yml +++ b/roles/kubernetes/net/tasks/main.yml @@ -1,8 +1,8 @@ --- - name: add node to overlay network include_tasks: add.yml - when: k8s_remove_node is not defined + when: kubernetes_remove_node is not defined - name: remove node from overlay network include_tasks: remove.yml - when: k8s_remove_node is defined + when: kubernetes_remove_node is defined diff --git a/roles/kubernetes/node/tasks/add.yml b/roles/kubernetes/node/tasks/add.yml index dd784b35..9f0057f9 100644 --- a/roles/kubernetes/node/tasks/add.yml +++ b/roles/kubernetes/node/tasks/add.yml @@ -1,9 +1,9 @@ --- - name: get master vars set_fact: - 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) }}" + kube_bootstrap_token: "{{ hostvars[kubernetes_master].kube_bootstrap_token }}" + kube_bootstrap_ca_cert_hash: "{{ hostvars[kubernetes_master].kube_bootstrap_ca_cert_hash }}" + kube_master_addr: "{{ kubernetes.api_advertise_ip | default(hostvars[kubernetes_master].ansible_default_ipv4.address) }}" - name: join kubernetes node command: "kubeadm join --token {{ kube_bootstrap_token }} {{ kube_master_addr }}:6443 --discovery-token-ca-cert-hash {{ kube_bootstrap_ca_cert_hash }}" diff --git a/roles/kubernetes/node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml index d078d2fb..e29fbc29 100644 --- a/roles/kubernetes/node/tasks/main.yml +++ b/roles/kubernetes/node/tasks/main.yml @@ -1,8 +1,8 @@ --- - name: add node cluster include_tasks: add.yml - when: k8s_remove_node is not defined + when: kubernetes_remove_node is not defined - name: remove node from cluster include_tasks: remove.yml - when: k8s_remove_node is defined + when: kubernetes_remove_node is defined |