Skip to content

Commit

Permalink
BUG 1853889: Change port for kube-controller-manager-recovery-controller
Browse files Browse the repository at this point in the history
PR[1] added logic for checking port availability in recovery-controller.
PR[2] change the port of HAProxy to 9443, due to yet another port conflict.
Both of the PRs cause the kube-controller-manager-recovery-controller to crash loop
on on-prem platforms such as oVirt, baremetal and openstack.
This PR changes the port ov the recovery controller.

[1] openshift#421
[2] openshift/baremetal-runtimecfg#59

Signed-off-by: Gal-Zaidman <gzaidman@redhat.com>
  • Loading branch information
Gal-Zaidman committed Jul 7, 2020
1 parent 436ac26 commit 6bfdf7b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bindata/v4.1.0/kube-controller-manager/pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ spec:
command: ["/bin/bash", "-euxo", "pipefail", "-c"]
args:
- |
timeout 3m /bin/bash -exuo pipefail -c 'while [ -n "$(ss -Htanop \( sport = 9443 \))" ]; do sleep 1; done'
timeout 3m /bin/bash -exuo pipefail -c 'while [ -n "$(ss -Htanop \( sport = 9445 \))" ]; do sleep 1; done'
exec cluster-kube-controller-manager-operator cert-recovery-controller --kubeconfig=/etc/kubernetes/static-pod-resources/configmaps/kube-controller-cert-syncer-kubeconfig/kubeconfig --namespace=${POD_NAMESPACE} --listen=0.0.0.0:9443 -v=2
exec cluster-kube-controller-manager-operator cert-recovery-controller --kubeconfig=/etc/kubernetes/static-pod-resources/configmaps/kube-controller-cert-syncer-kubeconfig/kubeconfig --namespace=${POD_NAMESPACE} --listen=0.0.0.0:9445 -v=2
resources:
requests:
memory: 50Mi
Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/v411_00_assets/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6bfdf7b

Please sign in to comment.