File tree Expand file tree Collapse file tree 3 files changed +10
-1
lines changed
helm/aws-load-balancer-controller Expand file tree Collapse file tree 3 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -187,6 +187,7 @@ The default values set by the application itself can be confirmed [here](https:/
187
187
| ` webhookTLS.caCert ` | TLS CA certificate for webhook (auto-generated if not provided) | "" |
188
188
| ` webhookTLS.cert ` | TLS certificate for webhook (auto-generated if not provided) | "" |
189
189
| ` webhookTLS.key ` | TLS private key for webhook (auto-generated if not provided) | "" |
190
+ | ` keepTLSSecret ` | Keeps the usage of existing TLS Secret | ` false ` |
190
191
| ` serviceAnnotations ` | Annotations to be added to the provisioned webhook service resource | ` {} ` |
191
192
| ` serviceMaxConcurrentReconciles ` | Maximum number of concurrently running reconcile loops for service | None |
192
193
| ` targetgroupbindingMaxConcurrentReconciles ` | Maximum number of concurrently running reconcile loops for targetGroupBinding | None |
Original file line number Diff line number Diff line change @@ -76,12 +76,17 @@ Create the name of the service account to use
76
76
Generate certificates for webhook
77
77
*/} }
78
78
{ {- 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 ) -} }
79
81
{ {- if (and .Values.webhookTLS.caCert .Values.webhookTLS.cert .Values.webhookTLS.key) -} }
80
82
caCert: { { .Values.webhookTLS.caCert | b64enc } }
81
83
clientCert: { { .Values.webhookTLS.cert | b64enc } }
82
84
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" } }
83
89
{ {- else -} }
84
- { {- $namePrefix := ( include " aws-load-balancer-controller.namePrefix" . ) -} }
85
90
{ {- $altNames := list ( printf " %s-%s.%s" $namePrefix " webhook-service" .Release.Namespace ) ( printf " %s-%s.%s.svc" $namePrefix " webhook-service" .Release.Namespace ) -} }
86
91
{ {- $ca := genCA " aws-load-balancer-controller-ca" 3650 -} }
87
92
{ {- $cert := genSignedCert ( include " aws-load-balancer-controller.fullname" . ) nil $altNames 3650 $ca -} }
Original file line number Diff line number Diff line change @@ -133,6 +133,9 @@ webhookTLS:
133
133
cert :
134
134
key :
135
135
136
+ # keepTLSSecret keeps using the existing TLS secrets, false by default
137
+ keepTLSSecret : false
138
+
136
139
# Maximum number of concurrently running reconcile loops for service (default 3)
137
140
serviceMaxConcurrentReconciles :
138
141
You can’t perform that action at this time.
0 commit comments