Skip to content

Commit 7bacee8

Browse files
francesco-furlanfrancesco-furlan
committed
chore: rename generate to create
1 parent 6c44e8f commit 7bacee8

File tree

5 files changed

+49
-49
lines changed

5 files changed

+49
-49
lines changed

‎charts/shield/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,11 @@ The following table lists the configurable parameters of the `shield` chart and
222222
| cluster.tls_certificates.create | Create the TLS certificates for the cluster shield | <code>true</code> |
223223
| cluster.tls_certificates.secret_name | The name of the secret that contains the TLS certificates | <code></code> |
224224
| cluster.tls_certificates.cert_manager.enabled | Enable cert-manager for certificate management | <code>false</code> |
225-
| cluster.tls_certificates.cert_manager.ca.generate | Generate the CA certificate using cert-manager | <code>false</code> |
225+
| cluster.tls_certificates.cert_manager.ca.create | Create the CA certificate using cert-manager | <code>false</code> |
226226
| cluster.tls_certificates.cert_manager.ca.secret_template | The template for the CA certificate secret (if generate is true) will automatically add the annotation `cert-manager.io/allow-direct-injection: "true"` if not present | <code>{}</code> |
227227
| cluster.tls_certificates.cert_manager.ca.secret_name | The name of the existing CA certificate secret (if generate is false) has to be annotated with `cert-manager.io/allow-direct-injection: "true"` | <code>""</code> |
228228
| cluster.tls_certificates.cert_manager.ca.secret_namespace | The namespace of the existing CA certificate secret (if generate is false) | <code>""</code> |
229-
| cluster.tls_certificates.cert_manager.issuer.generate | Generate the Issuer instead of using an existing one | <code>false</code> |
229+
| cluster.tls_certificates.cert_manager.issuer.create | Create the Issuer instead of using an existing one | <code>false</code> |
230230
| cluster.tls_certificates.cert_manager.issuer.name | The name of the existing issuer | <code>""</code> |
231231
| cluster.tls_certificates.cert_manager.issuer.kind | The kind of the existing issuer (Issuer, ClusterIssuer) | <code>Issuer</code> |
232232
| cluster.tls_certificates.cert_manager.issuer.group | The group of the existing issuer | <code>cert-manager.io</code> |

‎charts/shield/templates/cluster/_tls.tpl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858

5959
{{- define "cluster.tls_certificates.validate_cert_manager" -}}
6060
{{- if and .Values.cluster.tls_certificates.cert_manager .Values.cluster.tls_certificates.cert_manager.enabled -}}
61-
{{- if and (not .Values.cluster.tls_certificates.cert_manager.ca.generate) (not .Values.cluster.tls_certificates.cert_manager.ca.secret_name) -}}
61+
{{- if and (not .Values.cluster.tls_certificates.cert_manager.ca.create) (not .Values.cluster.tls_certificates.cert_manager.ca.secret_name) -}}
6262
{{- fail "cert_manager.ca.secret_name must be specified when CA generation is disabled" -}}
6363
{{- end -}}
64-
{{- if and (not .Values.cluster.tls_certificates.cert_manager.issuer.generate) (not .Values.cluster.tls_certificates.cert_manager.issuer.name) -}}
64+
{{- if and (not .Values.cluster.tls_certificates.cert_manager.issuer.create) (not .Values.cluster.tls_certificates.cert_manager.issuer.name) -}}
6565
{{- fail "cert_manager.issuer.name must be specified when Issuer generation is disabled" -}}
6666
{{- end -}}
6767
{{- end -}}
@@ -78,36 +78,36 @@
7878
{{- end }}
7979

8080
{{- define "cluster.tls_certificates.cm_ca_secret_name" -}}
81-
{{- if .Values.cluster.tls_certificates.cert_manager.ca.generate -}}
81+
{{- if .Values.cluster.tls_certificates.cert_manager.ca.create -}}
8282
{{- printf "%s-cm-ca" ((include "cluster.fullname" .) | trimSuffix "-" | trunc 58) -}}
8383
{{- else -}}
8484
{{- .Values.cluster.tls_certificates.cert_manager.ca.secret_name -}}
8585
{{- end -}}
8686
{{- end }}
8787

