Skip to content

Commit 9f2dcd3

Browse files
Merge pull request #415 from chrischdi/pr-aws-ccm-disable-webhook-port
OCPBUGS-51305: ccm: disable unused secure-serving port and webhook
2 parents 2dc5d4b + ca9e78f commit 9f2dcd3

7 files changed

Lines changed: 13 additions & 6 deletions

File tree

pkg/cloud/aws/assets/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ spec:
4343
--leader-elect-renew-deadline=107s \
4444
--leader-elect-retry-period=26s \
4545
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
46+
--secure-port=0 \
4647
-v=2
4748
env:
4849
- name: CLOUD_CONFIG

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ spec:
121121
--leader-elect-lease-duration=137s \
122122
--leader-elect-renew-deadline=107s \
123123
--leader-elect-retry-period=26s \
124-
--leader-elect-resource-namespace=openshift-cloud-controller-manager
124+
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
125+
--secure-port=0
125126
terminationMessagePolicy: FallbackToLogsOnError
126127
volumeMounts:
127128
- name: host-etc-kube

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ spec:
113113
--leader-elect-lease-duration=137s \
114114
--leader-elect-renew-deadline=107s \
115115
--leader-elect-retry-period=26s \
116-
--leader-elect-resource-namespace=openshift-cloud-controller-manager
116+
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
117+
--secure-port=0
117118
terminationMessagePolicy: FallbackToLogsOnError
118119
volumeMounts:
119120
- name: host-etc-kube

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ spec:
9595
--leader-elect-lease-duration=137s \
9696
--leader-elect-renew-deadline=107s \
9797
--leader-elect-retry-period=26s \
98-
--leader-elect-resource-namespace=openshift-cloud-controller-manager
98+
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
99+
--secure-port=0
99100
terminationMessagePolicy: FallbackToLogsOnError
100101
volumeMounts:
101102
- name: host-etc-kube

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ spec:
9898
--leader-elect-renew-deadline=107s \
9999
--leader-elect-retry-period=26s \
100100
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
101-
--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
101+
--tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 \
102+
--secure-port=0
102103
terminationMessagePolicy: FallbackToLogsOnError
103104
volumeMounts:
104105
- name: nutanix-config

pkg/cloud/openstack/assets/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ spec:
7878
--leader-elect-renew-deadline=107s \
7979
--leader-elect-retry-period=26s \
8080
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
81-
--feature-gates={{ .featureGates }}
81+
--feature-gates={{ .featureGates }} \
82+
--secure-port=0
8283
ports:
8384
- containerPort: 10258
8485
name: https

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ spec:
9999
--leader-elect-retry-period=26s \
100100
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
101101
--feature-gates={{ .featureGates }} \
102-
--use-service-account-credentials=true
102+
--use-service-account-credentials=true \
103+
--secure-port=0
103104
terminationMessagePolicy: FallbackToLogsOnError
104105
volumeMounts:
105106
- name: host-etc-kube

0 commit comments

Comments
 (0)