From 66b7f3a6d0265b8e7f3c3672db7d0a03b9726c5e Mon Sep 17 00:00:00 2001 From: Nader Ziada Date: Tue, 10 Nov 2020 12:11:19 -0500 Subject: [PATCH] Don't useExperimentalRetryJoin now that we are using k9s 1.19.3 as default, we should not need this --- docs/book/src/topics/machinepools.md | 1 - templates/cluster-template-ephemeral.yaml | 2 -- templates/cluster-template-external-cloud-provider.yaml | 2 -- templates/cluster-template-ipv6.yaml | 2 -- .../cluster-template-machinepool-system-assigned-identity.yaml | 2 -- .../cluster-template-machinepool-user-assigned-identity.yaml | 2 -- templates/cluster-template-machinepool-windows.yaml | 1 - templates/cluster-template-machinepool.yaml | 2 -- templates/cluster-template-multi-tenancy.yaml | 2 -- templates/cluster-template-nvidia-gpu.yaml | 2 -- templates/cluster-template-private.yaml | 2 -- templates/cluster-template-system-assigned-identity.yaml | 2 -- templates/cluster-template-user-assigned-identity.yaml | 2 -- templates/cluster-template-windows.yaml | 1 - templates/cluster-template.yaml | 2 -- templates/flavors/base/cluster-template.yaml | 1 - templates/flavors/default/machine-deployment.yaml | 1 - .../patches/external-cloud-provider.yaml | 2 -- templates/flavors/ipv6/machine-deployment.yaml | 1 - templates/flavors/ipv6/patches/kubeadm-controlplane.yaml | 1 - templates/flavors/machinepool/machine-pool-deployment.yaml | 1 - templates/flavors/nvidia-gpu/machine-deployment.yaml | 1 - templates/test/cluster-template-prow-ci-version.yaml | 1 - .../test/cluster-template-prow-external-cloud-provider.yaml | 2 -- templates/test/cluster-template-prow-ipv6.yaml | 2 -- .../test/cluster-template-prow-machine-pool-ci-version.yaml | 1 - templates/test/cluster-template-prow-machine-pool-windows.yaml | 1 - templates/test/cluster-template-prow-machine-pool.yaml | 2 -- templates/test/cluster-template-prow-multi-tenancy.yaml | 2 -- templates/test/cluster-template-prow-nvidia-gpu.yaml | 2 -- templates/test/cluster-template-prow-private.yaml | 2 -- templates/test/cluster-template-prow-windows.yaml | 1 - templates/test/cluster-template-prow.yaml | 2 -- .../infrastructure-azure/cluster-template-kcp-adoption.yaml | 2 -- .../infrastructure-azure/cluster-template-kcp-remediation.yaml | 2 -- 35 files changed, 57 deletions(-) diff --git a/docs/book/src/topics/machinepools.md b/docs/book/src/topics/machinepools.md index e75c0fd278c..8f694f6cc81 100644 --- a/docs/book/src/topics/machinepools.md +++ b/docs/book/src/topics/machinepools.md @@ -127,5 +127,4 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true ``` diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml index e7797a5ddef..bde7a535c5c 100644 --- a/templates/cluster-template-ephemeral.yaml +++ b/templates/cluster-template-ephemeral.yaml @@ -108,7 +108,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -198,4 +197,3 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true diff --git a/templates/cluster-template-external-cloud-provider.yaml b/templates/cluster-template-external-cloud-provider.yaml index 1898bc1a597..9dae5900221 100644 --- a/templates/cluster-template-external-cloud-provider.yaml +++ b/templates/cluster-template-external-cloud-provider.yaml @@ -109,7 +109,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -195,7 +194,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: addons.cluster.x-k8s.io/v1alpha4 kind: ClusterResourceSet diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml index b95b40bb57a..32c71efb013 100644 --- a/templates/cluster-template-ipv6.yaml +++ b/templates/cluster-template-ipv6.yaml @@ -148,7 +148,6 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - systemctl restart systemd-resolved - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -252,4 +251,3 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - systemctl restart systemd-resolved - useExperimentalRetryJoin: true diff --git a/templates/cluster-template-machinepool-system-assigned-identity.yaml b/templates/cluster-template-machinepool-system-assigned-identity.yaml index 77218955b2e..3a693f8b26d 100644 --- a/templates/cluster-template-machinepool-system-assigned-identity.yaml +++ b/templates/cluster-template-machinepool-system-assigned-identity.yaml @@ -108,7 +108,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -191,4 +190,3 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true diff --git a/templates/cluster-template-machinepool-user-assigned-identity.yaml b/templates/cluster-template-machinepool-user-assigned-identity.yaml index 990bfb1709a..7e1bb742313 100644 --- a/templates/cluster-template-machinepool-user-assigned-identity.yaml +++ b/templates/cluster-template-machinepool-user-assigned-identity.yaml @@ -108,7 +108,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -193,4 +192,3 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml index 795b8033382..c7317c14b08 100644 --- a/templates/cluster-template-machinepool-windows.yaml +++ b/templates/cluster-template-machinepool-windows.yaml @@ -109,7 +109,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml index f6ead76b088..158f6dcdcfc 100644 --- a/templates/cluster-template-machinepool.yaml +++ b/templates/cluster-template-machinepool.yaml @@ -108,7 +108,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -190,4 +189,3 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true diff --git a/templates/cluster-template-multi-tenancy.yaml b/templates/cluster-template-multi-tenancy.yaml index 3e4495b88f7..81add9814b4 100644 --- a/templates/cluster-template-multi-tenancy.yaml +++ b/templates/cluster-template-multi-tenancy.yaml @@ -113,7 +113,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -199,7 +198,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4 kind: AzureClusterIdentity diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml index 575083d92e6..aa6c64876a4 100644 --- a/templates/cluster-template-nvidia-gpu.yaml +++ b/templates/cluster-template-nvidia-gpu.yaml @@ -109,7 +109,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -195,7 +194,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: addons.cluster.x-k8s.io/v1alpha4 kind: ClusterResourceSet diff --git a/templates/cluster-template-private.yaml b/templates/cluster-template-private.yaml index ccd7f3e81a4..05d687e3936 100644 --- a/templates/cluster-template-private.yaml +++ b/templates/cluster-template-private.yaml @@ -115,7 +115,6 @@ spec: - if [ -f /tmp/kubeadm-join-config.yaml ] || [ -f /run/kubeadm/kubeadm-join-config.yaml ]; then echo '127.0.0.1 apiserver.${CLUSTER_NAME}.capz.io apiserver' >> /etc/hosts; fi preKubeadmCommands: - if [ -f /tmp/kubeadm.yaml ] || [ -f /run/kubeadm/kubeadm.yaml ]; then echo '127.0.0.1 apiserver.${CLUSTER_NAME}.capz.io apiserver' >> /etc/hosts; fi - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -201,4 +200,3 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true diff --git a/templates/cluster-template-system-assigned-identity.yaml b/templates/cluster-template-system-assigned-identity.yaml index 7ff4d1dd679..2eb56fba9ac 100644 --- a/templates/cluster-template-system-assigned-identity.yaml +++ b/templates/cluster-template-system-assigned-identity.yaml @@ -108,7 +108,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -196,4 +195,3 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true diff --git a/templates/cluster-template-user-assigned-identity.yaml b/templates/cluster-template-user-assigned-identity.yaml index 981f77b5361..b85191d352e 100644 --- a/templates/cluster-template-user-assigned-identity.yaml +++ b/templates/cluster-template-user-assigned-identity.yaml @@ -108,7 +108,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -200,4 +199,3 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml index e3fb46d80f1..f1cf4ac00c7 100644 --- a/templates/cluster-template-windows.yaml +++ b/templates/cluster-template-windows.yaml @@ -109,7 +109,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index fb349cccad7..edb6fb6b588 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -108,7 +108,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -194,4 +193,3 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml index 8a001a1562c..62ab15cd16a 100644 --- a/templates/flavors/base/cluster-template.yaml +++ b/templates/flavors/base/cluster-template.yaml @@ -41,7 +41,6 @@ spec: apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4 name: "${CLUSTER_NAME}-control-plane" kubeadmConfigSpec: - useExperimentalRetryJoin: true initConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/flavors/default/machine-deployment.yaml b/templates/flavors/default/machine-deployment.yaml index 202f117d757..87ebd82f16f 100644 --- a/templates/flavors/default/machine-deployment.yaml +++ b/templates/flavors/default/machine-deployment.yaml @@ -44,7 +44,6 @@ metadata: spec: template: spec: - useExperimentalRetryJoin: true joinConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml b/templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml index 9d0f59d12cf..1de545e6aec 100644 --- a/templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml +++ b/templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml @@ -13,7 +13,6 @@ metadata: name: "${CLUSTER_NAME}-control-plane" spec: kubeadmConfigSpec: - useExperimentalRetryJoin: true initConfiguration: nodeRegistration: kubeletExtraArgs: @@ -37,7 +36,6 @@ metadata: spec: template: spec: - useExperimentalRetryJoin: true joinConfiguration: nodeRegistration: kubeletExtraArgs: diff --git a/templates/flavors/ipv6/machine-deployment.yaml b/templates/flavors/ipv6/machine-deployment.yaml index 78be5eb9144..1817ff5040d 100644 --- a/templates/flavors/ipv6/machine-deployment.yaml +++ b/templates/flavors/ipv6/machine-deployment.yaml @@ -45,7 +45,6 @@ metadata: spec: template: spec: - useExperimentalRetryJoin: true postKubeadmCommands: # This frees up :53 on the host for the coredns pods - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf diff --git a/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml b/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml index 2262cdbee15..eb9ceebc893 100644 --- a/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml +++ b/templates/flavors/ipv6/patches/kubeadm-controlplane.yaml @@ -4,7 +4,6 @@ metadata: name: "${CLUSTER_NAME}-control-plane" spec: kubeadmConfigSpec: - useExperimentalRetryJoin: true postKubeadmCommands: - sed -i '\#--listen-client-urls#s#$#,https://127.0.0.1:2379#' /etc/kubernetes/manifests/etcd.yaml # This frees up :53 on the host for the coredns pods diff --git a/templates/flavors/machinepool/machine-pool-deployment.yaml b/templates/flavors/machinepool/machine-pool-deployment.yaml index c17a06556a7..104f8c0610c 100644 --- a/templates/flavors/machinepool/machine-pool-deployment.yaml +++ b/templates/flavors/machinepool/machine-pool-deployment.yaml @@ -40,7 +40,6 @@ kind: KubeadmConfig metadata: name: "${CLUSTER_NAME}-mp-0" spec: - useExperimentalRetryJoin: true joinConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/flavors/nvidia-gpu/machine-deployment.yaml b/templates/flavors/nvidia-gpu/machine-deployment.yaml index efba773603c..3e3ead646e6 100644 --- a/templates/flavors/nvidia-gpu/machine-deployment.yaml +++ b/templates/flavors/nvidia-gpu/machine-deployment.yaml @@ -44,7 +44,6 @@ metadata: spec: template: spec: - useExperimentalRetryJoin: true joinConfiguration: nodeRegistration: name: '{{ ds.meta_data["local_hostname"] }}' diff --git a/templates/test/cluster-template-prow-ci-version.yaml b/templates/test/cluster-template-prow-ci-version.yaml index 2810fa5aa2a..b4b14594dfd 100644 --- a/templates/test/cluster-template-prow-ci-version.yaml +++ b/templates/test/cluster-template-prow-ci-version.yaml @@ -366,7 +366,6 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - bash -c /tmp/kubeadm-bootstrap.sh - useExperimentalRetryJoin: true --- apiVersion: cluster.x-k8s.io/v1alpha4 kind: MachineHealthCheck diff --git a/templates/test/cluster-template-prow-external-cloud-provider.yaml b/templates/test/cluster-template-prow-external-cloud-provider.yaml index b5d5d75eb11..e8399382177 100644 --- a/templates/test/cluster-template-prow-external-cloud-provider.yaml +++ b/templates/test/cluster-template-prow-external-cloud-provider.yaml @@ -114,7 +114,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -200,7 +199,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: addons.cluster.x-k8s.io/v1alpha4 kind: ClusterResourceSet diff --git a/templates/test/cluster-template-prow-ipv6.yaml b/templates/test/cluster-template-prow-ipv6.yaml index 1df6ae6fcaa..a8ee5d2f8aa 100644 --- a/templates/test/cluster-template-prow-ipv6.yaml +++ b/templates/test/cluster-template-prow-ipv6.yaml @@ -153,7 +153,6 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - systemctl restart systemd-resolved - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -257,7 +256,6 @@ spec: - echo "DNSStubListener=no" >> /etc/systemd/resolved.conf - mv /etc/resolv.conf /etc/resolv.conf.OLD && ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf - systemctl restart systemd-resolved - useExperimentalRetryJoin: true --- apiVersion: v1 data: ${CNI_RESOURCES_IPV6} diff --git a/templates/test/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/cluster-template-prow-machine-pool-ci-version.yaml index 543bd2d0977..95c80284816 100644 --- a/templates/test/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/cluster-template-prow-machine-pool-ci-version.yaml @@ -360,7 +360,6 @@ spec: name: '{{ ds.meta_data["local_hostname"] }}' preKubeadmCommands: - bash -c /tmp/kubeadm-bootstrap.sh - useExperimentalRetryJoin: true --- apiVersion: addons.cluster.x-k8s.io/v1alpha4 kind: ClusterResourceSet diff --git a/templates/test/cluster-template-prow-machine-pool-windows.yaml b/templates/test/cluster-template-prow-machine-pool-windows.yaml index 91e40c9e3d9..bc6fe1e71c7 100644 --- a/templates/test/cluster-template-prow-machine-pool-windows.yaml +++ b/templates/test/cluster-template-prow-machine-pool-windows.yaml @@ -114,7 +114,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- diff --git a/templates/test/cluster-template-prow-machine-pool.yaml b/templates/test/cluster-template-prow-machine-pool.yaml index 868297bb8f1..726c6fcb61b 100644 --- a/templates/test/cluster-template-prow-machine-pool.yaml +++ b/templates/test/cluster-template-prow-machine-pool.yaml @@ -113,7 +113,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -195,7 +194,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: addons.cluster.x-k8s.io/v1alpha4 kind: ClusterResourceSet diff --git a/templates/test/cluster-template-prow-multi-tenancy.yaml b/templates/test/cluster-template-prow-multi-tenancy.yaml index 83d1c6cc090..b5a48fc60bd 100644 --- a/templates/test/cluster-template-prow-multi-tenancy.yaml +++ b/templates/test/cluster-template-prow-multi-tenancy.yaml @@ -118,7 +118,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -204,7 +203,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4 kind: AzureClusterIdentity diff --git a/templates/test/cluster-template-prow-nvidia-gpu.yaml b/templates/test/cluster-template-prow-nvidia-gpu.yaml index 0994a0291fe..2808c8c674d 100644 --- a/templates/test/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/cluster-template-prow-nvidia-gpu.yaml @@ -114,7 +114,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -200,7 +199,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: addons.cluster.x-k8s.io/v1alpha4 kind: ClusterResourceSet diff --git a/templates/test/cluster-template-prow-private.yaml b/templates/test/cluster-template-prow-private.yaml index 0f75398878c..ab0f63492db 100644 --- a/templates/test/cluster-template-prow-private.yaml +++ b/templates/test/cluster-template-prow-private.yaml @@ -132,7 +132,6 @@ spec: - if [ -f /tmp/kubeadm-join-config.yaml ] || [ -f /run/kubeadm/kubeadm-join-config.yaml ]; then echo '127.0.0.1 apiserver.${CLUSTER_NAME}.capz.io apiserver' >> /etc/hosts; fi preKubeadmCommands: - if [ -f /tmp/kubeadm.yaml ] || [ -f /run/kubeadm/kubeadm.yaml ]; then echo '127.0.0.1 apiserver.${CLUSTER_NAME}.capz.io apiserver' >> /etc/hosts; fi - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -218,7 +217,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: v1 data: ${CNI_RESOURCES} diff --git a/templates/test/cluster-template-prow-windows.yaml b/templates/test/cluster-template-prow-windows.yaml index 4b02540c81e..bb75cc00d08 100644 --- a/templates/test/cluster-template-prow-windows.yaml +++ b/templates/test/cluster-template-prow-windows.yaml @@ -114,7 +114,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- diff --git a/templates/test/cluster-template-prow.yaml b/templates/test/cluster-template-prow.yaml index f37f1058fe8..cbfeb47d529 100644 --- a/templates/test/cluster-template-prow.yaml +++ b/templates/test/cluster-template-prow.yaml @@ -113,7 +113,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -201,7 +200,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- apiVersion: cluster.x-k8s.io/v1alpha4 kind: MachineHealthCheck diff --git a/test/e2e/data/infrastructure-azure/cluster-template-kcp-adoption.yaml b/test/e2e/data/infrastructure-azure/cluster-template-kcp-adoption.yaml index 7953e246edc..6a89cf1e47d 100644 --- a/test/e2e/data/infrastructure-azure/cluster-template-kcp-adoption.yaml +++ b/test/e2e/data/infrastructure-azure/cluster-template-kcp-adoption.yaml @@ -87,7 +87,6 @@ metadata: labels: kcp-adoption.step1: '' spec: - useExperimentalRetryJoin: true initConfiguration: nodeRegistration: kubeletExtraArgs: @@ -255,7 +254,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- diff --git a/test/e2e/data/infrastructure-azure/cluster-template-kcp-remediation.yaml b/test/e2e/data/infrastructure-azure/cluster-template-kcp-remediation.yaml index a87e1ee2976..0b48ccc04a5 100644 --- a/test/e2e/data/infrastructure-azure/cluster-template-kcp-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/cluster-template-kcp-remediation.yaml @@ -111,7 +111,6 @@ spec: mounts: - - LABEL=etcd_disk - /var/lib/etcddisk - useExperimentalRetryJoin: true replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- @@ -197,7 +196,6 @@ spec: cloud-config: /etc/kubernetes/azure.json cloud-provider: azure name: '{{ ds.meta_data["local_hostname"] }}' - useExperimentalRetryJoin: true --- # MachineHealthCheck object with # - a selector that targets all the machines with label e2e.remediation.label=""