Skip to content
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.

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

API-1845: WIP: [KMS] Image reference KASO render aws-kms-encryption-provider payload image #9205

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ bootkube_podman_run() {
podman run --quiet --net=host --rm "${@}"
}

bootkube_dump_image_refs() {
# Dump out image reference file
podman run --quiet --rm --net=none --entrypoint="cat" "${RELEASE_IMAGE_DIGEST}" "/release-manifests/image-references" > image-references
}

wait_for_etcd_cluster() {
until bootkube_podman_run \
--name etcdctl \
Expand Down Expand Up @@ -213,6 +218,9 @@ then

rm --recursive --force kube-apiserver-bootstrap

# Dump out image reference file so KASO can consume additional image references
bootkube_dump_image_refs

bootkube_podman_run \
--name kube-apiserver-render \
--volume "$PWD:/assets:z" \
Expand All @@ -230,7 +238,8 @@ then
--infra-config-file=/assets/manifests/cluster-infrastructure-02-config.yml \
--rendered-manifest-files=/assets/manifests \
--payload-version=$VERSION \
--operand-kubernetes-version="${KUBERNETES_VERSION}"
--operand-kubernetes-version="${KUBERNETES_VERSION}" \
--image-references=/assets/image-references

cp kube-apiserver-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-apiserver-config.yaml
cp kube-apiserver-bootstrap/bootstrap-manifests/* bootstrap-manifests/
Expand Down Expand Up @@ -408,7 +417,7 @@ then
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_dump_image_refs

# NOTICE: If you change this, you probably also want to change https://github.com/openshift/hypershift/blob/f7e79bf1dc7e90000984bf9ffeafa740defbee0a/ignition-server/controllers/local_ignitionprovider.go
bootkube_podman_run \
Expand Down