From e88740d1a69d545b8e7caf292e86ea7c970274fb Mon Sep 17 00:00:00 2001 From: killianmuldoon Date: Fri, 15 Jul 2022 18:09:29 +0100 Subject: [PATCH] Deprecate experimentalRetryJoin Signed-off-by: killianmuldoon --- bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go | 1 + .../crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml | 4 +++- .../bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml | 4 +++- .../controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml | 4 +++- ...lplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml | 4 +++- docs/book/src/developer/providers/v1.1-to-v1.2.md | 5 +++-- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go b/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go index 9589e9d9ca4d..8b42d99cb13a 100644 --- 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 index df58d41eb2f6..ed600a1bd961 100644 --- 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 index ea993202d6b7..fd2430fb7f4c 100644 --- 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/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml index a2ee418b33b0..8cd228166361 100644 --- a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml +++ b/controlplane/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/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml index 00b4448b8339..87b20f6da916 100644 --- a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml +++ b/controlplane/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 index 48ec9ea5b723..9e09beae2366 100644 --- 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.