updated controller-manager-library. updated command line options and …

…configuration updated flags
gardener · Aug 21, 2020 · bc3b42c · bc3b42c
1 parent 9655d59
commit bc3b42c
Show file tree

Hide file tree

Showing 1,516 changed files with 101,945 additions and 99,000 deletions.
diff --git a/README.md b/README.md
diff --git a/charts/cert-management/templates/deployment.yaml b/charts/cert-management/templates/deployment.yaml
@@ -30,6 +30,9 @@ spec:
         args:
         - --name={{ include "cert-management.fullname" . }}
         ### start generated configuration
+        {{- if .Values.configuration.bindAddressHttp }}
+        - --bind-address-http={{ .Values.configuration.bindAddressHttp }}
+        {{- end }}
         {{- if .Values.configuration.cascadeDelete }}
         - --cascade-delete={{ .Values.configuration.cascadeDelete }}
         {{- end }}
@@ -39,6 +42,9 @@ spec:
         {{- if .Values.configuration.certTargetClass }}
         - --cert-target-class={{ .Values.configuration.certTargetClass }}
         {{- end }}
+        {{- if .Values.configuration.config }}
+        - --config={{ .Values.configuration.config }}
+        {{- end }}
         {{- if .Values.configuration.controllers }}
         - --controllers={{ .Values.configuration.controllers }}
         {{- end }}
@@ -54,6 +60,12 @@ spec:
         {{- if .Values.configuration.defaultRequestsPerDayQuota }}
         - --default-requests-per-day-quota={{ .Values.configuration.defaultRequestsPerDayQuota }}
         {{- end }}
+        {{- if .Values.configuration.defaultPoolResyncPeriod }}
+        - --default.pool.resync-period={{ .Values.configuration.defaultPoolResyncPeriod }}
+        {{- end }}
+        {{- if .Values.configuration.defaultPoolSize }}
+        - --default.pool.size={{ .Values.configuration.defaultPoolSize }}
+        {{- end }}
         {{- if .Values.configuration.disableNamespaceRestriction }}
         - --disable-namespace-restriction={{ .Values.configuration.disableNamespaceRestriction }}
         {{- end }}
@@ -90,6 +102,12 @@ spec:
         {{- if .Values.configuration.ingressCertDefaultPoolSize }}
         - --ingress-cert.default.pool.size={{ .Values.configuration.ingressCertDefaultPoolSize }}
         {{- end }}
+        {{- if .Values.configuration.ingressCertPoolResyncPeriod }}
+        - --ingress-cert.pool.resync-period={{ .Values.configuration.ingressCertPoolResyncPeriod }}
+        {{- end }}
+        {{- if .Values.configuration.ingressCertPoolSize }}
+        - --ingress-cert.pool.size={{ .Values.configuration.ingressCertPoolSize }}
+        {{- end }}
         {{- if .Values.configuration.ingressCertTargetNamePrefix }}
         - --ingress-cert.target-name-prefix={{ .Values.configuration.ingressCertTargetNamePrefix }}
         {{- end }}
@@ -138,6 +156,12 @@ spec:
         {{- if .Values.configuration.issuerIssuersPoolSize }}
         - --issuer.issuers.pool.size={{ .Values.configuration.issuerIssuersPoolSize }}
         {{- end }}
+        {{- if .Values.configuration.issuerPoolResyncPeriod }}
+        - --issuer.pool.resync-period={{ .Values.configuration.issuerPoolResyncPeriod }}
+        {{- end }}
+        {{- if .Values.configuration.issuerPoolSize }}
+        - --issuer.pool.size={{ .Values.configuration.issuerPoolSize }}
+        {{- end }}
         {{- if .Values.configuration.issuerPrecheckAdditionalWait }}
         - --issuer.precheck-additional-wait={{ .Values.configuration.issuerPrecheckAdditionalWait }}
         {{- end }}
@@ -153,6 +177,9 @@ spec:
         {{- if .Values.configuration.issuerSecretsPoolSize }}
         - --issuer.secrets.pool.size={{ .Values.configuration.issuerSecretsPoolSize }}
         {{- end }}
+        {{- if .Values.configuration.issuersPoolSize }}
+        - --issuers.pool.size={{ .Values.configuration.issuersPoolSize }}
+        {{- end }}
         {{- if .Values.configuration.kubeconfig }}
         - --kubeconfig={{ .Values.configuration.kubeconfig }}
         {{- end }}
@@ -162,9 +189,24 @@ spec:
         {{- if .Values.configuration.kubeconfigId }}
         - --kubeconfig.id={{ .Values.configuration.kubeconfigId }}
         {{- end }}
