From 46fd159f8137802b340db460d242069df194f277 Mon Sep 17 00:00:00 2001 From: JoshVanL Date: Fri, 26 Jul 2019 16:01:37 +0100 Subject: [PATCH] Register self signed CR controller Signed-off-by: JoshVanL --- cmd/controller/app/BUILD.bazel | 1 + cmd/controller/app/controller.go | 6 ++++-- pkg/controller/certificaterequests/selfsigned/selfsigned.go | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/controller/app/BUILD.bazel b/cmd/controller/app/BUILD.bazel index a50d62df0..3e6d61988 100644 --- a/cmd/controller/app/BUILD.bazel +++ b/cmd/controller/app/BUILD.bazel @@ -12,6 +12,7 @@ go_library( "//pkg/client/informers/externalversions:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/certificaterequests/ca:go_default_library", + "//pkg/controller/certificaterequests/selfsigned:go_default_library", "//pkg/controller/certificates:go_default_library", "//pkg/controller/clusterissuers:go_default_library", "//pkg/feature:go_default_library", diff --git a/cmd/controller/app/controller.go b/cmd/controller/app/controller.go index 2a858b70a..66d76853d 100644 --- a/cmd/controller/app/controller.go +++ b/cmd/controller/app/controller.go @@ -42,7 +42,8 @@ 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" - cacertificaterequestcontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/ca" + crcacontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/ca" + crselfsignedcontroller "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/selfsigned" certificatescontroller "github.com/jetstack/cert-manager/pkg/controller/certificates" "github.com/jetstack/cert-manager/pkg/controller/clusterissuers" "github.com/jetstack/cert-manager/pkg/feature" @@ -78,7 +79,8 @@ func Run(opts *options.ControllerOptions, stopCh <-chan struct{}) { if utilfeature.DefaultFeatureGate.Enabled(feature.CertificateRequestControllers) { opts.EnabledControllers = append(opts.EnabledControllers, []string{ - cacertificaterequestcontroller.CRControllerName, + crcacontroller.CRControllerName, + crselfsignedcontroller.CRControllerName, certificatescontroller.ExperimentalControllerName, }...) } diff --git a/pkg/controller/certificaterequests/selfsigned/selfsigned.go b/pkg/controller/certificaterequests/selfsigned/selfsigned.go index 0b18488a9..782febf74 100644 --- a/pkg/controller/certificaterequests/selfsigned/selfsigned.go +++ b/pkg/controller/certificaterequests/selfsigned/selfsigned.go @@ -58,7 +58,7 @@ func init() { // create certificate request controller for selfsigned issuer controllerpkg.Register(CRControllerName, func(ctx *controllerpkg.Context) (controllerpkg.Interface, error) { selfsigned := NewSelfSigned(ctx) - controller := certificaterequests.New(apiutil.IssuerCA, selfsigned) + controller := certificaterequests.New(apiutil.IssuerSelfSigned, selfsigned) c, err := controllerpkg.New(ctx, CRControllerName, controller) if err != nil {