Skip to content

Commit 86c86ab

Browse files
chrischdiopenshift-cherrypick-robot
authored andcommitted
ccm: disable unused secure-serving port and webhook
1 parent fbddd2c commit 86c86ab

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

pkg/cloud/aws/assets/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ spec:
4242
--leader-elect-renew-deadline=107s \
4343
--leader-elect-retry-period=26s \
4444
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
45+
--secure-port=0 \
4546
-v=2
4647
image: {{ .images.CloudControllerManager }}
4748
imagePullPolicy: IfNotPresent

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ spec:
147147
--leader-elect-lease-duration=137s \
148148
--leader-elect-renew-deadline=107s \
149149
--leader-elect-retry-period=26s \
150-
--leader-elect-resource-namespace=openshift-cloud-controller-manager
150+
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
151+
--secure-port=0
151152
terminationMessagePolicy: FallbackToLogsOnError
152153
volumeMounts:
153154
- 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
@@ -120,7 +120,8 @@ spec:
120120
--leader-elect-lease-duration=137s \
121121
--leader-elect-renew-deadline=107s \
122122
--leader-elect-retry-period=26s \
123-
--leader-elect-resource-namespace=openshift-cloud-controller-manager
123+
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
124+
--secure-port=0
124125
terminationMessagePolicy: FallbackToLogsOnError
125126
volumeMounts:
126127
- 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)