+        {{- if .Values.configuration.leaseDuration }}
+        - --lease-duration={{ .Values.configuration.leaseDuration }}
+        {{- end }}
+        {{- if .Values.configuration.leaseName }}
+        - --lease-name={{ .Values.configuration.leaseName }}
+        {{- end }}
+        {{- if .Values.configuration.leaseRenewDeadline }}
+        - --lease-renew-deadline={{ .Values.configuration.leaseRenewDeadline }}
+        {{- end }}
+        {{- if .Values.configuration.leaseRetryPeriod }}
+        - --lease-retry-period={{ .Values.configuration.leaseRetryPeriod }}
+        {{- end }}
         {{- if .Values.configuration.logLevel }}
         - --log-level={{ .Values.configuration.logLevel }}
         {{- end }}
+        {{- if .Values.configuration.maintainer }}
+        - --maintainer={{ .Values.configuration.maintainer }}
+        {{- end }}
         {{- if .Values.configuration.namespace }}
         - --namespace={{ .Values.configuration.namespace }}
         {{- end }}
@@ -174,8 +216,8 @@ spec:
         {{- if .Values.configuration.omitLease }}
         - --omit-lease={{ .Values.configuration.omitLease }}
         {{- end }}
-        {{- if .Values.configuration.pluginDir }}
-        - --plugin-dir={{ .Values.configuration.pluginDir }}
+        {{- if .Values.configuration.pluginFile }}
+        - --plugin-file={{ .Values.configuration.pluginFile }}
         {{- end }}
         {{- if .Values.configuration.poolResyncPeriod }}
         - --pool.resync-period={{ .Values.configuration.poolResyncPeriod }}
@@ -195,6 +237,9 @@ spec:
         {{- if .Values.configuration.renewalWindow }}
         - --renewal-window={{ .Values.configuration.renewalWindow }}
         {{- end }}
+        {{- if .Values.configuration.secretsPoolSize }}
+        - --secrets.pool.size={{ .Values.configuration.secretsPoolSize }}
+        {{- end }}
         {{- if .Values.configuration.serverPortHttp }}
         - --server-port-http={{ .Values.configuration.serverPortHttp }}
         {{- end }}
@@ -210,6 +255,12 @@ spec:
         {{- if .Values.configuration.serviceCertDefaultPoolSize }}
         - --service-cert.default.pool.size={{ .Values.configuration.serviceCertDefaultPoolSize }}
         {{- end }}
+        {{- if .Values.configuration.serviceCertPoolResyncPeriod }}
+        - --service-cert.pool.resync-period={{ .Values.configuration.serviceCertPoolResyncPeriod }}
+        {{- end }}
+        {{- if .Values.configuration.serviceCertPoolSize }}
+        - --service-cert.pool.size={{ .Values.configuration.serviceCertPoolSize }}
+        {{- end }}
         {{- if .Values.configuration.serviceCertTargetNamePrefix }}
         - --service-cert.target-name-prefix={{ .Values.configuration.serviceCertTargetNamePrefix }}
         {{- end }}
@@ -243,6 +294,12 @@ spec:
         {{- if .Values.configuration.targetId }}
         - --target.id={{ .Values.configuration.targetId }}
         {{- end }}
+        {{- if .Values.configuration.targetsPoolSize }}
+        - --targets.pool.size={{ .Values.configuration.targetsPoolSize }}
+        {{- end }}
+        {{- if .Values.configuration.version }}
+        - --version={{ .Values.configuration.version }}
+        {{- end }}
         ### end generated configuration
         {{- range $idx, $flag := .Values.additionalConfiguration }}
         - {{ $flag }}

diff --git a/charts/cert-management/values.yaml b/charts/cert-management/values.yaml
@@ -26,14 +26,18 @@ createCRDs:
   certificates: true
 
 configuration:
+  # bindAddressHttp:
   # cascadeDelete:
   # certClass:
   # certTargetClass:
+  # config:
   # controllers:
   # cpuprofile:
   # defaultIssuer:
   # defaultIssuerDomainRanges:
   # defaultRequestsPerDayQuota:
+  # defaultPoolResyncPeriod:
+  # defaultPoolSize:
   # disableNamespaceRestriction:
   # dns:
   # dnsClass:
@@ -46,6 +50,8 @@ configuration:
   # ingressCertCertTargetClass:
   # ingressCertDefaultPoolResyncPeriod:
   # ingressCertDefaultPoolSize:
+  # ingressCertPoolResyncPeriod:
+  # ingressCertPoolSize:
   # ingressCertTargetNamePrefix:
   # ingressCertTargetNamespace:
   # ingressCertTargetsPoolSize:
@@ -62,30 +68,41 @@ configuration:
   # issuerDnsOwnerId:
   # issuerIssuerNamespace:
   # issuerIssuersPoolSize:
+  # issuerPoolResyncPeriod:
+  # issuerPoolSize:
   # issuerPrecheckAdditionalWait:
   # issuerPrecheckNameservers:
   # issuerPropagationTimeout:
   # issuerRenewalWindow:
   # issuerSecretsPoolSize:
