Bump CAPI to v1.7.0 #1193

damdo · 2024-03-27T10:42:44Z

What type of PR is this?
/kind feature

What this PR does / why we need it:

CAPI v1.7.0 is out now, so this PRs bumps the CAPI version used by CAPG to it.

Bumps CAPI to v1.7.x based on https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/book/src/developer/providers/migrations/v1.6-to-v1.7.md

Special notes for your reviewer:

Checklist:

squashed commits
adds or updates e2e tests

Release note:

Bump CAPI to v1.7.0

netlify · 2024-03-27T10:43:01Z

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

Name	Link
🔨 Latest commit	`73f98b0`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-gcp/deploys/661f68eb0b88b00008903761
😎 Deploy Preview	https://deploy-preview-1193--kubernetes-sigs-cluster-api-gcp.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.

damdo · 2024-03-27T10:43:15Z

/hold
It is a WIP for now

damdo · 2024-04-11T08:09:16Z

@cpanato do you know what could be causing this failure? https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1193/pull-cluster-api-provider-gcp-e2e-test/1778061302942404608

Which seems to be hitting: https://github.com/kubernetes-sigs/cluster-api/blob/4bfc838762ff79153f29a7059865867f20f19e00/cmd/clusterctl/client/repository/repository_versions.go#L127-L134

Is it because clusterctl init in this case doesn't correctly load pre-releases (e.g. beta, release.candidates etc.) ?

Thanks!

cpanato

update the metadata.yaml in root as well

Makefile

cpanato · 2024-04-11T08:18:53Z

@cpanato do you know what could be causing this failure? https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1193/pull-cluster-api-provider-gcp-e2e-test/1778061302942404608

Which seems to be hitting: https://github.com/kubernetes-sigs/cluster-api/blob/4bfc838762ff79153f29a7059865867f20f19e00/cmd/clusterctl/client/repository/repository_versions.go#L127-L134

Is it because clusterctl init in this case doesn't correctly load pre-releases (e.g. beta, release.candidates etc.) ?

Thanks!

update the metadata.yaml in the root as well

metadata.yaml

damdo · 2024-04-11T09:17:32Z

/test pull-cluster-api-provider-gcp-e2e-test

damdo · 2024-04-11T10:24:26Z

/hold
Until CAPI 1.7 is GA.

capi 1.7.x: bump tools files capi 1.7.x: bump test environment capi 1.7.x: run make generate capi 1.7.x: bump go modules capi 1.7.x: fix linting capi 1.7.x: update metadata.yaml capi 1.7.x: change k8s image version use capi v1.7.0-rc.0 use capi v1.7.0-rc.1 bump patch version of golangci-lint use v1.7.99 as next version

damdo · 2024-04-17T06:18:49Z

/test pull-cluster-api-provider-gcp-capi-e2e pull-cluster-api-provider-gcp-conformance

damdo · 2024-04-17T06:24:58Z

/assign @cpanato @richardcase @nrb @dims

neolit123

/approve
/remove-kind support
/kind feature

k8s-ci-robot · 2024-04-17T08:25:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo, neolit123

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~~ [neolit123]

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

richardcase · 2024-04-17T16:27:57Z

Tiltfile

