From 76c976bc2d03bc7857859083b72311e5fba4b3ff Mon Sep 17 00:00:00 2001 From: Guillaume Plessis Date: Tue, 17 Oct 2023 08:51:36 -0700 Subject: [PATCH 1/5] Allow the creation of extra manifests via values Signed-off-by: Guillaume Plessis --- .../templates/extras-manifests.yaml | 4 ++++ deploy/charts/cert-manager/values.yaml | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 deploy/charts/cert-manager/templates/extras-manifests.yaml diff --git a/deploy/charts/cert-manager/templates/extras-manifests.yaml b/deploy/charts/cert-manager/templates/extras-manifests.yaml new file mode 100644 index 000000000..a9bb3b6ba --- /dev/null +++ b/deploy/charts/cert-manager/templates/extras-manifests.yaml @@ -0,0 +1,4 @@ +{{ range .Values.extraObjects }} +--- +{{ tpl (toYaml .) $ }} +{{ end }} diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml index 03ef4b193..3aa3fc55a 100644 --- a/deploy/charts/cert-manager/values.yaml +++ b/deploy/charts/cert-manager/values.yaml @@ -1308,3 +1308,20 @@ startupapicheck: # injected into pod's environment variables, matching the syntax of Docker # links. enableServiceLinks: false + +# Create a dynamic manifests via values: +extraObjects: [] + # - apiVersion: cert-manager.io/v1 + # kind: ClusterIssuer + # metadata: + # name: letsencrypt-prod + # spec: + # acme: + # email: foo@bar.com + # server: https://acme-v02.api.letsencrypt.org/directory + # privateKeySecretRef: + # name: letsencrypt-prod + # solvers: + # - http01: + # ingress: + # class: nginx From 3d58fb701981ec55f076f504cc754b0ccfdaea7c Mon Sep 17 00:00:00 2001 From: Guillaume Plessis Date: Tue, 26 Mar 2024 15:38:35 -0700 Subject: [PATCH 2/5] Remove the tpl fuction to allow more complex use cases Signed-off-by: Guillaume Plessis --- deploy/charts/cert-manager/templates/extras-manifests.yaml | 2 +- deploy/charts/cert-manager/values.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/charts/cert-manager/templates/extras-manifests.yaml b/deploy/charts/cert-manager/templates/extras-manifests.yaml index a9bb3b6ba..9ec3a7e9b 100644 --- a/deploy/charts/cert-manager/templates/extras-manifests.yaml +++ b/deploy/charts/cert-manager/templates/extras-manifests.yaml @@ -1,4 +1,4 @@ {{ range .Values.extraObjects }} --- -{{ tpl (toYaml .) $ }} +{{ tpl . $ }} {{ end }} diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml index 3aa3fc55a..9e0dde187 100644 --- a/deploy/charts/cert-manager/values.yaml +++ b/deploy/charts/cert-manager/values.yaml @@ -1311,7 +1311,8 @@ startupapicheck: # Create a dynamic manifests via values: extraObjects: [] - # - apiVersion: cert-manager.io/v1 + # - | + # apiVersion: cert-manager.io/v1 # kind: ClusterIssuer # metadata: # name: letsencrypt-prod From fd2645776c7b577b813ac6dec1b3cc48c36ad375 Mon Sep 17 00:00:00 2001 From: Guillaume Plessis Date: Tue, 26 Mar 2024 15:39:10 -0700 Subject: [PATCH 3/5] Update the documentation Signed-off-by: Guillaume Plessis --- deploy/charts/cert-manager/README.template.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deploy/charts/cert-manager/README.template.md b/deploy/charts/cert-manager/README.template.md index 4de54c53e..c1867de12 100644 --- a/deploy/charts/cert-manager/README.template.md +++ b/deploy/charts/cert-manager/README.template.md @@ -1805,6 +1805,13 @@ Additional volume mounts to add to the cert-manager controller container. > ``` enableServiceLinks indicates whether information about services should be injected into pod's environment variables, matching the syntax of Docker links. +#### **extraObjects** ~ `array` +> Default value: +> ```yaml +> [] +> ``` + +Create a dynamic manifests via values: ### Default Security Contexts From f98cfacd1c2a3d00329239f1d43b884fe8cede97 Mon Sep 17 00:00:00 2001 From: Guillaume Plessis Date: Tue, 26 Mar 2024 15:40:59 -0700 Subject: [PATCH 4/5] Fix a typo Signed-off-by: Guillaume Plessis --- deploy/charts/cert-manager/README.template.md | 2 +- deploy/charts/cert-manager/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/charts/cert-manager/README.template.md b/deploy/charts/cert-manager/README.template.md index c1867de12..43a7c16c8 100644 --- a/deploy/charts/cert-manager/README.template.md +++ b/deploy/charts/cert-manager/README.template.md @@ -1811,7 +1811,7 @@ enableServiceLinks indicates whether information about services should be inject > [] > ``` -Create a dynamic manifests via values: +Create dynamic manifests via values: ### Default Security Contexts diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml index 9e0dde187..6ae8cb5f3 100644 --- a/deploy/charts/cert-manager/values.yaml +++ b/deploy/charts/cert-manager/values.yaml @@ -1309,7 +1309,7 @@ startupapicheck: # links. enableServiceLinks: false -# Create a dynamic manifests via values: +# Create dynamic manifests via values: extraObjects: [] # - | # apiVersion: cert-manager.io/v1 From b1767b4aa9b308d6a87bc0de19809f296a64a6b6 Mon Sep 17 00:00:00 2001 From: Guillaume Plessis Date: Tue, 23 Apr 2024 14:58:28 -0700 Subject: [PATCH 5/5] Address comments from @wallrj Signed-off-by: Guillaume Plessis --- deploy/charts/cert-manager/README.template.md | 13 +++++++++- ...ras-manifests.yaml => extras-objects.yaml} | 0 deploy/charts/cert-manager/values.yaml | 25 +++++++------------ 3 files changed, 21 insertions(+), 17 deletions(-) rename deploy/charts/cert-manager/templates/{extras-manifests.yaml => extras-objects.yaml} (100%) diff --git a/deploy/charts/cert-manager/README.template.md b/deploy/charts/cert-manager/README.template.md index 43a7c16c8..0edb27190 100644 --- a/deploy/charts/cert-manager/README.template.md +++ b/deploy/charts/cert-manager/README.template.md @@ -1811,7 +1811,18 @@ enableServiceLinks indicates whether information about services should be inject > [] > ``` -Create dynamic manifests via values: +Create dynamic manifests via values. + +For example: + +```yaml +extraObjects: + - | + apiVersion: v1 + kind: ConfigMap + metadata: + name: '{{ template "cert-manager.name" . }}-extra-configmap' +``` ### Default Security Contexts diff --git a/deploy/charts/cert-manager/templates/extras-manifests.yaml b/deploy/charts/cert-manager/templates/extras-objects.yaml similarity index 100% rename from deploy/charts/cert-manager/templates/extras-manifests.yaml rename to deploy/charts/cert-manager/templates/extras-objects.yaml diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml index 6ae8cb5f3..9540fb9d2 100644 --- a/deploy/charts/cert-manager/values.yaml +++ b/deploy/charts/cert-manager/values.yaml @@ -1309,20 +1309,13 @@ startupapicheck: # links. enableServiceLinks: false -# Create dynamic manifests via values: +# Create dynamic manifests via values. +# +# For example: +# extraObjects: +# - | +# apiVersion: v1 +# kind: ConfigMap +# metadata: +# name: '{{ template "cert-manager.name" . }}-extra-configmap' extraObjects: [] - # - | - # apiVersion: cert-manager.io/v1 - # kind: ClusterIssuer - # metadata: - # name: letsencrypt-prod - # spec: - # acme: - # email: foo@bar.com - # server: https://acme-v02.api.letsencrypt.org/directory - # privateKeySecretRef: - # name: letsencrypt-prod - # solvers: - # - http01: - # ingress: - # class: nginx