From a81bc3325bf4e2110bc7ad2fe387b9b8cc8ae25c Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Sat, 30 Mar 2024 21:30:05 -0700 Subject: [PATCH] Transition from deprecated pointer library to ptr (#9801) (#9825) Signed-off-by: Derek Nola --- pkg/agent/run.go | 6 +++--- pkg/agent/run_test.go | 4 ++-- pkg/cli/secretsencrypt/secrets_encrypt.go | 12 ++++++------ pkg/cli/token/token.go | 4 ++-- pkg/cloudprovider/servicelb.go | 4 ++-- pkg/etcd/snapshot.go | 4 ++-- pkg/nodepassword/nodepassword.go | 4 ++-- pkg/server/secrets-encrypt.go | 6 +++--- pkg/spegel/spegel.go | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkg/agent/run.go b/pkg/agent/run.go index f0b5cf914f..94d33bda91 100644 --- a/pkg/agent/run.go +++ b/pkg/agent/run.go @@ -47,7 +47,7 @@ import ( app2 "k8s.io/kubernetes/cmd/kube-proxy/app" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" utilsnet "k8s.io/utils/net" - utilpointer "k8s.io/utils/pointer" + utilsptr "k8s.io/utils/ptr" ) func run(ctx context.Context, cfg cmds.Agent, proxy proxy.Proxy) error { @@ -200,8 +200,8 @@ func run(ctx context.Context, cfg cmds.Agent, proxy proxy.Proxy) error { // When running rootless, we do not attempt to set conntrack sysctls - this behavior is copied from kubeadm. func getConntrackConfig(nodeConfig *daemonconfig.Node) (*kubeproxyconfig.KubeProxyConntrackConfiguration, error) { ctConfig := &kubeproxyconfig.KubeProxyConntrackConfiguration{ - MaxPerCore: utilpointer.Int32Ptr(0), - Min: utilpointer.Int32Ptr(0), + MaxPerCore: utilsptr.To(int32(0)), + Min: utilsptr.To(int32(0)), TCPEstablishedTimeout: &metav1.Duration{}, TCPCloseWaitTimeout: &metav1.Duration{}, } diff --git a/pkg/agent/run_test.go b/pkg/agent/run_test.go index 893f3ceabe..73c95bd2e2 100644 --- a/pkg/agent/run_test.go +++ b/pkg/agent/run_test.go @@ -9,7 +9,7 @@ import ( v1alpha1 "k8s.io/kube-proxy/config/v1alpha1" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1" - utilpointer "k8s.io/utils/pointer" + utilsptr "k8s.io/utils/ptr" ) func Test_UnitGetConntrackConfig(t *testing.T) { @@ -23,7 +23,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) { } customConfig := defaultConfig.DeepCopy() - customConfig.Conntrack.Min = utilpointer.Int32Ptr(100) + customConfig.Conntrack.Min = utilsptr.To(int32(100)) customConfig.Conntrack.TCPCloseWaitTimeout.Duration = 42 * time.Second type args struct { diff --git a/pkg/cli/secretsencrypt/secrets_encrypt.go b/pkg/cli/secretsencrypt/secrets_encrypt.go index d1fa095300..fc4ad8ded2 100644 --- a/pkg/cli/secretsencrypt/secrets_encrypt.go +++ b/pkg/cli/secretsencrypt/secrets_encrypt.go @@ -17,7 +17,7 @@ import ( "github.com/k3s-io/k3s/pkg/version" "github.com/pkg/errors" "github.com/urfave/cli" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func commandPrep(app *cli.Context, cfg *cmds.Server) (*clientaccess.Info, error) { @@ -54,7 +54,7 @@ func Enable(app *cli.Context) error { if err != nil { return err } - b, err := json.Marshal(server.EncryptionRequest{Enable: pointer.Bool(true)}) + b, err := json.Marshal(server.EncryptionRequest{Enable: ptr.To(true)}) if err != nil { return err } @@ -74,7 +74,7 @@ func Disable(app *cli.Context) error { if err != nil { return err } - b, err := json.Marshal(server.EncryptionRequest{Enable: pointer.Bool(false)}) + b, err := json.Marshal(server.EncryptionRequest{Enable: ptr.To(false)}) if err != nil { return err } @@ -156,7 +156,7 @@ func Prepare(app *cli.Context) error { return err } b, err := json.Marshal(server.EncryptionRequest{ - Stage: pointer.StringPtr(secretsencrypt.EncryptionPrepare), + Stage: ptr.To(secretsencrypt.EncryptionPrepare), Force: cmds.ServerConfig.EncryptForce, }) if err != nil { @@ -178,7 +178,7 @@ func Rotate(app *cli.Context) error { return err } b, err := json.Marshal(server.EncryptionRequest{ - Stage: pointer.StringPtr(secretsencrypt.EncryptionRotate), + Stage: ptr.To(secretsencrypt.EncryptionRotate), Force: cmds.ServerConfig.EncryptForce, }) if err != nil { @@ -201,7 +201,7 @@ func Reencrypt(app *cli.Context) error { return err } b, err := json.Marshal(server.EncryptionRequest{ - Stage: pointer.StringPtr(secretsencrypt.EncryptionReencryptActive), + Stage: ptr.To(secretsencrypt.EncryptionReencryptActive), Force: cmds.ServerConfig.EncryptForce, Skip: cmds.ServerConfig.EncryptSkip, }) diff --git a/pkg/cli/token/token.go b/pkg/cli/token/token.go index c8d7d2ce98..7af7cee82c 100644 --- a/pkg/cli/token/token.go +++ b/pkg/cli/token/token.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/tools/clientcmd" bootstrapapi "k8s.io/cluster-bootstrap/token/api" bootstraputil "k8s.io/cluster-bootstrap/token/util" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func Create(app *cli.Context) error { @@ -155,7 +155,7 @@ func Rotate(app *cli.Context) error { return err } b, err := json.Marshal(server.TokenRotateRequest{ - NewToken: pointer.String(cmds.TokenConfig.NewToken), + NewToken: ptr.To(cmds.TokenConfig.NewToken), }) if err != nil { return err diff --git a/pkg/cloudprovider/servicelb.go b/pkg/cloudprovider/servicelb.go index cc72d63853..0058af2108 100644 --- a/pkg/cloudprovider/servicelb.go +++ b/pkg/cloudprovider/servicelb.go @@ -28,7 +28,7 @@ import ( ccmapp "k8s.io/cloud-provider/app" servicehelper "k8s.io/cloud-provider/service/helpers" utilsnet "k8s.io/utils/net" - utilpointer "k8s.io/utils/pointer" + utilsptr "k8s.io/utils/ptr" ) var ( @@ -486,7 +486,7 @@ func (k *k3s) newDaemonSet(svc *core.Service) (*apps.DaemonSet, error) { }, Spec: core.PodSpec{ ServiceAccountName: "svclb", - AutomountServiceAccountToken: utilpointer.Bool(false), + AutomountServiceAccountToken: utilsptr.To(false), SecurityContext: &core.PodSecurityContext{ Sysctls: sysctls, }, diff --git a/pkg/etcd/snapshot.go b/pkg/etcd/snapshot.go index a481985171..cd50c5b139 100644 --- a/pkg/etcd/snapshot.go +++ b/pkg/etcd/snapshot.go @@ -42,7 +42,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) const ( @@ -1068,7 +1068,7 @@ func (sf *snapshotFile) toETCDSnapshotFile(esf *apisv1.ETCDSnapshotFile) { esf.Spec.SnapshotName = sf.Name esf.Spec.Location = sf.Location esf.Status.CreationTime = sf.CreatedAt - esf.Status.ReadyToUse = pointer.Bool(sf.Status == successfulSnapshotStatus) + esf.Status.ReadyToUse = ptr.To(sf.Status == successfulSnapshotStatus) esf.Status.Size = resource.NewQuantity(sf.Size, resource.DecimalSI) if sf.nodeSource != "" { diff --git a/pkg/nodepassword/nodepassword.go b/pkg/nodepassword/nodepassword.go index defb5e8481..708c6c577c 100644 --- a/pkg/nodepassword/nodepassword.go +++ b/pkg/nodepassword/nodepassword.go @@ -15,7 +15,7 @@ import ( v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) var ( @@ -80,7 +80,7 @@ func Ensure(secretClient coreclient.SecretController, nodeName, pass string) err Name: getSecretName(nodeName), Namespace: metav1.NamespaceSystem, }, - Immutable: pointer.Bool(true), + Immutable: ptr.To(true), Data: map[string][]byte{"hash": []byte(hash)}, }) } diff --git a/pkg/server/secrets-encrypt.go b/pkg/server/secrets-encrypt.go index adde459a90..582f61843c 100644 --- a/pkg/server/secrets-encrypt.go +++ b/pkg/server/secrets-encrypt.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" apiserverconfigv1 "k8s.io/apiserver/pkg/apis/config/v1" "k8s.io/client-go/util/retry" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) const aescbcKeySize = 32 @@ -83,9 +83,9 @@ func encryptionStatus(server *config.Control) (EncryptionState, error) { return state, err } if providers[1].Identity != nil && providers[0].AESCBC != nil { - state.Enable = pointer.Bool(true) + state.Enable = ptr.To(true) } else if providers[0].Identity != nil && providers[1].AESCBC != nil || !server.EncryptSecrets { - state.Enable = pointer.Bool(false) + state.Enable = ptr.To(false) } if err := verifyEncryptionHashAnnotation(server.Runtime, server.Runtime.Core.Core(), ""); err != nil { diff --git a/pkg/spegel/spegel.go b/pkg/spegel/spegel.go index 8c42eea1e1..1fa589ec13 100644 --- a/pkg/spegel/spegel.go +++ b/pkg/spegel/spegel.go @@ -20,7 +20,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/request/union" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" "github.com/go-logr/logr" "github.com/go-logr/stdr" @@ -141,7 +141,7 @@ func (c *Config) Start(ctx context.Context, nodeConfig *config.Node) error { if logrus.IsLevelEnabled(logrus.DebugLevel) { level = ipfslog.LevelDebug stdlog := log.New(logrus.StandardLogger().Writer(), "spegel ", log.LstdFlags) - logger := stdr.NewWithOptions(stdlog, stdr.Options{Verbosity: pointer.Int(10)}) + logger := stdr.NewWithOptions(stdlog, stdr.Options{Verbosity: ptr.To(10)}) ctx = logr.NewContext(ctx, logger) } ipfslog.SetAllLoggers(level)