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

config: update operator payloads for v0.8.0 release #282

Merged

Conversation

portersrc
Copy link
Member

This covers step 13 from the release checklist here

Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

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

@portersrc, please, just take a look at the comments related to enclave-cc.

@@ -9,7 +9,7 @@ spec:
node.kubernetes.io/worker: ""
config:
installType: bundle
payloadImage: quay.io/confidential-containers/runtime-payload-ci:enclave-cc-HW-cc-kbc-b58c59dc72a0b10ae3dd4436a206fd54a820c9f7
payloadImage: quay.io/confidential-containers/runtime-payload-ci:enclave-cc-HW-cc-kbc-753599f76ef201968438b15f01d7b37d49cc7c5c
Copy link
Member

Choose a reason for hiding this comment

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

For this one ...

@@ -5,6 +5,6 @@ nameSuffix: -sgx-mode-sim

images:
- name: quay.io/confidential-containers/runtime-payload-ci
newTag: enclave-cc-SIM-sample-kbc-b58c59dc72a0b10ae3dd4436a206fd54a820c9f7
newTag: enclave-cc-SIM-sample-kbc-753599f76ef201968438b15f01d7b37d49cc7c5c
Copy link
Member

Choose a reason for hiding this comment

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

... and this one, could you use ed979ef2952d8b20c2f0abee3d32a3617d2c57bb tag?

enclave-cc merged a bump on Occlum Today, and we want to test with that image.

@portersrc
Copy link
Member Author

@portersrc, please, just take a look at the comments related to enclave-cc.

I bumped it; it looks like that enclave-cc bundle is still building as of this writing though

Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

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

lgtm, assuming the tests will pass.

Thanks, @portersrc!

@fidencio
Copy link
Member

fidencio commented Nov 7, 2023

/test

@portersrc portersrc marked this pull request as ready for review November 7, 2023 13:17
@fidencio
Copy link
Member

fidencio commented Nov 7, 2023

/test-s390x

@fitzthum
Copy link
Member

fitzthum commented Nov 7, 2023

/test

1 similar comment
@fidencio
Copy link
Member

fidencio commented Nov 7, 2023

/test

@fidencio
Copy link
Member

fidencio commented Nov 7, 2023

/test

@@ -66,7 +66,7 @@ build_pre_install_img() {
handle_older_containerd() {
command -v containerd >/dev/null || return
local version
version=$(containerd -v | awk '{ print $3 }')
version=$(containerd -v | awk '{ print $3 }' | sed 's/^v//')
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the fix, @portersrc !

Copy link
Member

@fitzthum fitzthum left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@stevenhorsman stevenhorsman 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!

@wainersm
Copy link
Member

wainersm commented Nov 7, 2023

@portersrc any special reason to not pin the s390x payload? -> https://github.com/confidential-containers/operator/blob/main/config/samples/ccruntime/s390x/kustomization.yaml

@fidencio
Copy link
Member

fidencio commented Nov 7, 2023

@portersrc any special reason to not pin the s390x payload? -> https://github.com/confidential-containers/operator/blob/main/config/samples/ccruntime/s390x/kustomization.yaml

Oh, that's something that was overlook, I guess, nice catch!

@wainersm
Copy link
Member

wainersm commented Nov 7, 2023

@portersrc any special reason to not pin the s390x payload? -> https://github.com/confidential-containers/operator/blob/main/config/samples/ccruntime/s390x/kustomization.yaml

Oh, that's something that was overlook, I guess, nice catch!

Also we are using the CI payload instead of quay.io/confidential-containers/runtime-payload

@wainersm
Copy link
Member

wainersm commented Nov 7, 2023

@portersrc you also need to bump the hash of pre-reqs for peer-pods too

Good opportunity to advertise this: #205 (perhaps someone "cof-cof Chris cof-cof" would like to take over that script).

@fitzthum
Copy link
Member

fitzthum commented Nov 7, 2023

Also we are using the CI payload instead of quay.io/confidential-containers/runtime-payload

I think the idea is to switch to the runtime-payload bundle in step 19 after we add the release tags for kata and enclave-cc. In the past we have sometimes combined this step with that one, though, and we could do that again if people think it would save time.

@wainersm
Copy link
Member

wainersm commented Nov 7, 2023

Also we are using the CI payload instead of quay.io/confidential-containers/runtime-payload

I think the idea is to switch to the runtime-payload bundle in step 19 after we add the release tags for kata and enclave-cc. In the past we have sometimes combined this step with that one, though, and we could do that again if people think it would save time.

Good point @fitzthum , I forgot kata isn't tagged yet. IMHO, anything to speed up this release is welcomed, so I am okay to switch the payload on this PR to run the CI jobs one more time

Update the operator to point to the kata containers and enclave-cc
release candidate bundles for runtime-payload-ci for v0.8.0

Signed-off-by: Chris Porter <porter@ibm.com>
Update the operator to point to the new release candidate bundles for
reqs-payload for v0.8.0

Signed-off-by: Chris Porter <porter@ibm.com>
Handle cases where an older containerd version is prefixed with "v"
so that the operator still installs a newer version for them during
end-to-end tests

Signed-off-by: Chris Porter <porter@ibm.com>
@portersrc
Copy link
Member Author

Thanks to @wainersm for catching these two things: pinning s390x runtime-payload-ci and also pinning peer-pods' reqs-payload.
These are incorporated into the latest push.

@portersrc
Copy link
Member Author

/test

@fitzthum
Copy link
Member

fitzthum commented Nov 7, 2023

@wainersm my hunch for now is to do another PR for step 19 just to make sure we don't confuse ourselves. I don't think that will take too much longer, but I leave it to @portersrc to decide.

Copy link
Member

@wainersm wainersm left a comment

Choose a reason for hiding this comment

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

@portersrc now it looks okay to me. Thanks!

@fitzthum
Copy link
Member

fitzthum commented Nov 7, 2023

/test

@fitzthum
Copy link
Member

fitzthum commented Nov 7, 2023

Let's give these tests one more chance to behave

@fidencio fidencio merged commit ac6168a into confidential-containers:main Nov 8, 2023
13 checks passed
@portersrc portersrc deleted the step-13-operator-bump branch February 5, 2024 20:13
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.

5 participants