Skip to content

Commit

Permalink
Merge pull request #3194 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…3175-to-release-4.4

[release-4.4] bug 1808060: use localhost for bootstrap IP until bootkube is fixed
  • Loading branch information
openshift-merge-robot committed Feb 27, 2020
2 parents e172a64 + 710a637 commit 8e397c0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ bootkube_podman_run \
if [ ! -z "$CLUSTER_ETCD_OPERATOR_MANAGED" ]
then
# TODO: host-etcd endpoint rendered by cluster-etcd-operator
BOOTSTRAP_IP=$(hostname -I | awk '{ print $1 }')
ETCD_ENDPOINTS=https://"${BOOTSTRAP_IP}":2379
ETCD_ENDPOINTS=https://localhost:2379
if [ ! -f etcd-bootstrap.done ]
then
echo "Rendering CEO Manifests..."
Expand All @@ -134,7 +133,8 @@ then
--config-output-file=/assets/etcd-bootstrap/config \
--cluster-config-file=/assets/manifests/cluster-network-02-config.yml

sed -i "s/__BOOTSTRAP_IP__/${BOOTSTRAP_IP}/" /opt/openshift/manifests/etcd-host-service-endpoints.yaml
# pass an IP in the sample range to pass validation, but be ignored.
sed -i "s/__BOOTSTRAP_IP__/192.0.2.200/" /opt/openshift/manifests/etcd-host-service-endpoints.yaml

cp etcd-bootstrap/manifests/* manifests/
cp etcd-bootstrap/bootstrap-manifests/etcd-member-pod.yaml /etc/kubernetes/manifests/
Expand Down

0 comments on commit 8e397c0

Please sign in to comment.