fix npe in serviceAccount flow

mjudeikis · mjudeikis · commit cf6d113f2468 · 2024-09-22T16:04:48.000+03:00
diff --git a/pkg/kubeapiserver/authenticator/config.go b/pkg/kubeapiserver/authenticator/config.go
@@ -138,7 +138,7 @@ func (config Config) New(serverLifecycle context.Context) (authenticator.Request
 		}
 		tokenAuthenticators = append(tokenAuthenticators, serviceAccountAuth)
 	}
-	if len(config.ServiceAccountIssuers) > 0 {
+	if len(config.ServiceAccountIssuers) > 0 && config.ServiceAccountPublicKeysGetter != nil {
 		serviceAccountAuth, err := newServiceAccountAuthenticator(config.ServiceAccountIssuers, config.ServiceAccountPublicKeysGetter, config.APIAudiences, config.ServiceAccountTokenGetter)
 		if err != nil {
 			return nil, nil, nil, nil, err

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func (config Config) New(serverLifecycle context.Context) (authenticator.Request`
`138`	`138`	`}`
`139`	`139`	`tokenAuthenticators = append(tokenAuthenticators, serviceAccountAuth)`
`140`	`140`	`}`
`141`		`- if len(config.ServiceAccountIssuers) > 0 {`
	`141`	`+ if len(config.ServiceAccountIssuers) > 0 && config.ServiceAccountPublicKeysGetter != nil {`
`142`	`142`	`serviceAccountAuth, err := newServiceAccountAuthenticator(config.ServiceAccountIssuers, config.ServiceAccountPublicKeysGetter, config.APIAudiences, config.ServiceAccountTokenGetter)`
`143`	`143`	`if err != nil {`
`144`	`144`	`return nil, nil, nil, nil, err`