Skip to content

Commit 2fe20f7

Browse files
damdodamdo
committed
deployments: pass down tls config also to --webhook-tls-*
1 parent 952ea5c commit 2fe20f7

9 files changed

Lines changed: 56 additions & 7 deletions

File tree

‎pkg/cloud/aws/assets/deployment.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,21 @@ spec:
4242
--leader-elect-lease-duration=137s \
4343
--leader-elect-renew-deadline=107s \
4444
--leader-elect-retry-period=26s \
45+
--webhooks=* \
46+
--feature-gates=CloudControllerManagerWebhook=true \
4547
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
4648
{{- if .tlsCipherSuites }}
4749
--tls-cipher-suites={{ .tlsCipherSuites }} \
4850
{{- end }}
4951
{{- if .tlsMinVersion }}
5052
--tls-min-version={{ .tlsMinVersion }} \
5153
{{- end }}
52-
--secure-port=0 \
54+
{{- if .tlsCipherSuites }}
55+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
56+
{{- end }}
57+
{{- if .tlsMinVersion }}
58+
--webhook-tls-min-version={{ .tlsMinVersion }} \
59+
{{- end }}
5360
-v=2
5461
env:
5562
- name: CLOUD_CONFIG

‎pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,12 @@ spec:
128128
{{- if .tlsMinVersion }}
129129
--tls-min-version={{ .tlsMinVersion }} \
130130
{{- end }}
131-
--secure-port=0
131+
{{- if .tlsCipherSuites }}
132+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
133+
{{- end }}
134+
{{- if .tlsMinVersion }}
135+
--webhook-tls-min-version={{ .tlsMinVersion }}
136+
{{- end }}
132137
terminationMessagePolicy: FallbackToLogsOnError
133138
volumeMounts:
134139
- name: host-etc-kube

‎pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,12 @@ spec:
120120
{{- if .tlsMinVersion }}
121121
--tls-min-version={{ .tlsMinVersion }} \
122122
{{- end }}
123-
--secure-port=0
123+
{{- if .tlsCipherSuites }}
124+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
125+
{{- end }}
126+
{{- if .tlsMinVersion }}
127+
--webhook-tls-min-version={{ .tlsMinVersion }}
128+
{{- end }}
124129
terminationMessagePolicy: FallbackToLogsOnError
125130
volumeMounts:
126131
- name: host-etc-kube

‎pkg/cloud/gcp/assets/cloud-controller-manager.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,12 @@ spec:
102102
{{- if .tlsMinVersion }}
103103
--tls-min-version={{ .tlsMinVersion }} \
104104
{{- end }}
105-
--secure-port=0
105+
{{- if .tlsCipherSuites }}
106+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
107+
{{- end }}
108+
{{- if .tlsMinVersion }}
109+
--webhook-tls-min-version={{ .tlsMinVersion }}
110+
{{- end }}
106111
terminationMessagePolicy: FallbackToLogsOnError
107112
volumeMounts:
108113
- name: host-etc-kube

‎pkg/cloud/ibm/assets/deployment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ spec:
9090
{{- if .tlsMinVersion }}
9191
--tls-min-version={{ .tlsMinVersion }} \
9292
{{- end }}
93+
{{- if .tlsCipherSuites }}
94+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
95+
{{- end }}
96+
{{- if .tlsMinVersion }}
97+
--webhook-tls-min-version={{ .tlsMinVersion }} \
98+
{{- end }}
9399
--v=2
94100
livenessProbe:
95101
failureThreshold: 3

‎pkg/cloud/nutanix/assets/cloud-controller-manager-deployment.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,12 @@ spec:
104104
{{- if .tlsMinVersion }}
105105
--tls-min-version={{ .tlsMinVersion }} \
106106
{{- end }}
107-
--secure-port=0
107+
{{- if .tlsCipherSuites }}
108+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
109+
{{- end }}
110+
{{- if .tlsMinVersion }}
111+
--webhook-tls-min-version={{ .tlsMinVersion }}
112+
{{- end }}
108113
terminationMessagePolicy: FallbackToLogsOnError
109114
volumeMounts:
110115
- name: nutanix-config

‎pkg/cloud/openstack/assets/deployment.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@ spec:
8585
{{- if .tlsMinVersion }}
8686
--tls-min-version={{ .tlsMinVersion }} \
8787
{{- end }}
88-
--secure-port=0
88+
{{- if .tlsCipherSuites }}
89+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
90+
{{- end }}
91+
{{- if .tlsMinVersion }}
92+
--webhook-tls-min-version={{ .tlsMinVersion }}
93+
{{- end }}
8994
ports:
9095
- containerPort: 10258
9196
name: https

‎pkg/cloud/powervs/assets/deployment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ spec:
8989
{{- if .tlsMinVersion }}
9090
--tls-min-version={{ .tlsMinVersion }} \
9191
{{- end }}
92+
{{- if .tlsCipherSuites }}
93+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
94+
{{- end }}
95+
{{- if .tlsMinVersion }}
96+
--webhook-tls-min-version={{ .tlsMinVersion }} \
97+
{{- end }}
9298
--v=2
9399
livenessProbe:
94100
httpGet:

‎pkg/cloud/vsphere/assets/cloud-controller-manager-deployment.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,12 @@ spec:
111111
{{- if .tlsMinVersion }}
112112
--tls-min-version={{ .tlsMinVersion }} \
113113
{{- end }}
114-
--secure-port=0
114+
{{- if .tlsCipherSuites }}
115+
--webhook-tls-cipher-suites={{ .tlsCipherSuites }} \
116+
{{- end }}
117+
{{- if .tlsMinVersion }}
118+
--webhook-tls-min-version={{ .tlsMinVersion }}
119+
{{- end }}
115120
terminationMessagePolicy: FallbackToLogsOnError
116121
volumeMounts:
117122
- name: host-etc-kube

0 commit comments

Comments
 (0)