From 79d0dde4a83ce48170ac0229c5f809955dcb509e Mon Sep 17 00:00:00 2001 From: gccio Date: Fri, 15 Sep 2023 08:37:15 +0800 Subject: [PATCH] replace hardcode string with exists variable --- cmd/kube-controller-manager/app/controllermanager.go | 2 +- .../app/validatingadmissionpolicystatus.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index b60dba90e20..17c376ddc6a 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -482,7 +482,7 @@ func NewControllerInitializers(loopMode ControllerLoopMode) map[string]InitFunc register(names.LegacyServiceAccountTokenCleanerController, startLegacySATokenCleaner) } if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.ValidatingAdmissionPolicy) { - register("validatingadmissionpolicy-status-controller", startValidatingAdmissionPolicyStatusController) + register(names.ValidatingAdmissionPolicyStatusController, startValidatingAdmissionPolicyStatusController) } return controllers diff --git a/cmd/kube-controller-manager/app/validatingadmissionpolicystatus.go b/cmd/kube-controller-manager/app/validatingadmissionpolicystatus.go index 833d24d77f7..ca5ceeb2b0e 100644 --- a/cmd/kube-controller-manager/app/validatingadmissionpolicystatus.go +++ b/cmd/kube-controller-manager/app/validatingadmissionpolicystatus.go @@ -23,6 +23,7 @@ import ( "k8s.io/apiserver/pkg/cel/openapi/resolver" "k8s.io/client-go/kubernetes/scheme" "k8s.io/controller-manager/controller" + "k8s.io/kubernetes/cmd/kube-controller-manager/names" "k8s.io/kubernetes/pkg/controller/validatingadmissionpolicystatus" "k8s.io/kubernetes/pkg/generated/openapi" ) @@ -35,7 +36,7 @@ func startValidatingAdmissionPolicyStatusController(ctx context.Context, control } c, err := validatingadmissionpolicystatus.NewController( controllerContext.InformerFactory.Admissionregistration().V1beta1().ValidatingAdmissionPolicies(), - controllerContext.ClientBuilder.ClientOrDie("validatingadmissionpolicy-status-controller").AdmissionregistrationV1beta1().ValidatingAdmissionPolicies(), + controllerContext.ClientBuilder.ClientOrDie(names.ValidatingAdmissionPolicyStatusController).AdmissionregistrationV1beta1().ValidatingAdmissionPolicies(), typeChecker, )