From f73636721c4058bd36ee847b441d4f8c57950c13 Mon Sep 17 00:00:00 2001 From: Maartje Eyskens Date: Thu, 4 Mar 2021 15:49:28 +0100 Subject: [PATCH 1/3] Remove the Webhook settiing of cert-manager The no-webhook version was removed since 0.15, this flag became non functional since then and will always install the webhook Signed-off-by: Maartje Eyskens --- docs/configuration-reference/components/cert-manager.md | 2 -- pkg/components/cert-manager/component.go | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/configuration-reference/components/cert-manager.md b/docs/configuration-reference/components/cert-manager.md index 7989a8297..fad3df2a8 100644 --- a/docs/configuration-reference/components/cert-manager.md +++ b/docs/configuration-reference/components/cert-manager.md @@ -23,7 +23,6 @@ cert-manager component configuration example: component "cert-manager" { email = "example@example.com" namespace = "cert-manager" - webhooks = false } ``` @@ -35,7 +34,6 @@ Table of all the arguments accepted by the component. |-------------------|----------------------------------------------------------------|:------------:|:------:|:--------:| | `email` | Email used for certificates to receive expiry notifications. | - | string | true | | `namespace` | Namespace to deploy the cert-manager into. | cert-manager | string | false | -| `webhooks` | Controls if webhooks should be deployed. | true | bool | false | | `service_monitor` | Specifies how metrics can be retrieved from a set of services. | false | bool | false | diff --git a/pkg/components/cert-manager/component.go b/pkg/components/cert-manager/component.go index 4fb2619e3..6a67d8069 100644 --- a/pkg/components/cert-manager/component.go +++ b/pkg/components/cert-manager/component.go @@ -35,7 +35,6 @@ const ( type component struct { Email string `hcl:"email,attr"` Namespace string `hcl:"namespace,optional"` - Webhooks bool `hcl:"webhooks,optional"` ServiceMonitor bool `hcl:"service_monitor,optional"` } @@ -45,15 +44,12 @@ type component struct { func NewConfig() *component { return &component{ Namespace: "cert-manager", - Webhooks: true, ServiceMonitor: false, } } const chartValuesTmpl = ` email: {{.Email}} -webhook: - enabled: {{.Webhooks}} {{ if .ServiceMonitor }} prometheus: servicemonitor: @@ -103,7 +99,7 @@ func (c *component) Metadata() components.Metadata { Name: c.Namespace, }, Helm: components.HelmMetadata{ - // Cert-manager registers admission webhooks, so we should wait for the webhook to + // cert-manager registers admission webhooks, so we should wait for the webhook to // become ready before proceeding with installing other components, as it may fail. // If webhooks are registered with 'failurePolicy: Fail', then kube-apiserver will reject // creating objects requiring the webhook until the webhook itself becomes ready. So if the From 83173a8400b7e99dbfe74b97d3f05c692b022f43 Mon Sep 17 00:00:00 2001 From: Maartje Eyskens Date: Thu, 4 Mar 2021 15:49:50 +0100 Subject: [PATCH 2/3] Fix spelling of cert-manager in the title Signed-off-by: Maartje Eyskens --- docs/configuration-reference/components/cert-manager.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration-reference/components/cert-manager.md b/docs/configuration-reference/components/cert-manager.md index fad3df2a8..43d718c4d 100644 --- a/docs/configuration-reference/components/cert-manager.md +++ b/docs/configuration-reference/components/cert-manager.md @@ -1,5 +1,5 @@ --- -title: Cert-Manager configuration reference for Lokomotive +title: cert-manager configuration reference for Lokomotive weight: 10 --- From 71c668bf32cbd15158454a58929205b7127824ff Mon Sep 17 00:00:00 2001 From: Maartje Eyskens Date: Thu, 4 Mar 2021 15:50:14 +0100 Subject: [PATCH 3/3] Fix HCL layout of cert-manager component example Signed-off-by: Maartje Eyskens --- docs/configuration-reference/components/cert-manager.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration-reference/components/cert-manager.md b/docs/configuration-reference/components/cert-manager.md index 43d718c4d..8af7c6f3c 100644 --- a/docs/configuration-reference/components/cert-manager.md +++ b/docs/configuration-reference/components/cert-manager.md @@ -21,7 +21,7 @@ cert-manager component configuration example: ```tf component "cert-manager" { - email = "example@example.com" + email = "example@example.com" namespace = "cert-manager" } ```