mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #85094 from rosti/kubeadm-hyperkube-deprecation-notice
kubeadm: Deprecate hyperkube use
This commit is contained in:
commit
0968636760
@ -14,6 +14,7 @@ go_library(
|
|||||||
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
|
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
|
||||||
"//cmd/kubeadm/app/constants:go_default_library",
|
"//cmd/kubeadm/app/constants:go_default_library",
|
||||||
"//cmd/kubeadm/app/util:go_default_library",
|
"//cmd/kubeadm/app/util:go_default_library",
|
||||||
|
"//vendor/k8s.io/klog:go_default_library",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ package images
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
"k8s.io/klog"
|
||||||
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
||||||
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
||||||
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
|
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
|
||||||
@ -32,7 +33,8 @@ func GetGenericImage(prefix, image, tag string) string {
|
|||||||
// GetKubernetesImage generates and returns the image for the components managed in the Kubernetes main repository,
|
// GetKubernetesImage generates and returns the image for the components managed in the Kubernetes main repository,
|
||||||
// including the control-plane components and kube-proxy. If specified, the HyperKube image will be used.
|
// including the control-plane components and kube-proxy. If specified, the HyperKube image will be used.
|
||||||
func GetKubernetesImage(image string, cfg *kubeadmapi.ClusterConfiguration) string {
|
func GetKubernetesImage(image string, cfg *kubeadmapi.ClusterConfiguration) string {
|
||||||
if cfg.UseHyperKubeImage {
|
if cfg.UseHyperKubeImage && image != constants.HyperKube {
|
||||||
|
klog.Warningf(`WARNING: DEPRECATED use of the "hyperkube" image in place of %q`, image)
|
||||||
image = constants.HyperKube
|
image = constants.HyperKube
|
||||||
}
|
}
|
||||||
repoPrefix := cfg.GetControlPlaneImageRepository()
|
repoPrefix := cfg.GetControlPlaneImageRepository()
|
||||||
@ -91,6 +93,7 @@ func GetControlPlaneImages(cfg *kubeadmapi.ClusterConfiguration) []string {
|
|||||||
|
|
||||||
// start with core kubernetes images
|
// start with core kubernetes images
|
||||||
if cfg.UseHyperKubeImage {
|
if cfg.UseHyperKubeImage {
|
||||||
|
klog.Warningln(`WARNING: DEPRECATED use of the "hyperkube" image for the Kubernetes control plane`)
|
||||||
imgs = append(imgs, GetKubernetesImage(constants.HyperKube, cfg))
|
imgs = append(imgs, GetKubernetesImage(constants.HyperKube, cfg))
|
||||||
} else {
|
} else {
|
||||||
imgs = append(imgs, GetKubernetesImage(constants.KubeAPIServer, cfg))
|
imgs = append(imgs, GetKubernetesImage(constants.KubeAPIServer, cfg))
|
||||||
|
Loading…
Reference in New Issue
Block a user