From 6a167cc9e67dbdd81c3df572ecdb11e5344e7471 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 19 Sep 2019 13:06:46 +0100 Subject: [PATCH] Enable all CertificateRequest controllers by default Signed-off-by: James Munnelly --- cmd/controller/app/BUILD.bazel | 8 -------- cmd/controller/app/controller.go | 19 ------------------- cmd/controller/app/options/BUILD.bazel | 5 +++++ cmd/controller/app/options/options.go | 5 +++++ 4 files changed, 10 insertions(+), 27 deletions(-) diff --git a/cmd/controller/app/BUILD.bazel b/cmd/controller/app/BUILD.bazel index 2905ab573..2db4b7228 100644 --- a/cmd/controller/app/BUILD.bazel +++ b/cmd/controller/app/BUILD.bazel @@ -11,19 +11,11 @@ go_library( "//pkg/client/clientset/versioned/scheme:go_default_library", "//pkg/client/informers/externalversions:go_default_library", "//pkg/controller:go_default_library", - "//pkg/controller/certificaterequests/acme:go_default_library", - "//pkg/controller/certificaterequests/ca:go_default_library", - "//pkg/controller/certificaterequests/selfsigned:go_default_library", - "//pkg/controller/certificaterequests/vault:go_default_library", - "//pkg/controller/certificaterequests/venafi:go_default_library", - "//pkg/controller/certificates:go_default_library", "//pkg/controller/clusterissuers:go_default_library", - "//pkg/feature:go_default_library", "//pkg/issuer/acme/dns/util:go_default_library", "//pkg/logs:go_default_library", "//pkg/metrics:go_default_library", "//pkg/util:go_default_library", - "//pkg/util/feature:go_default_library", "//pkg/util/kube:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/cmd/controller/app/controller.go b/cmd/controller/app/controller.go index 4dbf9ab6b..5e4741456 100644 --- a/cmd/controller/app/controller.go +++ b/cmd/controller/app/controller.go @@ -42,19 +42,11 @@ import ( intscheme "github.com/jetstack/cert-manager/pkg/client/clientset/versioned/scheme" informers "github.com/jetstack/cert-manager/pkg/client/informers/externalversions" "github.com/jetstack/cert-manager/pkg/controller" - cracmecontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/acme" - crcacontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/ca" - crselfsignedcontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/selfsigned" - crvaultcontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/vault" - crvenaficontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/venafi" - certificatescontroller "github.com/jetstack/cert-manager/pkg/controller/certificates" "github.com/jetstack/cert-manager/pkg/controller/clusterissuers" - "github.com/jetstack/cert-manager/pkg/feature" dnsutil "github.com/jetstack/cert-manager/pkg/issuer/acme/dns/util" logf "github.com/jetstack/cert-manager/pkg/logs" "github.com/jetstack/cert-manager/pkg/metrics" "github.com/jetstack/cert-manager/pkg/util" - utilfeature "github.com/jetstack/cert-manager/pkg/util/feature" "github.com/jetstack/cert-manager/pkg/util/kube" ) @@ -80,17 +72,6 @@ func Run(opts *options.ControllerOptions, stopCh <-chan struct{}) { metrics.Default.Start(stopCh) }() - if utilfeature.DefaultFeatureGate.Enabled(feature.CertificateRequestControllers) { - opts.EnabledControllers = append(opts.EnabledControllers, []string{ - cracmecontroller.CRControllerName, - crcacontroller.CRControllerName, - crselfsignedcontroller.CRControllerName, - crvaultcontroller.CRControllerName, - crvenaficontroller.CRControllerName, - certificatescontroller.ExperimentalControllerName, - }...) - } - var additionalRunFuncs []controller.RunFunc run := func(_ context.Context) { for n, fn := range controller.Known() { diff --git a/cmd/controller/app/options/BUILD.bazel b/cmd/controller/app/options/BUILD.bazel index 15405e848..a5f0eb0d0 100644 --- a/cmd/controller/app/options/BUILD.bazel +++ b/cmd/controller/app/options/BUILD.bazel @@ -9,6 +9,11 @@ go_library( "//pkg/apis/certmanager/v1alpha1:go_default_library", "//pkg/controller/acmechallenges:go_default_library", "//pkg/controller/acmeorders:go_default_library", + "//pkg/controller/certificaterequests/acme:go_default_library", + "//pkg/controller/certificaterequests/ca:go_default_library", + "//pkg/controller/certificaterequests/selfsigned:go_default_library", + "//pkg/controller/certificaterequests/vault:go_default_library", + "//pkg/controller/certificaterequests/venafi:go_default_library", "//pkg/controller/certificates:go_default_library", "//pkg/controller/clusterissuers:go_default_library", "//pkg/controller/ingress-shim:go_default_library", diff --git a/cmd/controller/app/options/options.go b/cmd/controller/app/options/options.go index 15bac51a6..ae6081b26 100644 --- a/cmd/controller/app/options/options.go +++ b/cmd/controller/app/options/options.go @@ -27,6 +27,11 @@ import ( cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1" challengescontroller "github.com/jetstack/cert-manager/pkg/controller/acmechallenges" orderscontroller "github.com/jetstack/cert-manager/pkg/controller/acmeorders" + cracmecontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/acme" + crcacontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/ca" + crselfsignedcontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/selfsigned" + crvaultcontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/vault" + crvenaficontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/venafi" certificatescontroller "github.com/jetstack/cert-manager/pkg/controller/certificates" clusterissuerscontroller "github.com/jetstack/cert-manager/pkg/controller/clusterissuers" ingressshimcontroller "github.com/jetstack/cert-manager/pkg/controller/ingress-shim"