Merge remote-tracking branch 'upstream/main' into 1-19-exec-strategy

internal/server/server.go

@@ -14,7 +14,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apiserver/pkg/authentication/authenticator"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
 	"k8s.io/client-go/kubernetes"
@@ -286,8 +285,8 @@ func getClusterCASigner(
 // Create a configuration for the aggregated API server.
 func getAggregatedAPIServerConfig(
 	dynamicCertProvider provider.DynamicTLSServingCertProvider,
-	tokenAuthenticator authenticator.Token,
-	ca credentialrequest.CertIssuer,
+	authenticator credentialrequest.TokenCredentialRequestAuthenticator,
+	issuer credentialrequest.CertIssuer,
 	startControllersPostStartHook func(context.Context),
 ) (*apiserver.Config, error) {
 	recommendedOptions := genericoptions.NewRecommendedOptions(
@@ -315,8 +314,8 @@ func getAggregatedAPIServerConfig(
 	apiServerConfig := &apiserver.Config{
 		GenericConfig: serverConfig,
 		ExtraConfig: apiserver.ExtraConfig{
-			TokenAuthenticator:            tokenAuthenticator,
-			Issuer:                        ca,
+			Authenticator:                 authenticator,
+			Issuer:                        issuer,
 			StartControllersPostStartHook: startControllersPostStartHook,
 		},
 	}