Don't useExperimentalRetryJoin

now that we are using k9s 1.19.3 as default, we should not need this
kubernetes-sigs · Nov 19, 2020 · b6dd8ab · b6dd8ab
1 parent 8e70ad6
commit b6dd8ab
Show file tree

Hide file tree

Showing 31 changed files with 0 additions and 52 deletions.
diff --git 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
@@ -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-external-cloud-provider.yaml b/templates/cluster-template-external-cloud-provider.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: external
           name: '{{ ds.meta_data["local_hostname"] }}'
-      useExperimentalRetryJoin: true
diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml
@@ -149,7 +149,6 @@ spec:
     - 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}
 ---
@@ -256,4 +255,3 @@ spec:
       - 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
@@ -108,7 +108,6 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
-    useExperimentalRetryJoin: true
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
   version: ${KUBERNETES_VERSION}
 ---
@@ -192,4 +191,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
@@ -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/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}
 ---
@@ -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-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml
@@ -110,7 +110,6 @@ spec:
       - /var/lib/etcddisk
     postKubeadmCommands:
     - KUBECONFIG=/etc/kubernetes/admin.conf kubectl apply -f https://raw.githubusercontent.com/NVIDIA/k8s-device-plugin/master/nvidia-device-plugin.yml
-    useExperimentalRetryJoin: true
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
   version: ${KUBERNETES_VERSION}
 ---
@@ -338,4 +337,3 @@ spec:
       - apt install ubuntu-drivers-common -y
       - ubuntu-drivers install
       - apt install nvidia-container-runtime -y
-      useExperimentalRetryJoin: true
diff --git a/templates/cluster-template-private.yaml b/templates/cluster-template-private.yaml
@@ -118,7 +118,6 @@ spec:
     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}
 ---
@@ -206,4 +205,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
@@ -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-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}
 ---
@@ -202,4 +201,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.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}
 ---
@@ -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/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml
@@ -41,7 +41,6 @@ spec:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
     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
@@ -45,7 +45,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
@@ -5,7 +5,6 @@ metadata:
   name: "${CLUSTER_NAME}-control-plane"
 spec:
   kubeadmConfigSpec:
-    useExperimentalRetryJoin: true
     initConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
@@ -29,7 +28,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
@@ -46,7 +46,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
@@ -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
@@ -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
@@ -45,7 +45,6 @@ metadata:
 spec:
   template:
     spec:
-      useExperimentalRetryJoin: true
       preKubeadmCommands:
         # Enable NVIDIA container runtime package repository
         - curl -sL https://nvidia.github.io/nvidia-container-runtime/gpgkey | apt-key add -

diff --git a/templates/flavors/nvidia-gpu/patches/kubeadm-controlplane.yaml b/templates/flavors/nvidia-gpu/patches/kubeadm-controlplane.yaml
@@ -4,7 +4,6 @@ metadata:
   name: "${CLUSTER_NAME}-control-plane"
 spec:
   kubeadmConfigSpec:
-    useExperimentalRetryJoin: true
     postKubeadmCommands:
       # Install the NVIDIA device plugin for Kubernetes
       - KUBECONFIG=/etc/kubernetes/admin.conf kubectl apply -f https://raw.githubusercontent.com/NVIDIA/k8s-device-plugin/master/nvidia-device-plugin.yml
diff --git a/templates/test/cluster-template-prow-ci-version.yaml b/templates/test/cluster-template-prow-ci-version.yaml
@@ -188,7 +188,6 @@ spec:
       - /var/lib/etcddisk
     preKubeadmCommands:
     - bash -c /tmp/kubeadm-bootstrap.sh
-    useExperimentalRetryJoin: true
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
   version: ${KUBERNETES_VERSION}
 ---
@@ -367,7 +366,6 @@ spec:
           name: '{{ ds.meta_data["local_hostname"] }}'
       preKubeadmCommands:
       - bash -c /tmp/kubeadm-bootstrap.sh
-      useExperimentalRetryJoin: true
 ---
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: MachineHealthCheck

diff --git a/templates/test/cluster-template-prow-ipv6.yaml b/templates/test/cluster-template-prow-ipv6.yaml
@@ -152,7 +152,6 @@ spec:
     - 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}
 ---
@@ -259,7 +258,6 @@ spec:
       - 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
