summaryrefslogtreecommitdiff
path: root/roles/kubernetes/kubeadm/control-plane
diff options
context:
space:
mode:
Diffstat (limited to 'roles/kubernetes/kubeadm/control-plane')
-rw-r--r--roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml1
-rw-r--r--roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j24
-rw-r--r--roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j24
3 files changed, 9 insertions, 0 deletions
diff --git a/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml b/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml
index 965fb03e..4418101a 100644
--- a/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml
+++ b/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml
@@ -29,6 +29,7 @@
template:
src: kubeadm-join.config.j2
dest: /etc/kubernetes/kubeadm.config
+ mode: 0600
register: kubeadm_config
- name: join kubernetes secondary control-plane node and store log
diff --git a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2 b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
index d4fb26cf..b6743282 100644
--- a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
+++ b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
@@ -18,6 +18,10 @@ skipPhases:
nodeRegistration:
name: "{{ inventory_hostname }}"
criSocket: "{{ kubernetes_cri_socket }}"
+{% if kubernetes_overlay_node_ip is defined %}
+ kubeletExtraArgs:
+ node-ip: "{{ kubernetes_overlay_node_ip }}"
+{% endif %}
---
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
diff --git a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j2 b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j2
index 553463bb..77ad480b 100644
--- a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j2
+++ b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j2
@@ -18,3 +18,7 @@ controlPlane:
nodeRegistration:
name: "{{ inventory_hostname }}"
criSocket: "{{ kubernetes_cri_socket }}"
+{% if kubernetes_overlay_node_ip is defined %}
+ kubeletExtraArgs:
+ node-ip: "{{ kubernetes_overlay_node_ip }}"
+{% endif %}