From 9f88f19e31fea6576e0a195fb45a94b7c1706bd9 Mon Sep 17 00:00:00 2001 From: Andreas Gravgaard Andersen Date: Wed, 13 Nov 2024 18:52:48 +0100 Subject: [PATCH] remove nameless extraArgs entry (#11703) * remove nameless extraArgs entry Signed-off-by: Andreas Gravgaard Andersen * fix template name Signed-off-by: Andreas Gravgaard Andersen --------- Signed-off-by: Andreas Gravgaard Andersen --- .../control-plane/templates/kubeadm-config.v1beta4.yaml.j2 | 2 -- roles/kubernetes/kubeadm/tasks/kubeadm_etcd_node.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 index 103ceba05..00ff32edc 100644 --- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 +++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 @@ -85,8 +85,6 @@ etcd: - name: {{ key }} value: "{{ value }}" {% endfor %} - - name: - value: serverCertSANs: {% for san in etcd_cert_alt_names %} - "{{ san }}" diff --git a/roles/kubernetes/kubeadm/tasks/kubeadm_etcd_node.yml b/roles/kubernetes/kubeadm/tasks/kubeadm_etcd_node.yml index 3d0f4b3c0..38fd8378b 100644 --- a/roles/kubernetes/kubeadm/tasks/kubeadm_etcd_node.yml +++ b/roles/kubernetes/kubeadm/tasks/kubeadm_etcd_node.yml @@ -6,7 +6,7 @@ - name: Create kubeadm cert controlplane config template: - src: "kubeadm-client.conf.{{ kubeadmConfig_api_version }}.j2" + src: "kubeadm-client.conf.j2" dest: "{{ kube_config_dir }}/kubeadm-cert-controlplane.conf" mode: "0640" vars: