Merge pull request #6938 from killianmuldoon/bootstrap/deprecate-expe…

…rimentalRetry 🌱 Deprecate experimentalRetryJoin
kubernetes-sigs · Jul 18, 2022 · e29d7fb · e29d7fb
2 parents 1ec0cd6 + 4e32974
commit e29d7fb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go b/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go
@@ -97,6 +97,7 @@ type KubeadmConfigSpec struct {
 	//
 	// For more information, refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055.
 	// +optional
+	// Deprecated: This experimental fix is no longer needed and this field will be removed in a future release.
 	UseExperimentalRetryJoin bool `json:"useExperimentalRetryJoin,omitempty"`
 
 	// Ignition contains Ignition specific configuration.

diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
@@ -2928,7 +2928,9 @@ spec:
                   joins fail due to timing (and other issues). The long term goal
                   is to add retries to kubeadm proper and use that functionality.
                   \n This will add about 40KB to userdata \n For more information,
-                  refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055."
+                  refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055.
+                  Deprecated: This experimental fix is no longer needed and this field
+                  will be removed in a future release."
                 type: boolean
               users:
                 description: Users specifies extra users to add

diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
@@ -2977,7 +2977,9 @@ spec:
                           environments where joins fail due to timing (and other issues).
                           The long term goal is to add retries to kubeadm proper and
                           use that functionality. \n This will add about 40KB to userdata
-                          \n For more information, refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055."
+                          \n For more information, refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055.
+                          Deprecated: This experimental fix is no longer needed and
+                          this field will be removed in a future release."
                         type: boolean
                       users:
                         description: Users specifies extra users to add

diff --git a/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
@@ -3414,7 +3414,9 @@ spec:
                       environments where joins fail due to timing (and other issues).
                       The long term goal is to add retries to kubeadm proper and use
                       that functionality. \n This will add about 40KB to userdata
-                      \n For more information, refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055."
+                      \n For more information, refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055.
+                      Deprecated: This experimental fix is no longer needed and this
+                      field will be removed in a future release."
                     type: boolean
                   users:
                     description: Users specifies extra users to add

diff --git a/.../kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml b/.../kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml
@@ -2229,7 +2229,9 @@ spec:
                               to timing (and other issues). The long term goal is
                               to add retries to kubeadm proper and use that functionality.
                               \n This will add about 40KB to userdata \n For more
-                              information, refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055."
+                              information, refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055.
+                              Deprecated: This experimental fix is no longer needed
+                              and this field will be removed in a future release."
                             type: boolean
                           users:
                             description: Users specifies extra users to add

diff --git a/docs/book/src/developer/providers/v1.1-to-v1.2.md b/docs/book/src/developer/providers/v1.1-to-v1.2.md
@@ -33,8 +33,9 @@ in ClusterAPI are kept in sync with the versions used by `sigs.k8s.io/controller
 ### Deprecation
 
 * `util.MachinesByCreationTimestamp` has been deprecated and will be removed in a future release.
-* the `topology.cluster.x-k8s.io/managed-field-paths` annotation has been deprecated and it will be removed in a future release.
-
+* the `topology.cluster.x-k8s.io/managed-field-paths` annotation has been deprecated and will be removed in a future release.
+* the `experimentalRetryJoin` field in the KubeadmConfig and, as they compose the same types, KubeadmConfigTemplate, KubeadmControlPlane and KubeadmControlPlaneTemplate, has been deprecated and will be removed in a future release.
+* 
 ### Removals
 * The `third_party/kubernetes-drain` package has been removed, as we're now using `k8s.io/kubectl/pkg/drain` instead ([PR](https://github.com/kubernetes-sigs/cluster-api/pull/5440)).
 * `util/version.CompareWithBuildIdentifiers` has been removed, please use `util/version.Compare(a, b, WithBuildTags())` instead.