Skip to content

Commit 09ca986

Browse files
Do not set caBundle if CertManager is used (#2649)
Ensures there is no diff when using manifests directly generated from helm chart.
1 parent 8da0d47 commit 09ca986

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

helm/aws-load-balancer-controller/templates/webhook.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ metadata:
1212
{{- include "aws-load-balancer-controller.labels" . | nindent 4 }}
1313
webhooks:
1414
- clientConfig:
15-
caBundle: {{ if not $.Values.enableCertManager -}}{{ $tls.caCert }}{{- else -}}Cg=={{ end }}
15+
{{ if not $.Values.enableCertManager -}}
16+
caBundle: {{ $tls.caCert }}
17+
{{ end }}
1618
service:
1719
name: {{ template "aws-load-balancer-controller.webhookService" . }}
1820
namespace: {{ $.Release.Namespace }}
@@ -51,7 +53,9 @@ webhooks:
5153
- pods
5254
sideEffects: None
5355
- clientConfig:
54-
caBundle: {{ if not $.Values.enableCertManager -}}{{ $tls.caCert }}{{- else -}}Cg=={{ end }}
56+
{{ if not $.Values.enableCertManager -}}
57+
caBundle: {{ $tls.caCert }}
58+
{{ end }}
5559
service:
5660
name: {{ template "aws-load-balancer-controller.webhookService" . }}
5761
namespace: {{ $.Release.Namespace }}
@@ -84,7 +88,9 @@ metadata:
8488
{{- include "aws-load-balancer-controller.labels" . | nindent 4 }}
8589
webhooks:
8690
- clientConfig:
87-
caBundle: {{ if not $.Values.enableCertManager -}}{{ $tls.caCert }}{{- else -}}Cg=={{ end }}
91+
{{ if not $.Values.enableCertManager -}}
92+
caBundle: {{ $tls.caCert }}
93+
{{ end }}
8894
service:
8995
name: {{ template "aws-load-balancer-controller.webhookService" . }}
9096
namespace: {{ $.Release.Namespace }}
@@ -105,7 +111,9 @@ webhooks:
105111
- targetgroupbindings
106112
sideEffects: None
107113
- clientConfig:
108-
caBundle: {{ if not $.Values.enableCertManager -}}{{ $tls.caCert }}{{- else -}}Cg=={{ end }}
114+
{{ if not $.Values.enableCertManager -}}
115+
caBundle: {{ $tls.caCert }}
116+
{{ end }}
109117
service:
110118
name: {{ template "aws-load-balancer-controller.webhookService" . }}
111119
namespace: {{ $.Release.Namespace }}

0 commit comments

Comments
 (0)