From 40e3c87aa91c0cc2d8d01f3e3ac04ae640240fbd Mon Sep 17 00:00:00 2001 From: joshvanl Date: Wed, 1 Dec 2021 14:10:07 +0000 Subject: [PATCH] Wires up ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO feature gate with controller flags and registering SecretTemplate controller Signed-off-by: joshvanl --- cmd/controller/app/options/BUILD.bazel | 1 + cmd/controller/app/options/options.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/cmd/controller/app/options/BUILD.bazel b/cmd/controller/app/options/BUILD.bazel index 62528906b..6cf1b7012 100644 --- a/cmd/controller/app/options/BUILD.bazel +++ b/cmd/controller/app/options/BUILD.bazel @@ -25,6 +25,7 @@ go_library( "//pkg/controller/certificates/readiness:go_default_library", "//pkg/controller/certificates/requestmanager:go_default_library", "//pkg/controller/certificates/revisionmanager:go_default_library", + "//pkg/controller/certificates/secrettemplate:go_default_library", "//pkg/controller/certificates/trigger:go_default_library", "//pkg/controller/certificatesigningrequests/acme:go_default_library", "//pkg/controller/certificatesigningrequests/ca:go_default_library", diff --git a/cmd/controller/app/options/options.go b/cmd/controller/app/options/options.go index 06fdc608a..250dd8fef 100644 --- a/cmd/controller/app/options/options.go +++ b/cmd/controller/app/options/options.go @@ -44,6 +44,7 @@ import ( "github.com/jetstack/cert-manager/pkg/controller/certificates/readiness" "github.com/jetstack/cert-manager/pkg/controller/certificates/requestmanager" "github.com/jetstack/cert-manager/pkg/controller/certificates/revisionmanager" + "github.com/jetstack/cert-manager/pkg/controller/certificates/secrettemplate" "github.com/jetstack/cert-manager/pkg/controller/certificates/trigger" csracmecontroller "github.com/jetstack/cert-manager/pkg/controller/certificatesigningrequests/acme" csrcacontroller "github.com/jetstack/cert-manager/pkg/controller/certificatesigningrequests/ca" @@ -174,6 +175,7 @@ var ( requestmanager.ControllerName, readiness.ControllerName, revisionmanager.ControllerName, + secrettemplate.ControllerName, } defaultEnabledControllers = []string{ @@ -432,5 +434,10 @@ func (o *ControllerOptions) EnabledControllers() sets.String { enabled = enabled.Insert(shimgatewaycontroller.ControllerName) } + if utilfeature.DefaultFeatureGate.Enabled(feature.ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO) { + logf.Log.Info("enabling the SecretTemplate controller and using Apply operations for Secret management") + enabled = enabled.Insert(secrettemplate.ControllerName) + } + return enabled }