Skip to content

Bug 1864677: bootkube.sh: update cluster-config-operator to generate bootstrap configmap #3831

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

Merged
openshift-merge-robot merged 1 commit into from
Aug 4, 2020
Merged

Bug 1864677: bootkube.sh: update cluster-config-operator to generate bootstrap configmap #3831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,21 @@ then

rm --recursive --force config-bootstrap

ADDITIONAL_FLAGS=""
if [ -f "$PWD/manifests/cloud-provider-config.yaml" ]; then
ADDITIONAL_FLAGS="--cloud-provider-config-input-file=/assets/manifests/cloud-provider-config.yaml"
fi

bootkube_podman_run \
--volume "$PWD:/assets:z" \
"${CONFIG_OPERATOR_IMAGE}" \
/usr/bin/cluster-config-operator render \
--cluster-infrastructure-input-file=/assets/manifests/cluster-infrastructure-02-config.yml \
--cloud-provider-config-output-file=/assets/config-bootstrap/cloud-provider-config-generated.yaml \
--config-output-file=/assets/config-bootstrap/config \
--asset-input-dir=/assets/tls \
--asset-output-dir=/assets/config-bootstrap
--asset-output-dir=/assets/config-bootstrap \
${ADDITIONAL_FLAGS}

cp config-bootstrap/manifests/* manifests/

Expand Down Expand Up @@ -270,6 +278,9 @@ then
if [ -f "/opt/openshift/tls/cloud-ca-cert.pem" ]; then
ADDITIONAL_FLAGS="--cloud-provider-ca-file=/assets/tls/cloud-ca-cert.pem"
fi
if [ -f "$PWD/manifests/cloud-provider-config.yaml" ]; then
ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} --cloud-config-file=/assets/config-bootstrap/cloud-provider-config-generated.yaml"
fi

bootkube_podman_run \
--user 0 \
Expand All @@ -293,7 +304,6 @@ then
--mdns-publisher-image="${MDNS_PUBLISHER_IMAGE}" \
--haproxy-image="${HAPROXY_IMAGE}" \
--baremetal-runtimecfg-image="${BAREMETAL_RUNTIMECFG_IMAGE}" \
--cloud-config-file=/assets/manifests/cloud-provider-config.yaml \
--cluster-etcd-operator-image="${CLUSTER_ETCD_OPERATOR_IMAGE}" \
--release-image="${RELEASE_IMAGE_DIGEST}" \
${ADDITIONAL_FLAGS}
Expand Down