weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Enable all CertificateRequest controllers by default

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2019-09-19 13:06:46 +01:00
parent ad237cf300
commit 6a167cc9e6
4 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/controller/app/BUILD.bazel
View File

@ -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",

19
cmd/controller/app/controller.go
View File

@ -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() {

5
cmd/controller/app/options/BUILD.bazel
View File

@ -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",

5
cmd/controller/app/options/options.go
View File

@ -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"