Skip to content

data/bootstrap/files/usr/local/bin/bootkube: --rm all Podman containers #5803

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
Apr 21, 2022
Merged

data/bootstrap/files/usr/local/bin/bootkube: --rm all Podman containers #5803

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
7 changes: 4 additions & 3 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 @@ -19,12 +19,11 @@ ETCD_ENDPOINTS=
bootkube_podman_run() {
# we run all commands in the host-network to prevent IP conflicts with
# end-user infrastructure.
podman run --quiet --net=host "${@}"
podman run --quiet --net=host --rm "${@}"
}

wait_for_etcd_cluster() {
until bootkube_podman_run \
--rm \
--name etcdctl \
--env ETCDCTL_API=3 \
--volume /opt/openshift/tls:/opt/openshift/tls:ro,z \
Expand Down Expand Up @@ -109,6 +108,9 @@ if [ ! -f etcd-bootstrap.done ]
then
record_service_stage_start "etcd-bootstrap"
echo "Rendering CEO Manifests..."

rm --recursive --force etcd-bootstrap

bootkube_podman_run \
--name etcd-render \
--volume "$PWD:/assets:z" \
Expand Down Expand Up @@ -399,7 +401,6 @@ run_cluster_bootstrap() {
record_service_stage_start "cb-bootstrap"
bootkube_podman_run \
--name cluster-bootstrap \
--rm \
--volume "$PWD:/assets:z" \
--volume /etc/kubernetes:/etc/kubernetes:z \
"${CLUSTER_BOOTSTRAP_IMAGE}" \
Expand Down