Skip to content

Commit

Permalink
Merge pull request openshift#6234 from jkyros/allow-mco-consume-multi…
Browse files Browse the repository at this point in the history
…ple-images

Extract the image-references file from the release, pass it to `machine-config-operator`
  • Loading branch information
openshift-merge-robot authored Aug 19, 2022
2 parents 44e71ef + 322d4fe commit fc94a6c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
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}" \
--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

0 comments on commit fc94a6c

Please sign in to comment.