From 76bf5a41cf4f59f2eaa7665a91d68f8e0bd19757 Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Sun, 14 Aug 2022 12:49:45 +0300 Subject: [PATCH] cmd/kubeadm: Replace deprecated func usage from the `k8s.io/utils/pointer` pkg --- cmd/kubeadm/app/componentconfigs/kubelet.go | 10 +++--- .../app/componentconfigs/kubelet_test.go | 34 +++++++++---------- cmd/kubeadm/app/phases/upgrade/health.go | 10 +++--- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cmd/kubeadm/app/componentconfigs/kubelet.go b/cmd/kubeadm/app/componentconfigs/kubelet.go index 5c000574570..9e3be48dee5 100644 --- a/cmd/kubeadm/app/componentconfigs/kubelet.go +++ b/cmd/kubeadm/app/componentconfigs/kubelet.go @@ -23,7 +23,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" kubeletconfig "k8s.io/kubelet/config/v1beta1" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" @@ -151,7 +151,7 @@ func (kc *kubeletConfig) Default(cfg *kubeadmapi.ClusterConfiguration, _ *kubead } if kc.config.Authentication.Anonymous.Enabled == nil { - kc.config.Authentication.Anonymous.Enabled = utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled) + kc.config.Authentication.Anonymous.Enabled = pointer.Bool(kubeletAuthenticationAnonymousEnabled) } else if *kc.config.Authentication.Anonymous.Enabled { warnDefaultComponentConfigValue(kind, "authentication.anonymous.enabled", kubeletAuthenticationAnonymousEnabled, *kc.config.Authentication.Anonymous.Enabled) } @@ -166,7 +166,7 @@ func (kc *kubeletConfig) Default(cfg *kubeadmapi.ClusterConfiguration, _ *kubead // Let clients using other authentication methods like ServiceAccount tokens also access the kubelet API if kc.config.Authentication.Webhook.Enabled == nil { - kc.config.Authentication.Webhook.Enabled = utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled) + kc.config.Authentication.Webhook.Enabled = pointer.Bool(kubeletAuthenticationWebhookEnabled) } else if !*kc.config.Authentication.Webhook.Enabled { warnDefaultComponentConfigValue(kind, "authentication.webhook.enabled", kubeletAuthenticationWebhookEnabled, *kc.config.Authentication.Webhook.Enabled) } @@ -179,7 +179,7 @@ func (kc *kubeletConfig) Default(cfg *kubeadmapi.ClusterConfiguration, _ *kubead } if kc.config.HealthzPort == nil { - kc.config.HealthzPort = utilpointer.Int32Ptr(constants.KubeletHealthzPort) + kc.config.HealthzPort = pointer.Int32(constants.KubeletHealthzPort) } else if *kc.config.HealthzPort != constants.KubeletHealthzPort { warnDefaultComponentConfigValue(kind, "healthzPort", constants.KubeletHealthzPort, *kc.config.HealthzPort) } @@ -203,7 +203,7 @@ func (kc *kubeletConfig) Default(cfg *kubeadmapi.ClusterConfiguration, _ *kubead } if ok { if kc.config.ResolverConfig == nil { - kc.config.ResolverConfig = utilpointer.String(kubeletSystemdResolverConfig) + kc.config.ResolverConfig = pointer.String(kubeletSystemdResolverConfig) } else { if *kc.config.ResolverConfig != kubeletSystemdResolverConfig { warnDefaultComponentConfigValue(kind, "resolvConf", kubeletSystemdResolverConfig, *kc.config.ResolverConfig) diff --git a/cmd/kubeadm/app/componentconfigs/kubelet_test.go b/cmd/kubeadm/app/componentconfigs/kubelet_test.go index 7f68931f9d2..cc46a7b250d 100644 --- a/cmd/kubeadm/app/componentconfigs/kubelet_test.go +++ b/cmd/kubeadm/app/componentconfigs/kubelet_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" clientsetfake "k8s.io/client-go/kubernetes/fake" kubeletconfig "k8s.io/kubelet/config/v1beta1" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" @@ -52,7 +52,7 @@ func TestKubeletDefault(t *testing.T) { var resolverConfig *string if isSystemdResolvedActive, _ := isServiceActive("systemd-resolved"); isSystemdResolvedActive { // If systemd-resolved is active, we need to set the default resolver config - resolverConfig = utilpointer.String(kubeletSystemdResolverConfig) + resolverConfig = pointer.String(kubeletSystemdResolverConfig) } tests := []struct { @@ -73,17 +73,17 @@ func TestKubeletDefault(t *testing.T) { ClientCAFile: constants.CACertName, }, Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), + Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled), }, Webhook: kubeletconfig.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), + Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled), }, }, Authorization: kubeletconfig.KubeletAuthorization{ Mode: kubeletconfig.KubeletAuthorizationModeWebhook, }, HealthzBindAddress: kubeletHealthzBindAddress, - HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), + HealthzPort: pointer.Int32(constants.KubeletHealthzPort), RotateCertificates: kubeletRotateCertificates, ResolverConfig: resolverConfig, CgroupDriver: constants.CgroupDriverSystemd, @@ -107,17 +107,17 @@ func TestKubeletDefault(t *testing.T) { ClientCAFile: constants.CACertName, }, Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), + Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled), }, Webhook: kubeletconfig.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), + Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled), }, }, Authorization: kubeletconfig.KubeletAuthorization{ Mode: kubeletconfig.KubeletAuthorizationModeWebhook, }, HealthzBindAddress: kubeletHealthzBindAddress, - HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), + HealthzPort: pointer.Int32(constants.KubeletHealthzPort), RotateCertificates: kubeletRotateCertificates, ResolverConfig: resolverConfig, CgroupDriver: constants.CgroupDriverSystemd, @@ -141,17 +141,17 @@ func TestKubeletDefault(t *testing.T) { ClientCAFile: constants.CACertName, }, Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), + Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled), }, Webhook: kubeletconfig.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), + Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled), }, }, Authorization: kubeletconfig.KubeletAuthorization{ Mode: kubeletconfig.KubeletAuthorizationModeWebhook, }, HealthzBindAddress: kubeletHealthzBindAddress, - HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), + HealthzPort: pointer.Int32(constants.KubeletHealthzPort), RotateCertificates: kubeletRotateCertificates, ResolverConfig: resolverConfig, CgroupDriver: constants.CgroupDriverSystemd, @@ -176,17 +176,17 @@ func TestKubeletDefault(t *testing.T) { ClientCAFile: constants.CACertName, }, Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), + Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled), }, Webhook: kubeletconfig.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), + Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled), }, }, Authorization: kubeletconfig.KubeletAuthorization{ Mode: kubeletconfig.KubeletAuthorizationModeWebhook, }, HealthzBindAddress: kubeletHealthzBindAddress, - HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), + HealthzPort: pointer.Int32(constants.KubeletHealthzPort), RotateCertificates: kubeletRotateCertificates, ResolverConfig: resolverConfig, CgroupDriver: constants.CgroupDriverSystemd, @@ -208,17 +208,17 @@ func TestKubeletDefault(t *testing.T) { ClientCAFile: filepath.Join("/path/to/certs", constants.CACertName), }, Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), + Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled), }, Webhook: kubeletconfig.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), + Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled), }, }, Authorization: kubeletconfig.KubeletAuthorization{ Mode: kubeletconfig.KubeletAuthorizationModeWebhook, }, HealthzBindAddress: kubeletHealthzBindAddress, - HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), + HealthzPort: pointer.Int32(constants.KubeletHealthzPort), RotateCertificates: kubeletRotateCertificates, ResolverConfig: resolverConfig, CgroupDriver: constants.CgroupDriverSystemd, diff --git a/cmd/kubeadm/app/phases/upgrade/health.go b/cmd/kubeadm/app/phases/upgrade/health.go index 79d3c379237..f045991a244 100644 --- a/cmd/kubeadm/app/phases/upgrade/health.go +++ b/cmd/kubeadm/app/phases/upgrade/health.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/pointer" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/constants" @@ -114,14 +114,14 @@ func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration) Namespace: ns, }, Spec: batchv1.JobSpec{ - BackoffLimit: utilpointer.Int32Ptr(0), + BackoffLimit: pointer.Int32(0), Template: v1.PodTemplateSpec{ Spec: v1.PodSpec{ RestartPolicy: v1.RestartPolicyNever, SecurityContext: &v1.PodSecurityContext{ - RunAsUser: utilpointer.Int64Ptr(999), - RunAsGroup: utilpointer.Int64Ptr(999), - RunAsNonRoot: utilpointer.BoolPtr(true), + RunAsUser: pointer.Int64(999), + RunAsGroup: pointer.Int64(999), + RunAsNonRoot: pointer.Bool(true), }, Tolerations: []v1.Toleration{ {