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.

Sign up for GitHub

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

Jump to bottom

🌱 Bump CAPI to v1.8.1 #2154

Merged

k8s-ci-robot merged 5 commits into kubernetes-sigs:main from shiftstack:new-capi

Sep 4, 2024

Contributor

EmilienM commented Aug 14, 2024 •

edited

Loading

What this PR does / why we need it:

update CAPI to 1.8.1
update codegen && run make generate
manager: stop using deprecated options for diagnostics
remove TLS options, they're in CAPI now

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 #2144

Co-Authored-By: @mdbooth

k8s-ci-robot added cncf-cla: yes needs-rebase labels

k8s-ci-robot requested review from jichenjc and mdbooth

August 14, 2024 00:48

k8s-ci-robot added the size/XL label

netlify bot commented Aug 14, 2024 •

edited

Loading

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

Name	Link
🔨 Latest commit	`a79cce9`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/66d84891e72168000823a948
😎 Deploy Preview	https://deploy-preview-2154--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

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

EmilienM force-pushed the new-capi branch from 6c85614 to b98402c Compare

August 14, 2024 00:51

k8s-ci-robot removed the needs-rebase label

Contributor Author

EmilienM commented Aug 14, 2024

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

Contributor

jichenjc commented Aug 14, 2024

changes ok so only need fix those test errors

../kube-openapi@v0.0.0-20240228011516-70dd3763d340/pkg/common/common.go:23:2: missing go.sum entry for module providing package github.com/emicklei/go-restful/v3 (imported by k8s.io/kube-openapi/pkg/common); to add:

EmilienM force-pushed the new-capi branch from b98402c to 3ba8310 Compare

August 14, 2024 12:38

EmilienM changed the title ~~🌱 Bump CAPI to v1.8.0~~ 🌱 Bump CAPI to v1.8.1

EmilienM force-pushed the new-capi branch 2 times, most recently from bbce98e to 75465d5 Compare

August 14, 2024 15:34

Contributor Author

EmilienM commented Aug 14, 2024

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

EmilienM force-pushed the new-capi branch from 75465d5 to 364dbd5 Compare

August 14, 2024 16:52

Contributor Author

EmilienM commented Aug 14, 2024

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

EmilienM force-pushed the new-capi branch from 364dbd5 to d96da7f Compare

August 15, 2024 19:46

Contributor Author

EmilienM commented Aug 15, 2024

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

k8s-ci-robot added size/XXL and removed size/XL labels

Contributor Author

EmilienM commented Aug 16, 2024

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

EmilienM force-pushed the new-capi branch from cfdd3cb to 32bb18d Compare

August 16, 2024 01:25

Contributor Author

EmilienM commented Aug 16, 2024

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

Contributor Author

EmilienM commented Aug 16, 2024

@mdbooth ready for review, but with your PTO you might not have time to review it today. I guess this can wait.

k8s-ci-robot added the needs-rebase label

EmilienM force-pushed the new-capi branch from 32bb18d to f43e74c Compare

August 20, 2024 13:11

k8s-ci-robot removed the needs-rebase label

Contributor Author

EmilienM commented Aug 20, 2024

@pierreprinetti hey, I had to rebase this one today. I could use an extra pair of eyes in case I rebased something wrong.
Thanks

EmilienM force-pushed the new-capi branch from f43e74c to 0219228 Compare

August 20, 2024 13:27

EmilienM force-pushed the new-capi branch from 0219228 to 0ced73f Compare

August 20, 2024 14:39

Contributor Author

EmilienM commented Aug 20, 2024

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

Contributor Author

EmilienM commented Aug 20, 2024

This is ready to go but it won't pass the upgrade tests until we got #2156 merged.
I suggest we wait a bit before merging this one to ensure that the bump doesn't break upgrades 😓

EmilienM added 4 commits

August 30, 2024 11:22


          Bump CAPI to v1.8.1

aa65d0f


          Exclude tiltbuild from boilerplate.py

010ddad


          manager: remove TLS options

44604b1

They are in CAPI now, we import them.


          Bump orc deps

b3b320e

EmilienM force-pushed the new-capi branch from 55ef158 to b3b320e Compare

August 30, 2024 15:22

Contributor Author

EmilienM commented Aug 30, 2024

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

1 similar comment

Contributor

jichenjc commented Aug 31, 2024

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

Contributor

mdbooth commented Sep 3, 2024

Pretty sure the error is here:

[FAILED] Invalid argument. input.InitWithKubernetesVersion can't be empty when calling clusterctl-upgrade spec
Expected
    <string>: 
not to be empty

Guessing this is either new, or wasn't previously checked.

Contributor Author

EmilienM commented Sep 3, 2024

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

EmilienM force-pushed the new-capi branch from f01a2c7 to 04de217 Compare

September 3, 2024 19:15

Contributor Author

EmilienM commented Sep 3, 2024

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

1 similar comment

Contributor

jichenjc commented Sep 4, 2024

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

Contributor

mdbooth commented Sep 4, 2024 •

edited

Loading

I think we've been caught out by kubernetes-sigs/cluster-api#10609. Before this change the test was implicity using the value of INIT_WITH_KUBERNETES_VERSION in e2e_conf.yaml. This is 1.30.1. ~~It doesn't look like KUBERNETES_VERSION_UPGRADE_{FROM,TO} were in use.~~

Incidentally this change landed in CAPI v1.8.0, so I suspect we didn't run this test before landing that bump 😬

Edit: KUBERNETES_VERSION_UPGRADE_{FROM,TO} are still directly used by the CAPI tests.

Contributor

mdbooth commented Sep 4, 2024

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

Contributor

mdbooth commented Sep 4, 2024

@EmilienM We'll want to do some squashing on this PR before merging. Maybe not all the commits, but we should squash as many commits as it ends up taking to fix the upgrade test.


          clusterctl: add InitWithKubernetesVersion to `ClusterctlUpgradeSpec…

a79cce9

…Input`

As we are only interested in testing a CAPO upgrade, this should stay in
sync with the k8s version used in other tests.

EmilienM force-pushed the new-capi branch from f84fce1 to a79cce9 Compare

September 4, 2024 11:46

Contributor Author

EmilienM commented Sep 4, 2024

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

Contributor

mdbooth commented Sep 4, 2024

/lgtm

@EmilienM Suggest you self-approve this.

k8s-ci-robot assigned mdbooth

k8s-ci-robot added the lgtm label

Contributor Author

EmilienM commented Sep 4, 2024

/approve

Contributor

k8s-ci-robot commented Sep 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM

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:

~~OWNERS~~ [EmilienM]

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

k8s-ci-robot added the approved label

k8s-ci-robot merged commit a84b1b4 into kubernetes-sigs:main

10 checks passed

EmilienM deleted the new-capi branch

September 4, 2024 13:02

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved cncf-cla: yes lgtm size/XXL