From e13a8fec52694d16da2066f4f4d13942a203a601 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 15 Aug 2022 19:24:03 +0200 Subject: kubernetes/kubeadm: only use config files for init and join --- roles/kubernetes/kubeadm/worker/tasks/main.yml | 7 ++++++- roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2 | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2 (limited to 'roles/kubernetes/kubeadm/worker') diff --git a/roles/kubernetes/kubeadm/worker/tasks/main.yml b/roles/kubernetes/kubeadm/worker/tasks/main.yml index eabb7a1f..efd14238 100644 --- a/roles/kubernetes/kubeadm/worker/tasks/main.yml +++ b/roles/kubernetes/kubeadm/worker/tasks/main.yml @@ -1,8 +1,13 @@ --- +- name: generate kubeadm.config + template: + src: kubeadm.config.j2 + dest: /etc/kubernetes/kubeadm.config + - name: join kubernetes worker node and store log block: - name: join kubernetes worker node - command: "kubeadm join 127.0.0.1:6443 --node-name {{ inventory_hostname }} --cri-socket {{ kubernetes_cri_socket }} --token '{{ kube_bootstrap_token }}' --discovery-token-ca-cert-hash '{{ kube_bootstrap_ca_cert_hash }}'" + command: "kubeadm join --config /etc/kubernetes/kubeadm.config" args: creates: /etc/kubernetes/kubelet.conf register: kubeadm_join diff --git a/roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2 b/roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2 new file mode 100644 index 00000000..664d31f1 --- /dev/null +++ b/roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2 @@ -0,0 +1,13 @@ +{# https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3 #} +{# #} +apiVersion: kubeadm.k8s.io/v1beta3 +kind: JoinConfiguration +discovery: + bootstrapToken: + apiServerEndpoint: "127.0.0.1:6443" + token: "{{ kube_bootstrap_token }}" + caCertHashes: + - "{{ kube_bootstrap_ca_cert_hash }}" +nodeRegistration: + name: "{{ inventory_hostname }}" + criSocket: "{{ kubernetes_cri_socket }}" -- cgit v1.2.3