diff --git a/hack/goimports.sh b/hack/goimports.sh index 132cc91ad..ed49bbe5d 100755 --- a/hack/goimports.sh +++ b/hack/goimports.sh @@ -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") diff --git a/pkg/cloud/aws/assets/deployment.yaml b/pkg/cloud/aws/assets/deployment.yaml index bee2d1bc6..75cc35433 100644 --- a/pkg/cloud/aws/assets/deployment.yaml +++ b/pkg/cloud/aws/assets/deployment.yaml @@ -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 diff --git a/pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml b/pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml index 103cb7cac..1cbb62fe9 100644 --- a/pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml +++ b/pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml @@ -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 diff --git a/pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml b/pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml index fe3636911..d613afc35 100644 --- a/pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml +++ b/pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml @@ -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 diff --git a/pkg/cloud/gcp/assets/cloud-controller-manager.yaml b/pkg/cloud/gcp/assets/cloud-controller-manager.yaml index 1a20094bf..87f0cbe6c 100644 --- a/pkg/cloud/gcp/assets/cloud-controller-manager.yaml +++ b/pkg/cloud/gcp/assets/cloud-controller-manager.yaml @@ -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 diff --git a/pkg/cloud/nutanix/assets/cloud-controller-manager-deployment.yaml b/pkg/cloud/nutanix/assets/cloud-controller-manager-deployment.yaml index 0cebdd2ec..332c60bdf 100644 --- a/pkg/cloud/nutanix/assets/cloud-controller-manager-deployment.yaml +++ b/pkg/cloud/nutanix/assets/cloud-controller-manager-deployment.yaml @@ -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 diff --git a/pkg/cloud/openstack/assets/deployment.yaml b/pkg/cloud/openstack/assets/deployment.yaml index 531dc70d5..679004eb3 100644 --- a/pkg/cloud/openstack/assets/deployment.yaml +++ b/pkg/cloud/openstack/assets/deployment.yaml @@ -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 diff --git a/pkg/cloud/vsphere/assets/cloud-controller-manager-deployment.yaml b/pkg/cloud/vsphere/assets/cloud-controller-manager-deployment.yaml index b4176f54e..a685e0225 100644 --- a/pkg/cloud/vsphere/assets/cloud-controller-manager-deployment.yaml +++ b/pkg/cloud/vsphere/assets/cloud-controller-manager-deployment.yaml @@ -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