Skip to content

Conversation

justinsb
Copy link
Contributor

  • chore: bump CAPI dependencies to 1.11.0
  • chore: replace imports for CAPI 1.11
  • chore: inline v1beta1 helper utils to enable upgrade

@k8s-ci-robot
Copy link
Contributor

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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 added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Aug 23, 2025
Copy link

netlify bot commented Aug 23, 2025

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

Name Link
🔨 Latest commit 459eab7
🔍 Latest deploy log https://app.netlify.com/projects/kubernetes-sigs-cluster-api-gcp/deploys/68ac6c48791c4f00087f296f
😎 Deploy Preview https://deploy-preview-1509--kubernetes-sigs-cluster-api-gcp.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
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 23, 2025
@justinsb
Copy link
Contributor Author

We discussed this in CAPI office hours this week. It's a big process https://cluster-api.sigs.k8s.io/developer/providers/migrations/v1.10-to-v1.11, but we should be able to start gradually by just bumping the dependency and sticking with v1beta1. A "real" integration will start using v1beta2 upstream, and then bump our own types to v1beta2 (the big change is status.conditions, I believe)

Have we documented our branching strategy anywhere? I would imagine that the release-1.10 branch maps to CAPI 1.10, and we cherry-pick fixes for 1.10 to that branch. If we don't have a doc, I'm happy to send a PR

@justinsb justinsb force-pushed the bump_capi_version_to_0_11 branch from 050fd9a to ed6b043 Compare August 23, 2025 15:23
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 23, 2025
@k8s-ci-robot k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Aug 25, 2025
@justinsb justinsb force-pushed the bump_capi_version_to_0_11 branch from 4bb63a7 to 459eab7 Compare August 25, 2025 13:59
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Aug 25, 2025
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Aug 25, 2025

@justinsb: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-gcp-test 459eab7 link true /test pull-cluster-api-provider-gcp-test
pull-cluster-api-provider-gcp-e2e-test 459eab7 link true /test pull-cluster-api-provider-gcp-e2e-test

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@salasberryfin
Copy link
Contributor

Thanks @justinsb.

Looks like this bump also requires a number of changes to remove deprecated functions. Let me know if I can help collaborating on this PR.

@cpanato
Copy link
Member

cpanato commented Aug 27, 2025

there are a few issues

./gke.go:117:19: cannot use framework.DiscoveryAndWaitForCluster(ctx, framework.DiscoveryAndWaitForClusterInput{…}, input.WaitForClusterIntervals...) (value of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in assignment
./gke.go:127:24: cannot use framework.DiscoveryAndWaitForMachinePools(ctx, framework.DiscoveryAndWaitForMachinePoolsInput{…}, input.WaitForMachinePools...) (value of type []*"sigs.k8s.io/cluster-api/api/core/v1beta2".MachinePool) as []*"sigs.k8s.io/cluster-api/api/core/v1beta1".MachinePool value in assignment
./gke.go:130:12: cannot use result.Cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster value in struct literal
./conformance_test.go:83:26: cannot use result.Cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in struct literal
./e2e_gke_test.go:128:32: cannot use result.Cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster value in struct literal
./e2e_gke_test.go:130:32: cannot use result.MachinePools (variable of type []*"sigs.k8s.io/cluster-api/api/core/v1beta1".MachinePool) as []*"sigs.k8s.io/cluster-api/api/core/v1beta2".MachinePool value in struct literal
./e2e_gke_test.go:137:32: cannot use result.Cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster value in struct literal
./e2e_gke_test.go:139:32: cannot use result.MachinePools (variable of type []*"sigs.k8s.io/cluster-api/api/core/v1beta1".MachinePool) as []*"sigs.k8s.io/cluster-api/api/core/v1beta2".MachinePool value in struct literal
./e2e_test.go:70:26: cannot use result.Cluster (variable of type *"sigs.k8s.io/cluster-api/api/core/v1beta2".Cluster) as *"sigs.k8s.io/cluster-api/api/core/v1beta1".Cluster value in struct literal

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. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants