Merge pull request #1029 from nader-ziada/dont-use-retry-join

Don't useExperimentalRetryJoin
kubernetes-sigs · Apr 9, 2021 · 37fe934 · 37fe934
2 parents 7cf0018 + 66b7f3a
commit 37fe934
Show file tree

Hide file tree

Showing 35 changed files with 0 additions and 57 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}
 ---
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -117,7 +117,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}
 ---
@@ -203,4 +202,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}
 ---
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -134,7 +134,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}
 ---
@@ -220,7 +219,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
@@ -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
@@ -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