github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111836 from ialidzhikov/cleanup/cmd-kubeadm

Browse Source 
cmd/kubeadm: Replace deprecated func usage from the `k8s.io/utils/pointer` pkg
This commit is contained in:
Kubernetes Prow Robot 2022-08-23 20:08:00 -07:00 committed by GitHub
commit 7f8f035ae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kubeadm/app/componentconfigs/kubelet.go
View File

@ -23,7 +23,7 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/klog/v2" "k8s.io/klog/v2"
kubeletconfig "k8s.io/kubelet/config/v1beta1" kubeletconfig "k8s.io/kubelet/config/v1beta1"
utilpointer "k8s.io/utils/pointer" "k8s.io/utils/pointer"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" 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 { 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 { } else if *kc.config.Authentication.Anonymous.Enabled {
warnDefaultComponentConfigValue(kind, "authentication.anonymous.enabled", kubeletAuthenticationAnonymousEnabled, *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 // Let clients using other authentication methods like ServiceAccount tokens also access the kubelet API
if kc.config.Authentication.Webhook.Enabled == nil { 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 { } else if !*kc.config.Authentication.Webhook.Enabled {
warnDefaultComponentConfigValue(kind, "authentication.webhook.enabled", kubeletAuthenticationWebhookEnabled, *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 { 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 { } else if *kc.config.HealthzPort != constants.KubeletHealthzPort {
warnDefaultComponentConfigValue(kind, "healthzPort", constants.KubeletHealthzPort, *kc.config.HealthzPort) warnDefaultComponentConfigValue(kind, "healthzPort", constants.KubeletHealthzPort, *kc.config.HealthzPort)
} }
@ -203,7 +203,7 @@ func (kc *kubeletConfig) Default(cfg *kubeadmapi.ClusterConfiguration, _ *kubead
} }
if ok { if ok {
if kc.config.ResolverConfig == nil { if kc.config.ResolverConfig == nil {
kc.config.ResolverConfig = utilpointer.String(kubeletSystemdResolverConfig) kc.config.ResolverConfig = pointer.String(kubeletSystemdResolverConfig)
} else { } else {
if *kc.config.ResolverConfig != kubeletSystemdResolverConfig { if *kc.config.ResolverConfig != kubeletSystemdResolverConfig {
warnDefaultComponentConfigValue(kind, "resolvConf", kubeletSystemdResolverConfig, *kc.config.ResolverConfig) warnDefaultComponentConfigValue(kind, "resolvConf", kubeletSystemdResolverConfig, *kc.config.ResolverConfig)

34
cmd/kubeadm/app/componentconfigs/kubelet_test.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
clientsetfake "k8s.io/client-go/kubernetes/fake" clientsetfake "k8s.io/client-go/kubernetes/fake"
kubeletconfig "k8s.io/kubelet/config/v1beta1" kubeletconfig "k8s.io/kubelet/config/v1beta1"
utilpointer "k8s.io/utils/pointer" "k8s.io/utils/pointer"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
@ -52,7 +52,7 @@ func TestKubeletDefault(t *testing.T) {
var resolverConfig *string var resolverConfig *string
if isSystemdResolvedActive, _ := isServiceActive("systemd-resolved"); isSystemdResolvedActive { if isSystemdResolvedActive, _ := isServiceActive("systemd-resolved"); isSystemdResolvedActive {
// If systemd-resolved is active, we need to set the default resolver config // If systemd-resolved is active, we need to set the default resolver config
resolverConfig = utilpointer.String(kubeletSystemdResolverConfig) resolverConfig = pointer.String(kubeletSystemdResolverConfig)
} }
tests := []struct { tests := []struct {
@ -73,17 +73,17 @@ func TestKubeletDefault(t *testing.T) {
ClientCAFile: constants.CACertName, ClientCAFile: constants.CACertName,
}, },
Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ Anonymous: kubeletconfig.KubeletAnonymousAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled),
}, },
Webhook: kubeletconfig.KubeletWebhookAuthentication{ Webhook: kubeletconfig.KubeletWebhookAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled),
}, },
}, },
Authorization: kubeletconfig.KubeletAuthorization{ Authorization: kubeletconfig.KubeletAuthorization{
Mode: kubeletconfig.KubeletAuthorizationModeWebhook, Mode: kubeletconfig.KubeletAuthorizationModeWebhook,
}, },
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: pointer.Int32(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig, ResolverConfig: resolverConfig,
CgroupDriver: constants.CgroupDriverSystemd, CgroupDriver: constants.CgroupDriverSystemd,
@ -107,17 +107,17 @@ func TestKubeletDefault(t *testing.T) {
ClientCAFile: constants.CACertName, ClientCAFile: constants.CACertName,
}, },
Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ Anonymous: kubeletconfig.KubeletAnonymousAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled),
}, },
Webhook: kubeletconfig.KubeletWebhookAuthentication{ Webhook: kubeletconfig.KubeletWebhookAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled),
}, },
}, },
Authorization: kubeletconfig.KubeletAuthorization{ Authorization: kubeletconfig.KubeletAuthorization{
Mode: kubeletconfig.KubeletAuthorizationModeWebhook, Mode: kubeletconfig.KubeletAuthorizationModeWebhook,
}, },
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: pointer.Int32(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig, ResolverConfig: resolverConfig,
CgroupDriver: constants.CgroupDriverSystemd, CgroupDriver: constants.CgroupDriverSystemd,
@ -141,17 +141,17 @@ func TestKubeletDefault(t *testing.T) {
ClientCAFile: constants.CACertName, ClientCAFile: constants.CACertName,
}, },
Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ Anonymous: kubeletconfig.KubeletAnonymousAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled),
}, },
Webhook: kubeletconfig.KubeletWebhookAuthentication{ Webhook: kubeletconfig.KubeletWebhookAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled),
}, },
}, },
Authorization: kubeletconfig.KubeletAuthorization{ Authorization: kubeletconfig.KubeletAuthorization{
Mode: kubeletconfig.KubeletAuthorizationModeWebhook, Mode: kubeletconfig.KubeletAuthorizationModeWebhook,
}, },
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: pointer.Int32(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig, ResolverConfig: resolverConfig,
CgroupDriver: constants.CgroupDriverSystemd, CgroupDriver: constants.CgroupDriverSystemd,
@ -176,17 +176,17 @@ func TestKubeletDefault(t *testing.T) {
ClientCAFile: constants.CACertName, ClientCAFile: constants.CACertName,
}, },
Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ Anonymous: kubeletconfig.KubeletAnonymousAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled),
}, },
Webhook: kubeletconfig.KubeletWebhookAuthentication{ Webhook: kubeletconfig.KubeletWebhookAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled),
}, },
}, },
Authorization: kubeletconfig.KubeletAuthorization{ Authorization: kubeletconfig.KubeletAuthorization{
Mode: kubeletconfig.KubeletAuthorizationModeWebhook, Mode: kubeletconfig.KubeletAuthorizationModeWebhook,
}, },
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: pointer.Int32(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig, ResolverConfig: resolverConfig,
CgroupDriver: constants.CgroupDriverSystemd, CgroupDriver: constants.CgroupDriverSystemd,
@ -208,17 +208,17 @@ func TestKubeletDefault(t *testing.T) {
ClientCAFile: filepath.Join("/path/to/certs", constants.CACertName), ClientCAFile: filepath.Join("/path/to/certs", constants.CACertName),
}, },
Anonymous: kubeletconfig.KubeletAnonymousAuthentication{ Anonymous: kubeletconfig.KubeletAnonymousAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationAnonymousEnabled), Enabled: pointer.Bool(kubeletAuthenticationAnonymousEnabled),
}, },
Webhook: kubeletconfig.KubeletWebhookAuthentication{ Webhook: kubeletconfig.KubeletWebhookAuthentication{
Enabled: utilpointer.BoolPtr(kubeletAuthenticationWebhookEnabled), Enabled: pointer.Bool(kubeletAuthenticationWebhookEnabled),
}, },
}, },
Authorization: kubeletconfig.KubeletAuthorization{ Authorization: kubeletconfig.KubeletAuthorization{
Mode: kubeletconfig.KubeletAuthorizationModeWebhook, Mode: kubeletconfig.KubeletAuthorizationModeWebhook,
}, },
HealthzBindAddress: kubeletHealthzBindAddress, HealthzBindAddress: kubeletHealthzBindAddress,
HealthzPort: utilpointer.Int32Ptr(constants.KubeletHealthzPort), HealthzPort: pointer.Int32(constants.KubeletHealthzPort),
RotateCertificates: kubeletRotateCertificates, RotateCertificates: kubeletRotateCertificates,
ResolverConfig: resolverConfig, ResolverConfig: resolverConfig,
CgroupDriver: constants.CgroupDriverSystemd, CgroupDriver: constants.CgroupDriverSystemd,

10
cmd/kubeadm/app/phases/upgrade/health.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/klog/v2" "k8s.io/klog/v2"
utilpointer "k8s.io/utils/pointer" "k8s.io/utils/pointer"
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"
@ -114,14 +114,14 @@ func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration)
Namespace: ns, Namespace: ns,
}, },
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
BackoffLimit: utilpointer.Int32Ptr(0), BackoffLimit: pointer.Int32(0),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
Spec: v1.PodSpec{ Spec: v1.PodSpec{
RestartPolicy: v1.RestartPolicyNever, RestartPolicy: v1.RestartPolicyNever,
SecurityContext: &v1.PodSecurityContext{ SecurityContext: &v1.PodSecurityContext{
RunAsUser: utilpointer.Int64Ptr(999), RunAsUser: pointer.Int64(999),
RunAsGroup: utilpointer.Int64Ptr(999), RunAsGroup: pointer.Int64(999),
RunAsNonRoot: utilpointer.BoolPtr(true), RunAsNonRoot: pointer.Bool(true),
}, },
Tolerations: []v1.Toleration{ Tolerations: []v1.Toleration{
{ {