@@ -18,9 +18,9 @@ settings = {
    "deploy_cert_manager": True,
    "preload_images_for_kind": True,
    "kind_cluster_name": "capg",
-    "capi_version": "v1.6.2",
+    "capi_version": "v1.7.0",
    "cert_manager_version": "v1.11.0",


We could probably update the cert-manager to be in-line with the version automatically installed via clusterctl. But that can be a different PR.

Will open a separate one for this.

Done here: #1210

richardcase · 2024-04-17T16:30:05Z

/lgtm

damdo · 2024-04-17T16:40:34Z

Thanks Richard
/unhold

cpanato · 2024-04-18T07:45:19Z

@damdo @richardcase did we ran conformance tests for this pr?

damdo · 2024-04-18T07:57:57Z

@cpanato yes we did: https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1193/pull-cluster-api-provider-gcp-conformance/1780481030948392960

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/support Categorizes issue or PR as a support question. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 27, 2024

damdo changed the title ~~chore: bump CAPI to v1.7.x~~ WIP: chore: bump CAPI to v1.7.x Mar 27, 2024

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 27, 2024

k8s-ci-robot requested review from dims and richardcase March 27, 2024 10:43

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 27, 2024

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 27, 2024

damdo force-pushed the capi-1.7.0 branch 2 times, most recently from b19db66 to c23f0ba Compare March 27, 2024 15:20

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 2, 2024

damdo force-pushed the capi-1.7.0 branch from f55cb7a to d2e01a1 Compare April 4, 2024 10:47

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 4, 2024

damdo force-pushed the capi-1.7.0 branch from d2e01a1 to 7e35c25 Compare April 10, 2024 09:07

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 10, 2024

damdo force-pushed the capi-1.7.0 branch from d651b1c to 168e859 Compare April 10, 2024 14:03

cpanato requested changes Apr 11, 2024

View reviewed changes

Makefile Outdated Show resolved Hide resolved

k8s-ci-robot assigned cpanato Apr 11, 2024

damdo commented Apr 11, 2024

View reviewed changes

metadata.yaml Show resolved Hide resolved

damdo force-pushed the capi-1.7.0 branch from a424bbc to 73f98b0 Compare April 17, 2024 06:15

damdo changed the title ~~WIP: chore: bump CAPI to v1.7.x~~ Bump CAPI to v1.7.0 Apr 17, 2024

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 17, 2024

damdo requested a review from cpanato April 17, 2024 06:20

k8s-ci-robot assigned dims, nrb and richardcase Apr 17, 2024

neolit123 reviewed Apr 17, 2024

View reviewed changes

k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. and removed kind/support Categorizes issue or PR as a support question. labels Apr 17, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 17, 2024

richardcase reviewed Apr 17, 2024

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 17, 2024

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 17, 2024

k8s-ci-robot merged commit 3157d84 into kubernetes-sigs:main Apr 17, 2024
24 checks passed

k8s-ci-robot added this to the v1.1.0 milestone Apr 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump CAPI to v1.7.0 #1193

Bump CAPI to v1.7.0 #1193

damdo commented Mar 27, 2024 •

edited

Loading

netlify bot commented Mar 27, 2024 •

edited

Loading

damdo commented Mar 27, 2024

damdo commented Apr 11, 2024

cpanato left a comment

cpanato commented Apr 11, 2024

damdo commented Apr 11, 2024

damdo commented Apr 11, 2024

damdo commented Apr 17, 2024

damdo commented Apr 17, 2024

neolit123 left a comment

k8s-ci-robot commented Apr 17, 2024

richardcase Apr 17, 2024

damdo Apr 17, 2024

damdo Apr 18, 2024

richardcase commented Apr 17, 2024

damdo commented Apr 17, 2024

cpanato commented Apr 18, 2024

damdo commented Apr 18, 2024

Bump CAPI to v1.7.0 #1193

Bump CAPI to v1.7.0 #1193

Conversation

damdo commented Mar 27, 2024 • edited Loading

netlify bot commented Mar 27, 2024 • edited Loading

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

damdo commented Mar 27, 2024

damdo commented Apr 11, 2024

cpanato left a comment

Choose a reason for hiding this comment

cpanato commented Apr 11, 2024

damdo commented Apr 11, 2024

damdo commented Apr 11, 2024

damdo commented Apr 17, 2024

damdo commented Apr 17, 2024

neolit123 left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Apr 17, 2024

richardcase Apr 17, 2024

Choose a reason for hiding this comment

damdo Apr 17, 2024

Choose a reason for hiding this comment

damdo Apr 18, 2024

Choose a reason for hiding this comment

richardcase commented Apr 17, 2024

damdo commented Apr 17, 2024

cpanato commented Apr 18, 2024

damdo commented Apr 18, 2024

damdo commented Mar 27, 2024 •

edited

Loading

netlify bot commented Mar 27, 2024 •

edited

Loading