Skip to content

Extract the image-references file from the release, pass it to machine-config-operator #6234

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 19, 2022
Merged

Extract the image-references file from the release, pass it to machine-config-operator #6234

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
4 changes: 4 additions & 0 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 @@ -293,6 +293,9 @@ then
ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} --cloud-config-file=/assets/config-bootstrap/cloud-provider-config-generated.yaml"
fi

# Dump out image reference file so MCO can consume multiple/additional image references
podman run --quiet --rm --net=none --entrypoint="cat" "${RELEASE_IMAGE_DIGEST}" "/release-manifests/image-references" > image-references

bootkube_podman_run \
--name mco-render \
--user 0 \
Expand All @@ -312,6 +315,7 @@ then
--haproxy-image="${HAPROXY_IMAGE}" \
Copy link
Member

@cgwalters cgwalters Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory we could also drop these arguments now, right?

Copy link
Member Author

@jkyros jkyros Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could, yes, but I was a big chicken 😄

I figured we'd add the new argument -> make sure on our end everything works (I'm sure it does) -> come back for cleanup. If you think we should pull the old args out now to save time, we can?

Copy link
Member

@cgwalters cgwalters Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We wouldn't pass CI here unless the new path worked entirely, right? (I guess there's possible corner cases on e.g. bare metal images not used in the default cloud cases, but we can probably just double check before merging)

I don't have a strong opinion here and will leave it to your choice!

--baremetal-runtimecfg-image="${BAREMETAL_RUNTIMECFG_IMAGE}" \
--release-image="${RELEASE_IMAGE_DIGEST}" \
--image-references=assets/image-references \
${ADDITIONAL_FLAGS}

# Bootstrap MachineConfigController uses /etc/mcc/bootstrap/manifests/ dir to
Expand Down