From 6cef8492e7154e5292c1d978295f40cf426a0084 Mon Sep 17 00:00:00 2001 From: PatrickLaabs Date: Sun, 6 Jul 2025 10:49:34 +0200 Subject: [PATCH] chore: depr. pointer pkg replacement for cli-runtime --- staging/publishing/import-restrictions.yaml | 2 +- .../pkg/genericclioptions/config_flags.go | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 50a077fa2b0..f910a3bd7cf 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -33,7 +33,7 @@ - k8s.io/cli-runtime/pkg/printers - k8s.io/cli-runtime/pkg/resource - k8s.io/cli-runtime/pkg/kustomize - - k8s.io/utils/pointer + - k8s.io/utils/ptr - baseImportPath: "./staging/src/k8s.io/apimachinery" allowedImports: diff --git a/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go b/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go index 9c168350960..8dba84e3420 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go +++ b/staging/src/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go @@ -35,7 +35,7 @@ import ( "k8s.io/client-go/restmapper" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" - utilpointer "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) const ( @@ -414,8 +414,8 @@ func (f *ConfigFlags) AddFlags(flags *pflag.FlagSet) { // WithDeprecatedPasswordFlag enables the username and password config flags func (f *ConfigFlags) WithDeprecatedPasswordFlag() *ConfigFlags { - f.Username = utilpointer.String("") - f.Password = utilpointer.String("") + f.Username = ptr.To("") + f.Password = ptr.To("") return f } @@ -451,22 +451,22 @@ func NewConfigFlags(usePersistentConfig bool) *ConfigFlags { return &ConfigFlags{ Insecure: &insecure, - Timeout: utilpointer.String("0"), - KubeConfig: utilpointer.String(""), + Timeout: ptr.To("0"), + KubeConfig: ptr.To(""), - CacheDir: utilpointer.String(getDefaultCacheDir()), - ClusterName: utilpointer.String(""), - AuthInfoName: utilpointer.String(""), - Context: utilpointer.String(""), - Namespace: utilpointer.String(""), - APIServer: utilpointer.String(""), - TLSServerName: utilpointer.String(""), - CertFile: utilpointer.String(""), - KeyFile: utilpointer.String(""), - CAFile: utilpointer.String(""), - BearerToken: utilpointer.String(""), - Impersonate: utilpointer.String(""), - ImpersonateUID: utilpointer.String(""), + CacheDir: ptr.To(getDefaultCacheDir()), + ClusterName: ptr.To(""), + AuthInfoName: ptr.To(""), + Context: ptr.To(""), + Namespace: ptr.To(""), + APIServer: ptr.To(""), + TLSServerName: ptr.To(""), + CertFile: ptr.To(""), + KeyFile: ptr.To(""), + CAFile: ptr.To(""), + BearerToken: ptr.To(""), + Impersonate: ptr.To(""), + ImpersonateUID: ptr.To(""), ImpersonateGroup: &impersonateGroup, DisableCompression: &disableCompression,