Support secondary ranges for GCPManagedControlPlane #1390

cecilkootz · 2025-01-08T22:38:44Z

What type of PR is this?
/kind feature

What this PR does / why we need it:
Allow passing the Pod.CidrBlock and Service.CidrBlock to GCPManagedControlPlane instances.

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

Special notes for your reviewer:

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

TODOs:

squashed commits
includes documentation
adds unit tests

Release note:

Fix a bug to support `secondyCidrBlocks` for GCPManagedControlPlane instances.

linux-foundation-easycla · 2025-01-08T22:38:50Z

The committers listed above are authorized under a signed CLA.

✅ login: dependabot[bot] (a8b272f, b29e691, b0a981c, ff4f878, ffab028, 5e981e4, dd3b1cd, 2035636, b5e5df2, 468f93c, 26c0699, 53b3369)
✅ login: damdo / name: Damiano Donati (3867377, 82b1cc6, ac036d5, b2497bc)
✅ login: darkweaver87 / name: Rémi BUISSON (1bf3904)
✅ login: cecilkootz / name: Matt (890675f, 2c17471)
✅ login: salasberryfin / name: Carlos Salas (ff7d589, 642e335, a29d8a7, 9fe5573, a3cdbfc, 9871a1a, ec6ee05)
✅ login: cpanato / name: Carlos Tadeu Panato Junior (1bb739a, 9754762, 2e2be67, 22382d6, fd16710)
✅ login: justinsb / name: Justin Santa Barbara (fd2281c, e39d37e)
✅ login: bgartzi / name: Beñat Gartzia (55c03bd, 574b30d, bf5279f)
✅ login: hrbasic / name: Hrvoje Basic (752b97d)
✅ login: richardcase / name: Richard Case (9d2481f)
✅ login: barbacbd / name: Brent Barbachem (2f9c55c, 5c4b0b1)

k8s-ci-robot · 2025-01-08T22:38:54Z

Hi @cecilkootz. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

netlify · 2025-01-08T22:39:01Z

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

Name	Link
🔨 Latest commit	`2c17471`
🔍 Latest deploy log	https://app.netlify.com/projects/kubernetes-sigs-cluster-api-gcp/deploys/68290b8e7919b50008499ac5
😎 Deploy Preview	https://deploy-preview-1390--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 project configuration.

salasberryfin · 2025-01-13T09:42:28Z

Thanks @cecilkootz

/ok-to-test

salasberryfin · 2025-01-13T14:17:25Z

/lgtm

salasberryfin · 2025-05-06T13:26:22Z

@cecilkootz would you be able to rebase this?

salasberryfin · 2025-05-16T09:29:43Z

Hey @cecilkootz, would you be able to take a look at this?

cecilkootz · 2025-05-16T16:15:34Z

Hey @cecilkootz, would you be able to take a look at this?

I will update this change tonight.

