Skip to content

[release-4.14] OCPBUGS-63170: ccm: disable unused secure-serving port and webhook #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release-4.14
Choose a base branch
from
Open

[release-4.14] OCPBUGS-63170: ccm: disable unused secure-serving port and webhook #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15e5282
ccm: disable unused secure-serving port and webhook
chrischdi Sep 16, 2025
c82f74b
goimports: use latest compatible goimports version
chrischdi Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/goimports.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ REPO_ROOT=$(realpath "$(dirname "${BASH_SOURCE[0]}")/..")

function runGoimports() {
local GOIMPORTS_PATH=$REPO_ROOT/bin/goimports
GOBIN="$REPO_ROOT"/bin go install -mod=readonly golang.org/x/tools/cmd/goimports@latest
GOBIN="$REPO_ROOT"/bin go install -mod=readonly golang.org/x/tools/cmd/goimports@v0.24.0

local LOCAL_PACKAGE="github.com/openshift/cluster-cloud-controller-manager-operator"
local GOIMPORTS_ARGS=("-local $LOCAL_PACKAGE -w $REPO_ROOT/cmd $REPO_ROOT/pkg")
Expand Down
1 change: 1 addition & 0 deletions pkg/cloud/aws/assets/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
--leader-elect-renew-deadline=107s \
--leader-elect-retry-period=26s \
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
--secure-port=0 \
-v=2
image: {{ .images.CloudControllerManager }}
imagePullPolicy: IfNotPresent
Expand Down
3 changes: 2 additions & 1 deletion pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ spec:
--leader-elect-lease-duration=137s \
--leader-elect-renew-deadline=107s \
--leader-elect-retry-period=26s \
--leader-elect-resource-namespace=openshift-cloud-controller-manager
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
--secure-port=0
volumeMounts:
- name: host-etc-kube
mountPath: /etc/kubernetes
Expand Down
3 changes: 2 additions & 1 deletion pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ spec:
--leader-elect-lease-duration=137s \
--leader-elect-renew-deadline=107s \
--leader-elect-retry-period=26s \
--leader-elect-resource-namespace=openshift-cloud-controller-manager
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
--secure-port=0
volumeMounts:
- name: host-etc-kube
mountPath: /etc/kubernetes
Expand Down
3 changes: 2 additions & 1 deletion pkg/cloud/gcp/assets/cloud-controller-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ spec:
--leader-elect-lease-duration=137s \
--leader-elect-renew-deadline=107s \
--leader-elect-retry-period=26s \
--leader-elect-resource-namespace=openshift-cloud-controller-manager
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
--secure-port=0
volumeMounts:
- name: host-etc-kube
mountPath: /etc/kubernetes
Expand Down
3 changes: 2 additions & 1 deletion pkg/cloud/nutanix/assets/cloud-controller-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ spec:
--leader-elect-lease-duration=137s \
--leader-elect-renew-deadline=107s \
--leader-elect-retry-period=26s \
--leader-elect-resource-namespace=openshift-cloud-controller-manager
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
--secure-port=0
volumeMounts:
- name: nutanix-config
mountPath: /etc/cloud
Expand Down
3 changes: 2 additions & 1 deletion pkg/cloud/openstack/assets/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ spec:
--leader-elect-renew-deadline=107s \
--leader-elect-retry-period=26s \
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
--feature-gates={{ .featureGates }}
--feature-gates={{ .featureGates }} \
--secure-port=0
ports:
- containerPort: 10258
name: https
Expand Down
3 changes: 2 additions & 1 deletion pkg/cloud/vsphere/assets/cloud-controller-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ spec:
--leader-elect-retry-period=26s \
--leader-elect-resource-namespace=openshift-cloud-controller-manager \
--feature-gates={{ .featureGates }} \
--use-service-account-credentials=true
--use-service-account-credentials=true \
--secure-port=0
volumeMounts:
- name: host-etc-kube
mountPath: /etc/kubernetes
Expand Down