8888
{{- define "cluster.tls_certificates.cm_generate_ca" -}}
89-
{{- if and (include "cluster.tls_certificates.use_cert_manager" .) (.Values.cluster.tls_certificates.cert_manager.ca.generate) -}}
89+
{{- if and (include "cluster.tls_certificates.use_cert_manager" .) (.Values.cluster.tls_certificates.cert_manager.ca.create) -}}
9090
{{- true -}}
9191
{{- end -}}
9292
{{- end }}
9393

9494
{{- define "cluster.tls_certificates.cm_generate_issuer" -}}
95-
{{- if and (include "cluster.tls_certificates.use_cert_manager" .) (.Values.cluster.tls_certificates.cert_manager.issuer.generate) -}}
95+
{{- if and (include "cluster.tls_certificates.use_cert_manager" .) (.Values.cluster.tls_certificates.cert_manager.issuer.create) -}}
9696
{{- true -}}
9797
{{- end -}}
9898
{{- end }}
9999

100100
{{- define "cluster.tls_certificates.cm_issuer_name" -}}
101-
{{- if .Values.cluster.tls_certificates.cert_manager.issuer.generate -}}
101+
{{- if .Values.cluster.tls_certificates.cert_manager.issuer.create -}}
102102
{{- printf "%s-cm-self-issuer" ((include "cluster.fullname" .) | trimSuffix "-" | trunc 49) -}}
103103
{{- else -}}
104104
{{- .Values.cluster.tls_certificates.cert_manager.issuer.name -}}
105105
{{- end -}}
106106
{{- end }}
107107

108108
{{- define "cluster.tls_certificates.cm_issuer_namespace" -}}
109-
{{- if .Values.cluster.tls_certificates.cert_manager.issuer.generate -}}
110-
{{- if and (not .Values.cluster.tls_certificates.cert_manager.ca.generate) (not (empty .Values.cluster.tls_certificates.cert_manager.ca.secret_namespace)) -}}
109+
{{- if .Values.cluster.tls_certificates.cert_manager.issuer.create -}}
110+
{{- if and (not .Values.cluster.tls_certificates.cert_manager.ca.create) (not (empty .Values.cluster.tls_certificates.cert_manager.ca.secret_namespace)) -}}
111111
{{- .Values.cluster.tls_certificates.cert_manager.ca.secret_namespace -}}
112112
{{- else -}}
113113
{{- .Release.Namespace -}}
@@ -122,8 +122,8 @@
122122
{{- end }}
123123

124124
{{- define "cluster.tls_certificates.cm_issuer_kind" -}}
125-
{{- if .Values.cluster.tls_certificates.cert_manager.issuer.generate -}}
126-
{{- if and (not .Values.cluster.tls_certificates.cert_manager.ca.generate) (not (empty .Values.cluster.tls_certificates.cert_manager.ca.secret_namespace)) -}}
125+
{{- if .Values.cluster.tls_certificates.cert_manager.issuer.create -}}
126+
{{- if and (not .Values.cluster.tls_certificates.cert_manager.ca.create) (not (empty .Values.cluster.tls_certificates.cert_manager.ca.secret_namespace)) -}}
127127
{{- "ClusterIssuer" -}}
128128
{{- else -}}
129129
{{- "Issuer" -}}
@@ -134,7 +134,7 @@
134134
{{- end }}
135135

136136
{{- define "cluster.tls_certificates.cm_issuer_group" -}}
137-
{{- if .Values.cluster.tls_certificates.cert_manager.issuer.generate -}}
137+
{{- if .Values.cluster.tls_certificates.cert_manager.issuer.create -}}
138138
{{- "cert-manager.io" -}}
139139
{{- else -}}
140140
{{- .Values.cluster.tls_certificates.cert_manager.issuer.group -}}

0 commit comments

Comments
 (0)