+  # issuersPoolSize:
   # kubeconfig:
   # kubeconfigDisableDeployCrds:
   # kubeconfigId:
+  # leaseDuration:
+  # leaseName:
+  # leaseRenewDeadline:
+  # leaseRetryPeriod:
   # logLevel:
+  # maintainer:
   # namespace:
   # namespaceLocalAccessOnly:
   # omitLease:
-  # pluginDir:
+  # pluginFile:
   # poolResyncPeriod:
   # poolSize:
   # precheckAdditionalWait:
   # precheckNameservers:
   # propagationTimeout:
   # renewalWindow:
+  # secretsPoolSize:
   serverPortHttp: 8080
   # serviceCertCertClass:
   # serviceCertCertTargetClass:
   # serviceCertDefaultPoolResyncPeriod:
   # serviceCertDefaultPoolSize:
+  # serviceCertPoolResyncPeriod:
+  # serviceCertPoolSize:
   # serviceCertTargetNamePrefix:
   # serviceCertTargetNamespace:
   # serviceCertTargetsPoolSize:
@@ -97,5 +114,7 @@ configuration:
   # targetNamespace:
   # targetDisableDeployCrds:
   # targetId:
+  # targetsPoolSize:
+  # version:
 
 additionalConfiguration: []
diff --git a/cmd/cert-controller-manager/main.go b/cmd/cert-controller-manager/main.go
@@ -20,9 +20,15 @@ import (
 	"fmt"
 	"os"
 
+	corev1 "k8s.io/api/core/v1"
+	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
+
 	"github.com/gardener/controller-manager-library/pkg/controllermanager"
 	"github.com/gardener/controller-manager-library/pkg/controllermanager/cluster"
 	"github.com/gardener/controller-manager-library/pkg/controllermanager/controller/mappings"
+	"github.com/gardener/controller-manager-library/pkg/resources"
+
+	dnsapi "github.com/gardener/external-dns-management/pkg/apis/dns/v1alpha1"
 
 	ctrl "github.com/gardener/cert-management/pkg/controller"
 	_ "github.com/gardener/cert-management/pkg/controller/issuer"
@@ -56,6 +62,10 @@ func init() {
 
 	mappings.ForControllerGroup(ctrl.ControllerGroupSource).
 		MustRegister()
+
+	resources.Register(extensionsv1beta1.SchemeBuilder)
+	resources.Register(corev1.SchemeBuilder)
+	resources.Register(dnsapi.SchemeBuilder)
 }
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -3,35 +3,25 @@ module github.com/gardener/cert-management
 go 1.13
 
 require (
-	github.com/ahmetb/gen-crd-api-reference-docs v0.1.5
+	github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
 	github.com/emicklei/go-restful v2.11.1+incompatible // indirect
-	github.com/gardener/controller-manager-library v0.1.1-0.20200709142337-f9a87426b56d
-	github.com/gardener/external-dns-management v0.7.10
+	github.com/gardener/controller-manager-library v0.2.1-0.20200814085853-45032cce52c3
+	github.com/gardener/external-dns-management v0.7.17-0.20200810112859-d9ceb5e2257d
 	github.com/go-acme/lego/v3 v3.7.0
 	github.com/go-openapi/spec v0.19.4 // indirect
 	github.com/miekg/dns v1.1.27
-	github.com/onsi/ginkgo v1.10.1
-	github.com/onsi/gomega v1.7.0
+	github.com/onsi/ginkgo v1.14.0
+	github.com/onsi/gomega v1.10.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.1.0
 	github.com/prometheus/common v0.7.0 // indirect
 	github.com/prometheus/procfs v0.0.5 // indirect
 	golang.org/x/lint v0.0.0-20200302205851-738671d3881b
-	k8s.io/api v0.16.8
-	k8s.io/apiextensions-apiserver v0.16.8
-	k8s.io/apimachinery v0.17.0
-	k8s.io/client-go v11.0.1-0.20190708175433-62e1c231c5dc+incompatible
-	k8s.io/code-generator v0.16.8
-	k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e // indirect
-	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
-	sigs.k8s.io/kind v0.7.0
-)
-
-replace (
-	k8s.io/api => k8s.io/api v0.16.8
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.8
-	k8s.io/apimachinery => k8s.io/apimachinery v0.16.8
-	k8s.io/client-go => k8s.io/client-go v0.16.8
-	k8s.io/code-generator => k8s.io/code-generator v0.16.8
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
+	k8s.io/api v0.18.6
+	k8s.io/apiextensions-apiserver v0.18.6
+	k8s.io/apimachinery v0.18.6
+	k8s.io/client-go v0.18.6
+	k8s.io/code-generator v0.18.6
+	k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29
+	sigs.k8s.io/kind v0.8.0
 )