From 9de075def7de9b24042ccef8389adfbef8591eb0 Mon Sep 17 00:00:00 2001 From: PatrickLaabs Date: Wed, 25 Jun 2025 13:21:46 +0200 Subject: [PATCH] replacing deprecated pointer pkg with newer package version --- pkg/kubeapiserver/options/authentication.go | 6 ++--- .../options/authentication_test.go | 26 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/kubeapiserver/options/authentication.go b/pkg/kubeapiserver/options/authentication.go index a8cea8abee1..83c7171301f 100644 --- a/pkg/kubeapiserver/options/authentication.go +++ b/pkg/kubeapiserver/options/authentication.go @@ -61,7 +61,7 @@ import ( "k8s.io/kubernetes/pkg/serviceaccount" "k8s.io/kubernetes/pkg/util/filesystem" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/bootstrap" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) const ( @@ -524,7 +524,7 @@ func (o *BuiltInAuthenticationOptions) ToAuthenticationConfig() (kubeauthenticat }, ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ - Prefix: pointer.String(usernamePrefix), + Prefix: ptr.To(usernamePrefix), Claim: o.OIDC.UsernameClaim, }, }, @@ -532,7 +532,7 @@ func (o *BuiltInAuthenticationOptions) ToAuthenticationConfig() (kubeauthenticat if len(o.OIDC.GroupsClaim) > 0 { jwtAuthenticator.ClaimMappings.Groups = apiserver.PrefixedClaimOrExpression{ - Prefix: pointer.String(o.OIDC.GroupsPrefix), + Prefix: ptr.To(o.OIDC.GroupsPrefix), Claim: o.OIDC.GroupsClaim, } } diff --git a/pkg/kubeapiserver/options/authentication_test.go b/pkg/kubeapiserver/options/authentication_test.go index 90128b0405f..9e2cb74e8bd 100644 --- a/pkg/kubeapiserver/options/authentication_test.go +++ b/pkg/kubeapiserver/options/authentication_test.go @@ -52,7 +52,7 @@ import ( openapicommon "k8s.io/kube-openapi/pkg/common" kubeauthenticator "k8s.io/kubernetes/pkg/kubeapiserver/authenticator" "k8s.io/kubernetes/pkg/serviceaccount" - "k8s.io/utils/pointer" + "k8s.io/utils/ptr" ) func TestAuthenticationValidate(t *testing.T) { @@ -346,7 +346,7 @@ func TestToAuthenticationConfig(t *testing.T) { ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String("https://testIssuerURL#"), + Prefix: ptr.To("https://testIssuerURL#"), }, }, }, @@ -732,7 +732,7 @@ jwt: ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String(""), + Prefix: ptr.To(""), }, }, }, @@ -824,7 +824,7 @@ func TestToAuthenticationConfig_OIDC(t *testing.T) { ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String(""), + Prefix: ptr.To(""), }, }, ClaimValidationRules: []apiserver.ClaimValidationRule{ @@ -860,7 +860,7 @@ func TestToAuthenticationConfig_OIDC(t *testing.T) { ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String("https://testIssuerURL#"), + Prefix: ptr.To("https://testIssuerURL#"), }, }, ClaimValidationRules: []apiserver.ClaimValidationRule{ @@ -896,7 +896,7 @@ func TestToAuthenticationConfig_OIDC(t *testing.T) { ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "email", - Prefix: pointer.String(""), + Prefix: ptr.To(""), }, }, ClaimValidationRules: []apiserver.ClaimValidationRule{ @@ -933,7 +933,7 @@ func TestToAuthenticationConfig_OIDC(t *testing.T) { ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String("k8s-"), + Prefix: ptr.To("k8s-"), }, }, ClaimValidationRules: []apiserver.ClaimValidationRule{ @@ -972,11 +972,11 @@ func TestToAuthenticationConfig_OIDC(t *testing.T) { ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String(""), + Prefix: ptr.To(""), }, Groups: apiserver.PrefixedClaimOrExpression{ Claim: "groups", - Prefix: pointer.String("oidc:"), + Prefix: ptr.To("oidc:"), }, }, ClaimValidationRules: []apiserver.ClaimValidationRule{ @@ -1019,7 +1019,7 @@ jwt: ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String(""), + Prefix: ptr.To(""), }, }, }, @@ -1399,7 +1399,7 @@ jwt: ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String(""), + Prefix: ptr.To(""), }, }, }, @@ -1475,7 +1475,7 @@ jwt: ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String(""), + Prefix: ptr.To(""), }, }, }, @@ -1551,7 +1551,7 @@ jwt: ClaimMappings: apiserver.ClaimMappings{ Username: apiserver.PrefixedClaimOrExpression{ Claim: "sub", - Prefix: pointer.String(""), + Prefix: ptr.To(""), }, }, },