github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-22 07:03:28 +00:00
Code Issues Projects Releases Wiki Activity

replacing deprecated pointer pkg with newer package version

Browse Source
This commit is contained in:
PatrickLaabs
2025-06-25 13:21:46 +02:00
parent b8b3984874
commit 9de075def7
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubeapiserver/options/authentication.go
View File

@@ -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,
}
}

26
pkg/kubeapiserver/options/authentication_test.go
View File

@@ -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(""),
},
},
},