Skip to content

Commit e3475d7

Browse files
oliviassssTimothy-Dougherty
authored andcommitted
Enable Helm chart to reuse existing TLS secrets
1 parent b4cdf4d commit e3475d7

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

helm/aws-load-balancer-controller/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ The default values set by the application itself can be confirmed [here](https:/
187187
| `webhookTLS.caCert` | TLS CA certificate for webhook (auto-generated if not provided) | "" |
188188
| `webhookTLS.cert` | TLS certificate for webhook (auto-generated if not provided) | "" |
189189
| `webhookTLS.key` | TLS private key for webhook (auto-generated if not provided) | "" |
190+
| `keepTLSSecret` | Keeps the usage of existing TLS Secret | `false` |
190191
| `serviceAnnotations` | Annotations to be added to the provisioned webhook service resource | `{}` |
191192
| `serviceMaxConcurrentReconciles` | Maximum number of concurrently running reconcile loops for service | None |
192193
| `targetgroupbindingMaxConcurrentReconciles` | Maximum number of concurrently running reconcile loops for targetGroupBinding | None |

helm/aws-load-balancer-controller/templates/_helpers.tpl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,17 @@ Create the name of the service account to use
7676
Generate certificates for webhook
7777
*/}}
7878
{{- define "aws-load-balancer-controller.webhook-certs" -}}
79+
{{- $namePrefix := ( include "aws-load-balancer-controller.namePrefix" . ) -}}
80+
{{- $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-tls" $namePrefix) -}}
7981
{{- if (and .Values.webhookTLS.caCert .Values.webhookTLS.cert .Values.webhookTLS.key) -}}
8082
caCert: {{ .Values.webhookTLS.caCert | b64enc }}
8183
clientCert: {{ .Values.webhookTLS.cert | b64enc }}
8284
clientKey: {{ .Values.webhookTLS.key | b64enc }}
85+
{{- else if and .Values.keepTLSSecret $secret -}}
86+
caCert: {{ index $secret.data "ca.crt" }}
87+
clientCert: {{ index $secret.data "tls.crt" }}
88+
clientKey: {{ index $secret.data "tls.key" }}
8389
{{- else -}}
84-
{{- $namePrefix := ( include "aws-load-balancer-controller.namePrefix" . ) -}}
8590
{{- $altNames := list ( printf "%s-%s.%s" $namePrefix "webhook-service" .Release.Namespace ) ( printf "%s-%s.%s.svc" $namePrefix "webhook-service" .Release.Namespace ) -}}
8691
{{- $ca := genCA "aws-load-balancer-controller-ca" 3650 -}}
8792
{{- $cert := genSignedCert ( include "aws-load-balancer-controller.fullname" . ) nil $altNames 3650 $ca -}}

helm/aws-load-balancer-controller/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ webhookTLS:
133133
cert:
134134
key:
135135

136+
# keepTLSSecret keeps using the existing TLS secrets, false by default
137+
keepTLSSecret: false
138+
136139
# Maximum number of concurrently running reconcile loops for service (default 3)
137140
serviceMaxConcurrentReconciles:
138141

0 commit comments

Comments
 (0)