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

Embed pause image #424

Merged
merged 6 commits into from
Jul 3, 2024
Merged

Embed pause image #424

merged 6 commits into from
Jul 3, 2024

Conversation

bpradipt
Copy link
Contributor

@bpradipt bpradipt commented Jul 1, 2024

No description provided.

Both these packages are needed for downloading and embedding
container images in the podvm image

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 1, 2024
Copy link

openshift-ci bot commented Jul 1, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@bpradipt bpradipt requested a review from snir911 July 1, 2024 10:36
@bpradipt bpradipt marked this pull request as ready for review July 1, 2024 10:54
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 1, 2024
@bpradipt
Copy link
Contributor Author

bpradipt commented Jul 1, 2024

@savitaashture fyi

@openshift-ci openshift-ci bot requested review from cpmeadors and pmores July 1, 2024 10:55
@bpradipt bpradipt force-pushed the embed-pause branch 2 times, most recently from d2fa672 to e2c89a3 Compare July 1, 2024 11:35
config/peerpods/podvm/aws-podvm-image-cm.yaml Outdated Show resolved Hide resolved
config/peerpods/podvm/aws-podvm-image-cm.yaml Outdated Show resolved Hide resolved
config/peerpods/podvm/lib.sh Show resolved Hide resolved
@bpradipt bpradipt requested a review from snir911 July 1, 2024 16:38
Copy link
Contributor

@snir911 snir911 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! added some minor comments

config/peerpods/podvm/lib.sh Show resolved Hide resolved
config/peerpods/podvm/lib.sh Outdated Show resolved Hide resolved
controllers/image_generator.go Show resolved Hide resolved
bpradipt added 5 commits July 3, 2024 12:57
Downloads the pause image using skopeo and uses
umoci to create the oci bundle for embedding

The following OCP pause image is embedded by default
quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f3cb6f9d265291b47a7491c2ba4f4dd0752a18b661eee40584f9a5dbcbe13bb

A new bash method download_and_extract_pause_image is introduced which
accepts three parameters via env variable:

PAUSE_IMAGE_REPO, PAUSE_IMAGE_VERSION and PAUSE_IMAGE_REPO_AUTH_FILE

These can be set in the respective podvm image configMap
(<provider>-podvm-image-cm.yaml) before kickstarting the pod vm image
generation if required.

The PAUSE_IMAGE_REPO_AUTH_FILE points to a json file containing the registry
secret to pull the image from authenticated registry.

The default is the cluster secret that is mounted as a volume in the
`/tmp/regauth/auth.json` for osc-podvm-create-job.yaml to download OCP
pause image.

Fixes: #KATA-3156

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
The upstream code layout changed from src/cloud-api-adaptor
to src/cloud-api-adaptor/src/cloud-api-adaptor. Accordingly
change the handling of source code directory.

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
Latest stable image with security fixes

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
cloud-api-adaptor uses kata/main now. So update the labels
to reflect the current versions of kata used with CAA

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
When RELATED_IMAGE_PODVM_PAYLOAD is set, update the job spec to use
this image in initContainer.

Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
Copy link

openshift-ci bot commented Jul 3, 2024

@bpradipt: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/check d84a848 link false /test check
ci/prow/sandboxed-containers-operator-e2e d84a848 link false /test sandboxed-containers-operator-e2e

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@bpradipt
Copy link
Contributor Author

bpradipt commented Jul 3, 2024

Tested with custom operator and podvm-builder image to generate a podvm image with embedded pause image in Azure

@bpradipt bpradipt merged commit 89236e2 into openshift:devel Jul 3, 2024
2 of 4 checks passed
@bpradipt bpradipt deleted the embed-pause branch July 3, 2024 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants