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

Backports for 1.8.1 #482

Merged
merged 9 commits into from
Dec 2, 2024
Merged

Conversation

gkurz
Copy link
Member

@gkurz gkurz commented Nov 29, 2024

beraldoleal and others added 8 commits November 29, 2024 17:57
Those rules were added later, I missed this change.

Signed-off-by: Beraldo Leal <[email protected]>
(cherry picked from commit 8d8009d)
Signed-off-by: Greg Kurz <[email protected]>
Not sure how we are going to deal with this, since this image is not
published yet, only after the release. But we don't want to have the
manifest pointing to 1.7.

Signed-off-by: Beraldo Leal <[email protected]>
(cherry picked from commit 7d0fed1)
Signed-off-by: Greg Kurz <[email protected]>
This was the output of a `make bundle` command.

Signed-off-by: Beraldo Leal <[email protected]>
(cherry picked from commit d585289)
Signed-off-by: Greg Kurz <[email protected]>
* azure: Delete source image on cleanup

OSC creates the podvm image with packer by default and publishes it in a
shared gallery. When the KataConfig CRD is deleted, OSC removes the gallery
but the source image created by packer is left behind. This can generate
uneeded storage costs to the customer.

Fortunately, the path to the source image is available in the output of
`az sig image-version show`. Fix the podvm image deletion flow to also
delete the source image.

Fixes: https://issues.redhat.com/browse/KATA-3462

Signed-off-by: Greg Kurz <[email protected]>
(cherry picked from commit 310f0a3)
Signed-off-by: Greg Kurz <[email protected]>
Apply the updates suggested by `govulncheck`:
- go 1.22.7
- github.com/coreos/ignition/[email protected]

Also run `go mod tidy`.

Signed-off-by: Camilla Conte <[email protected]>
(cherry picked from commit 9629eb3)
Signed-off-by: Greg Kurz <[email protected]>
Signed-off-by: Camilla Conte <[email protected]>
(cherry picked from commit f944f6b)
Signed-off-by: Greg Kurz <[email protected]>
Bumping OSC version is a bit tricky as it should happen at many
locations scattered everywhere in the tree. Commit e2a4c34
introduced an `OSC_VERSION` tag to help tracking these locations.

Unfortunately, `make bundle` wreaks havoc in this logic as it
overwrites lines at several locations and drops the tag:
- everywhere in the `bundle` directory
- some locations in the base CSV
- a single location in `config/manager/kustomization.yaml`

As a result, we can only rely on `OSC_VERSION` for a subset of
the locations that need care. The other ones are:
- the `olm.skipRange` annotation in the base CSV
- the `spec.version` field in the base CSV
- the `spec.replaces` field in the base CSV

`make bundle` should then be run to propagate the version bump
to the rest of the repo.

Document all that.

While here set the tag for the metrics-server container that was
recently added.

Signed-off-by: Greg Kurz <[email protected]>
(cherry picked from commit 1c33256)
Signed-off-by: Greg Kurz <[email protected]>
It is about time to bump for the upcoming release.

Fixes: https://issues.redhat.com/browse/KATA-3488

Signed-off-by: Greg Kurz <[email protected]>
(cherry picked from commit 4e8e2b0)
Signed-off-by: Greg Kurz <[email protected]>
@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 Nov 29, 2024
Copy link

openshift-ci bot commented Nov 29, 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

We need to update containers/image dependency to v5.22+
As the dependency comes from machine-config, this commit brings it to
the first version that depends on containers/image 5.22

Signed-off-by: Julien Ropé <[email protected]>
(cherry picked from commit 03bf057)
Signed-off-by: Greg Kurz <[email protected]>
@gkurz gkurz marked this pull request as ready for review November 29, 2024 19:30
@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 Nov 29, 2024
@openshift-ci openshift-ci bot requested review from bpradipt and cpmeadors November 29, 2024 19:31
@gkurz
Copy link
Member Author

gkurz commented Nov 30, 2024

/retest

Copy link

openshift-ci bot commented Nov 30, 2024

@gkurz: The following test 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/sandboxed-containers-operator-e2e daf5e6d 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.

Copy link
Member

@beraldoleal beraldoleal 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

Copy link
Contributor

@littlejawa littlejawa 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 @gkurz !

@gkurz
Copy link
Member Author

gkurz commented Dec 2, 2024

CI is failing because 1.8.1 images aren't public yet.

@gkurz gkurz merged commit f86829d into openshift:release-1.8 Dec 2, 2024
3 of 4 checks passed
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.

4 participants