Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.2] 🌱 Deprecate experimentalRetryJoin #6941

Merged
merged 1 commit into from
Jul 18, 2022
Merged

[release-1.2] 🌱 Deprecate experimentalRetryJoin #6941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 3 additions & 1 deletion bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion ...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .../kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions docs/book/src/developer/providers/v1.1-to-v1.2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down