@@ -188,7 +188,6 @@ spec:
       - /var/lib/etcddisk
     preKubeadmCommands:
     - bash -c /tmp/kubeadm-bootstrap.sh
-    useExperimentalRetryJoin: true
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
   version: ${KUBERNETES_VERSION}
 ---
@@ -359,7 +358,6 @@ spec:
       name: '{{ ds.meta_data["local_hostname"] }}'
   preKubeadmCommands:
   - bash -c /tmp/kubeadm-bootstrap.sh
-  useExperimentalRetryJoin: true
 ---
 apiVersion: v1
 data: ${CNI_RESOURCES}

diff --git a/templates/test/cluster-template-prow-machine-pool.yaml b/templates/test/cluster-template-prow-machine-pool.yaml
@@ -111,7 +111,6 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
-    useExperimentalRetryJoin: true
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
   version: ${KUBERNETES_VERSION}
 ---
@@ -194,7 +193,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-nvidia-gpu.yaml b/templates/test/cluster-template-prow-nvidia-gpu.yaml
@@ -113,7 +113,6 @@ spec:
       - /var/lib/etcddisk
     postKubeadmCommands:
     - KUBECONFIG=/etc/kubernetes/admin.conf kubectl apply -f https://raw.githubusercontent.com/NVIDIA/k8s-device-plugin/master/nvidia-device-plugin.yml
-    useExperimentalRetryJoin: true
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
   version: ${KUBERNETES_VERSION}
 ---
@@ -341,7 +340,6 @@ spec:
       - apt install ubuntu-drivers-common -y
       - ubuntu-drivers install
       - apt install nvidia-container-runtime -y
-      useExperimentalRetryJoin: true
 ---
 apiVersion: v1
 data: ${CNI_RESOURCES}

diff --git a/templates/test/cluster-template-prow-private.yaml b/templates/test/cluster-template-prow-private.yaml
@@ -133,7 +133,6 @@ spec:
     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}
 ---
@@ -221,7 +220,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.yaml b/templates/test/cluster-template-prow.yaml
@@ -111,7 +111,6 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
-    useExperimentalRetryJoin: true
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
   version: ${KUBERNETES_VERSION}
 ---
@@ -202,7 +201,6 @@ spec:
             cloud-config: /etc/kubernetes/azure.json
             cloud-provider: azure
           name: '{{ ds.meta_data["local_hostname"] }}'
-      useExperimentalRetryJoin: true
 ---
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: MachineHealthCheck

diff --git a/templates/test/prow-ci-version/patches/ci-artifacts-script.yaml b/templates/test/prow-ci-version/patches/ci-artifacts-script.yaml
@@ -4,7 +4,6 @@ metadata:
   name: "${CLUSTER_NAME}-control-plane"
 spec:
   kubeadmConfigSpec:
-    useExperimentalRetryJoin: true
     clusterConfiguration:
       kubernetesVersion: "ci/${CI_VERSION}"
     preKubeadmCommands:

diff --git a/templates/test/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml b/templates/test/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml
@@ -4,7 +4,6 @@ metadata:
   name: "${CLUSTER_NAME}-control-plane"
 spec:
   kubeadmConfigSpec:
-    useExperimentalRetryJoin: true
     clusterConfiguration:
       kubernetesVersion: "ci/${CI_VERSION}"
     preKubeadmCommands:

diff --git a/test/e2e/data/infrastructure-azure/cluster-template-kcp-adoption.yaml b/test/e2e/data/infrastructure-azure/cluster-template-kcp-adoption.yaml
@@ -88,7 +88,6 @@ metadata:
   labels:
     kcp-adoption.step1: ''    
 spec:
-  useExperimentalRetryJoin: true
   initConfiguration:
     nodeRegistration:
       kubeletExtraArgs:
@@ -256,7 +255,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-mhc.yaml b/test/e2e/data/infrastructure-azure/cluster-template-mhc.yaml
@@ -111,7 +111,6 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
-    useExperimentalRetryJoin: true
   replicas: ${CONTROL_PLANE_MACHINE_COUNT}
   version: ${KUBERNETES_VERSION}
 ---
@@ -202,7 +201,6 @@ spec:
             cloud-config: /etc/kubernetes/azure.json
             cloud-provider: azure
           name: '{{ ds.meta_data["local_hostname"] }}'
-      useExperimentalRetryJoin: true
 ---
 apiVersion: cluster.x-k8s.io/v1alpha3
 kind: MachineHealthCheck