github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: deprecate v1beta3

Browse Source 
Mark v1beta3 as deprecated by showing a warning when used
and write a note about it in the doc.go file.
This commit is contained in:
Lubomir I. Ivanov 2024-05-31 12:12:53 +03:00
parent bc92a0dfe9
commit 4af99cd676
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go
View File

@ -22,6 +22,9 @@ limitations under the License.
// Package v1beta3 defines the v1beta3 version of the kubeadm configuration file format. // Package v1beta3 defines the v1beta3 version of the kubeadm configuration file format.
// This version improves on the v1beta2 format by fixing some minor issues and adding a few new fields. // This version improves on the v1beta2 format by fixing some minor issues and adding a few new fields.
// //
// DEPRECATED: v1beta3 is deprecated in favor of v1beta4 and will be removed in a future release, 1.34 or later.
// Please migrate.
//
// A list of changes since v1beta2: // A list of changes since v1beta2:
// - The deprecated "ClusterConfiguration.useHyperKubeImage" field has been removed. // - The deprecated "ClusterConfiguration.useHyperKubeImage" field has been removed.
// Kubeadm no longer supports the hyperkube image. // Kubeadm no longer supports the hyperkube image.
@ -280,6 +283,3 @@ limitations under the License.
// //
// - APIEndpoint, that represents the endpoint of the instance of the API server to be eventually deployed on this node. // - APIEndpoint, that represents the endpoint of the instance of the API server to be eventually deployed on this node.
package v1beta3 // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" package v1beta3 // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
//TODO: The BootstrapTokenString object should move out to either k8s.io/client-go or k8s.io/api in the future
//(probably as part of Bootstrap Tokens going GA). It should not be staged under the kubeadm API as it is now.

8
cmd/kubeadm/app/util/config/common.go
View File

@ -83,11 +83,13 @@ func validateSupportedVersion(gv schema.GroupVersion, allowDeprecated, allowExpe
"kubeadm.k8s.io/v1beta2": "v1.22", "kubeadm.k8s.io/v1beta2": "v1.22",
} }
// Experimental API versions are present here until released. // Experimental API versions are present here until released. Can be used only if allowed.
experimentalAPIVersions := map[string]string{} experimentalAPIVersions := map[string]string{}
// Deprecated API versions are supported by us, but can only be used for migration. // Deprecated API versions are supported until removed. They throw a warning.
deprecatedAPIVersions := map[string]struct{}{} deprecatedAPIVersions := map[string]struct{}{
"kubeadm.k8s.io/v1beta3": {},
}
gvString := gv.String() gvString := gv.String()