Bumps golang from `b274ff1` to `0ca97f4`. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps the all group with 2 updates in the / directory: [gaurav-nelson/github-action-markdown-link-check](https://github.com/gaurav-nelson/github-action-markdown-link-check) and [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action). Updates `gaurav-nelson/github-action-markdown-link-check` from 1.0.15 to 1.0.16 - [Release notes](https://github.com/gaurav-nelson/github-action-markdown-link-check/releases) - [Commits](gaurav-nelson/github-action-markdown-link-check@d53a906...1b916f2) Updates `golangci/golangci-lint-action` from 6.1.1 to 6.2.0 - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@971e284...ec5d184) --- updated-dependencies: - dependency-name: gaurav-nelson/github-action-markdown-link-check dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: cpanato <[email protected]>

Bumps the all group with 1 update: [actions/setup-go](https://github.com/actions/setup-go). Updates `actions/setup-go` from 5.2.0 to 5.3.0 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@3041bf5...f111f33) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps golang from `9243159` to `d5b17d6`. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: Carlos Salas <[email protected]>

Bumps the all group with 1 update: [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action). Updates `golangci/golangci-lint-action` from 6.5.0 to 6.5.1 - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@2226d7c...4696ba8) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: Carlos Salas <[email protected]>

The tiltfile was broken (trying to write process.txt). Sync up with the values in the (main) cluster-api tiltfile.

Bumps the all group with 1 update: [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action). Updates `golangci/golangci-lint-action` from 6.5.1 to 6.5.2 - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@4696ba8...55c2c14) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps the all group with 1 update: [actions/setup-go](https://github.com/actions/setup-go). Updates `actions/setup-go` from 5.3.0 to 5.4.0 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@f111f33...0aaccfd) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: Carlos Salas <[email protected]>

Move damdo and salasberryfin from reviewe to maintainer. Also update the CAPI maintainers/admins. Removed "sig-gcp lead" as they haven't been active on GitHub since 2017. Signed-off-by: Richard Case <[email protected]> stuff Signed-off-by: Richard Case <[email protected]>

Bumps the all group with 1 update: [gaurav-nelson/github-action-markdown-link-check](https://github.com/gaurav-nelson/github-action-markdown-link-check). Updates `gaurav-nelson/github-action-markdown-link-check` from 1.0.16 to 1.0.17 - [Release notes](https://github.com/gaurav-nelson/github-action-markdown-link-check/releases) - [Commits](gaurav-nelson/github-action-markdown-link-check@1b916f2...3c3b66f) --- updated-dependencies: - dependency-name: gaurav-nelson/github-action-markdown-link-check dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps the all group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) | `1.31.1` | `1.34.0` | | [github.com/google/go-cmp](https://github.com/google/go-cmp) | `0.6.0` | `0.7.0` | | [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.22.2` | `2.23.0` | | [github.com/spf13/pflag](https://github.com/spf13/pflag) | `1.0.5` | `1.0.6` | | [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) | `1.9.4` | `1.9.5` | Updates `cloud.google.com/go/compute` from 1.31.1 to 1.34.0 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/documentai/CHANGES.md) - [Commits](googleapis/google-cloud-go@compute/v1.31.1...pubsub/v1.34.0) Updates `cloud.google.com/go/container` from 1.42.0 to 1.42.1 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](googleapis/google-cloud-go@pubsub/v1.42.0...container/v1.42.1) Updates `cloud.google.com/go/iam` from 1.2.2 to 1.3.1 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](googleapis/google-cloud-go@iam/v1.2.2...run/v1.3.1) Updates `cloud.google.com/go/resourcemanager` from 1.10.2 to 1.10.3 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](googleapis/google-cloud-go@dlp/v1.10.2...dlp/v1.10.3) Updates `github.com/google/go-cmp` from 0.6.0 to 0.7.0 - [Release notes](https://github.com/google/go-cmp/releases) - [Commits](google/go-cmp@v0.6.0...v0.7.0) Updates `github.com/googleapis/gax-go/v2` from 2.14.0 to 2.14.1 - [Release notes](https://github.com/googleapis/gax-go/releases) - [Commits](googleapis/gax-go@v2.14.0...v2.14.1) Updates `github.com/onsi/ginkgo/v2` from 2.22.2 to 2.23.0 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.22.2...v2.23.0) Updates `github.com/spf13/pflag` from 1.0.5 to 1.0.6 - [Release notes](https://github.com/spf13/pflag/releases) - [Commits](spf13/pflag@v1.0.5...v1.0.6) Updates `golang.org/x/crypto` from 0.32.0 to 0.33.0 - [Commits](golang/crypto@v0.32.0...v0.33.0) Updates `golang.org/x/mod` from 0.22.0 to 0.23.0 - [Commits](golang/mod@v0.22.0...v0.23.0) Updates `golang.org/x/net` from 0.34.0 to 0.35.0 - [Commits](golang/net@v0.34.0...v0.35.0) Updates `google.golang.org/api` from 0.214.0 to 0.222.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](googleapis/google-api-go-client@v0.214.0...v0.222.0) Updates `google.golang.org/grpc` from 1.67.3 to 1.70.0 - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.67.3...v1.70.0) Updates `sigs.k8s.io/cluster-api` from 1.9.4 to 1.9.5 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.4...v1.9.5) --- updated-dependencies: - dependency-name: cloud.google.com/go/compute dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: cloud.google.com/go/container dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: cloud.google.com/go/iam dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: cloud.google.com/go/resourcemanager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/google/go-cmp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: github.com/googleapis/gax-go/v2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: github.com/spf13/pflag dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: sigs.k8s.io/cluster-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: cpanato <[email protected]>

Signed-off-by: Carlos Salas <[email protected]>

k8s-ci-robot · 2025-05-17T22:18:01Z

New changes are detected. LGTM label has been removed.

k8s-ci-robot · 2025-05-17T22:18:04Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: cecilkootz
Once this PR has been reviewed and has the lgtm label, please ask for approval from salasberryfin. For more information see the Code Review Process.

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

Needs approval from an approver in each of these files:

OWNERS

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 · 2025-05-17T22:19:59Z

Keywords which can automatically close issues and at(@) or hashtag(#) mentions are not allowed in commit messages.

The list of commits with invalid commit messages:

9871a1a chore: cherry pick dependabot bumps and fix linting issues (chore: cherry pick dependabot bumps and fix linting issues #1416)

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.

damdo · 2025-05-28T08:35:31Z

Superseded by #1480

Secondary range testing

890675f

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. labels Jan 8, 2025

k8s-ci-robot requested review from richardcase and salasberryfin January 8, 2025 22:38

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 8, 2025

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 8, 2025

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jan 8, 2025

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 13, 2025

k8s-ci-robot assigned salasberryfin Jan 13, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 13, 2025

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

darkweaver87 and others added 7 commits May 17, 2025 18:16

feat: support setting loggingService and monitoringService

1bf3904

chore(deps): bump golang from b274ff1 to 0ca97f4

dd3b1cd

Bumps golang from `b274ff1` to `0ca97f4`. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

update golangci-lint to v1.63.x

1bb739a

Signed-off-by: cpanato <[email protected]>

bump go to 1.22.11

9754762

Signed-off-by: cpanato <[email protected]>

chore(deps): bump golang from 9243159 to d5b17d6

b29e691

Bumps golang from `9243159` to `d5b17d6`. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

salasberryfin and others added 16 commits May 17, 2025 18:16

feat: align managed cp spec and status with latest core capi

a3cdbfc

Signed-off-by: Carlos Salas <[email protected]>

fix: panic on gke cluster creation

ff7d589

Signed-off-by: Carlos Salas <[email protected]>

chore: update tiltfile for immutable images

fd2281c

The tiltfile was broken (trying to write process.txt). Sync up with the values in the (main) cluster-api tiltfile.

fix: panic on gke cluster deletion

9fe5573

Signed-off-by: Carlos Salas <[email protected]>

cloudbuild: bump gcb image to get go 1.23

82b1cc6

drop docker config from dependabot

fd16710

Signed-off-by: cpanato <[email protected]>

update go

22382d6

Signed-off-by: cpanato <[email protected]>

fix: make sure machine pools are deleted before gke cluster

ec6ee05

Signed-off-by: Carlos Salas <[email protected]>

fix: capi-e2e test flavor reference

ac036d5

option to enable global access for internal passthrough load balancer

752b97d

k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels May 17, 2025

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 17, 2025

Merge branch 'kubernetes-sigs:main' into mwelch/secondary-ranges

2c17471

k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 17, 2025

cecilkootz closed this May 27, 2025

damdo mentioned this pull request May 28, 2025

Secondary ranges for GCPManagedControlPlane #1480

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Support secondary ranges for GCPManagedControlPlane #1390

Support secondary ranges for GCPManagedControlPlane #1390

Uh oh!

cecilkootz commented Jan 8, 2025

Uh oh!

linux-foundation-easycla bot commented Jan 8, 2025 •

edited

Loading

Uh oh!

k8s-ci-robot commented Jan 8, 2025

Uh oh!

netlify bot commented Jan 8, 2025 •

edited

Loading

Uh oh!

salasberryfin commented Jan 13, 2025

Uh oh!

salasberryfin commented Jan 13, 2025

Uh oh!

salasberryfin commented May 6, 2025

Uh oh!

salasberryfin commented May 16, 2025

Uh oh!

cecilkootz commented May 16, 2025

Uh oh!

k8s-ci-robot commented May 17, 2025

Uh oh!

k8s-ci-robot commented May 17, 2025

Uh oh!

k8s-ci-robot commented May 17, 2025

Uh oh!

damdo commented May 28, 2025

Uh oh!

Uh oh!

Support secondary ranges for GCPManagedControlPlane #1390

Support secondary ranges for GCPManagedControlPlane #1390

Uh oh!

Conversation

cecilkootz commented Jan 8, 2025

Uh oh!

linux-foundation-easycla bot commented Jan 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Jan 8, 2025

Uh oh!

netlify bot commented Jan 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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

Uh oh!

salasberryfin commented Jan 13, 2025

Uh oh!

salasberryfin commented Jan 13, 2025

Uh oh!

salasberryfin commented May 6, 2025

Uh oh!

salasberryfin commented May 16, 2025

Uh oh!

cecilkootz commented May 16, 2025

Uh oh!

k8s-ci-robot commented May 17, 2025

Uh oh!

k8s-ci-robot commented May 17, 2025

Uh oh!

k8s-ci-robot commented May 17, 2025

Uh oh!

damdo commented May 28, 2025

Uh oh!

Uh oh!

linux-foundation-easycla bot commented Jan 8, 2025 •

edited

Loading

netlify bot commented Jan 8, 2025 •

edited

Loading