Skip to content

🌱 Bump e2e k8s versions and update templates #2600

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

Merged
merged 1 commit into from
Jun 23, 2025

Conversation

lentzi90
Copy link
Contributor

@lentzi90 lentzi90 commented Jun 18, 2025

What this PR does / why we need it:

Normal tests run with kubernetes v1.33.1. Upgrades are going from v1.32.5 to v1.33.1.
Templates needed to be updated for v1.32 as the API server has dropped the cloud-provider flag.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

  1. Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

  • squashed commits
  • if necessary:
    • includes documentation
    • adds unit tests

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 18, 2025
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 18, 2025
Copy link

netlify bot commented Jun 18, 2025

Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name Link
🔨 Latest commit 3f2f020
🔍 Latest deploy log https://app.netlify.com/projects/kubernetes-sigs-cluster-api-openstack/deploys/6858e739ef63db000872109a
😎 Deploy Preview https://deploy-preview-2600--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@k8s-ci-robot k8s-ci-robot requested review from EmilienM and mdbooth June 18, 2025 10:30
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 18, 2025
@lentzi90
Copy link
Contributor Author

/test pull-cluster-api-provider-openstack-e2e-full-test

@lentzi90 lentzi90 force-pushed the lentzi90/e2e-k8s-version branch from e6dc242 to fc63dee Compare June 18, 2025 11:49
@k8s-ci-robot k8s-ci-robot removed the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 18, 2025
@lentzi90
Copy link
Contributor Author

/test pull-cluster-api-provider-openstack-e2e-full-test

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 18, 2025
@lentzi90 lentzi90 changed the title 🌱 E2E: Bump e2e k8s versions 🌱 Bump e2e k8s versions and update templates Jun 18, 2025
@lentzi90
Copy link
Contributor Author

@tormath1 can you help shed some light on this?
I think the issue is that this URL is no longer correct:

url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION%.*}.conf

curl -L https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-v1.33.conf
Not Found

I can also see that the sysext bakery releases are a bit different now. Is it so that we could use something like this instead?

https://github.com/flatcar/sysext-bakery/releases/download/kubernetes/kubernetes-v1.33.conf

@tormath1
Copy link
Contributor

Hey @lentzi90 that is correct, with the increasing number of folks using sysext-bakery + the increasing number of sysext images, we enhanced a bit the way we provide system extensions.

There is now a documentation page for each sysext (e.g Kubernetes: https://flatcar.github.io/sysext-bakery/kubernetes/) and the "correct" links would now be:

  • sysext update configuration: https://extensions.flatcar.org/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION%.*}.conf
  • sysext image itself: https://extensions.flatcar.org/extensions/kubernetes-${KUBERNETES_VERSION}-x86-64.raw

Legacy links was still working for existing system but not for newer releases (e.g Kubernetes 1.33). Sorry for the turbulence here :)

@lentzi90
Copy link
Contributor Author

Awesome, thanks! 🙂
I'll update our templates to use the correct URL here also

@lentzi90 lentzi90 force-pushed the lentzi90/e2e-k8s-version branch from fc63dee to eee4325 Compare June 19, 2025 08:47
@lentzi90
Copy link
Contributor Author

/test pull-cluster-api-provider-openstack-e2e-full-test

@lentzi90 lentzi90 force-pushed the lentzi90/e2e-k8s-version branch from eee4325 to 3badfda Compare June 19, 2025 08:58
@lentzi90
Copy link
Contributor Author

/test pull-cluster-api-provider-openstack-e2e-full-test

@lentzi90 lentzi90 force-pushed the lentzi90/e2e-k8s-version branch from 3badfda to 9021477 Compare June 23, 2025 05:32
Normal tests run with kubernetes v1.33.1. Upgrades are going from
v1.32.5 to v1.33.1. Templates needed to be updated for v1.32 as the API
server has dropped the cloud-provider flag. Sysext-bakery URLs also
updated.

Signed-off-by: Lennart Jern <[email protected]>
@lentzi90 lentzi90 force-pushed the lentzi90/e2e-k8s-version branch from 9021477 to 3f2f020 Compare June 23, 2025 05:33
@lentzi90
Copy link
Contributor Author

/test pull-cluster-api-provider-openstack-e2e-full-test

@lentzi90
Copy link
Contributor Author

Alright I think we are good to go!
/approve
/hold cancel
/cc @mdbooth

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jun 23, 2025
Copy link
Contributor

@mdbooth mdbooth 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! Suspect this is worth inclusion in a stable release?

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 23, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lentzi90, mdbooth

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@lentzi90
Copy link
Contributor Author

That is a good point! I'll try to backport to get the updated templates on the release branches
/cherry-pick release-0.12 release-0.11

@k8s-infra-cherrypick-robot

@lentzi90: once the present PR merges, I will cherry-pick it on top of release-0.12 in a new PR and assign it to you.

In response to this:

That is a good point! I'll try to backport to get the updated templates on the release branches
/cherry-pick release-0.12 release-0.11

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.

@k8s-ci-robot k8s-ci-robot merged commit b4112f7 into kubernetes-sigs:main Jun 23, 2025
10 checks passed
@github-project-automation github-project-automation bot moved this from Inbox to Done in CAPO Roadmap Jun 23, 2025
@k8s-infra-cherrypick-robot

@lentzi90: #2600 failed to apply on top of branch "release-0.12":

Applying: Bump e2e k8s versions and update templates
Using index info to reconstruct a base tree...
M	test/e2e/data/e2e_conf.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/data/e2e_conf.yaml
CONFLICT (content): Merge conflict in test/e2e/data/e2e_conf.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump e2e k8s versions and update templates

In response to this:

That is a good point! I'll try to backport to get the updated templates on the release branches
/cherry-pick release-0.12 release-0.11

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.

@lentzi90 lentzi90 deleted the lentzi90/e2e-k8s-version branch June 23, 2025 10:09
@lentzi90 lentzi90 mentioned this pull request Jun 23, 2025
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants