github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120606 from f4nd0y/replace-hardcode-with-exists-variable

Browse Source 
replace hardcode with exists variable
This commit is contained in:
Kubernetes Prow Robot 2023-10-15 05:55:50 +02:00 committed by GitHub
commit c65b0b71e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -481,7 +481,7 @@ func NewControllerInitializers(loopMode ControllerLoopMode) map[string]InitFunc
register(names.LegacyServiceAccountTokenCleanerController, startLegacySATokenCleaner) register(names.LegacyServiceAccountTokenCleanerController, startLegacySATokenCleaner)
} }
if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.ValidatingAdmissionPolicy) { if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.ValidatingAdmissionPolicy) {
register("validatingadmissionpolicy-status-controller", startValidatingAdmissionPolicyStatusController) register(names.ValidatingAdmissionPolicyStatusController, startValidatingAdmissionPolicyStatusController)
} }
return controllers return controllers

3
cmd/kube-controller-manager/app/validatingadmissionpolicystatus.go
View File

@ -23,6 +23,7 @@ import (
"k8s.io/apiserver/pkg/cel/openapi/resolver" "k8s.io/apiserver/pkg/cel/openapi/resolver"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/controller-manager/controller" "k8s.io/controller-manager/controller"
"k8s.io/kubernetes/cmd/kube-controller-manager/names"
"k8s.io/kubernetes/pkg/controller/validatingadmissionpolicystatus" "k8s.io/kubernetes/pkg/controller/validatingadmissionpolicystatus"
"k8s.io/kubernetes/pkg/generated/openapi" "k8s.io/kubernetes/pkg/generated/openapi"
) )
@ -35,7 +36,7 @@ func startValidatingAdmissionPolicyStatusController(ctx context.Context, control
} }
c, err := validatingadmissionpolicystatus.NewController( c, err := validatingadmissionpolicystatus.NewController(
controllerContext.InformerFactory.Admissionregistration().V1beta1().ValidatingAdmissionPolicies(), controllerContext.InformerFactory.Admissionregistration().V1beta1().ValidatingAdmissionPolicies(),
controllerContext.ClientBuilder.ClientOrDie("validatingadmissionpolicy-status-controller").AdmissionregistrationV1beta1().ValidatingAdmissionPolicies(), controllerContext.ClientBuilder.ClientOrDie(names.ValidatingAdmissionPolicyStatusController).AdmissionregistrationV1beta1().ValidatingAdmissionPolicies(),
typeChecker, typeChecker,
) )