Skip to content

OCPCLOUD-3094: Merge https://github.com/kubernetes/cloud-provider-gcp:master (4bc9861) into main#85

Closed
cloud-team-rebase-bot[bot] wants to merge 37 commits intoopenshift:mainfrom
openshift-cloud-team:rebase-bot-main
Closed

OCPCLOUD-3094: Merge https://github.com/kubernetes/cloud-provider-gcp:master (4bc9861) into main#85
cloud-team-rebase-bot[bot] wants to merge 37 commits intoopenshift:mainfrom
openshift-cloud-team:rebase-bot-main

Conversation

@cloud-team-rebase-bot
Copy link
Copy Markdown

@cloud-team-rebase-bot cloud-team-rebase-bot bot commented Aug 14, 2025

No description provided.

justinsb and others added 4 commits July 25, 2025 10:57
@justinsb
tests: fix linting problem
39617c3 
This is checked in newer versions of go
@08volt
Update TestGetLoadBalancer with finalizer check
9dbc59b 
The `GetLoadBalancer` function returns `found=true` with an empty status if the underlying forwarding rule is deleted but the Service object still contains a finalizer (`ILBFinalizerV1` or `NetLBFinalizerV1`). This indicates to the controller that resource cleanup is still in progress.

This commit updates `TestGetLoadBalancer` to verify this behavior. After the load balancer is deleted, the test now adds a finalizer to the service and asserts that `GetLoadBalancer` correctly returns `found=true`.
@mmamczur
Update k8s dependencies to 1.33.4.
afc63cc
@mmamczur
Merge pull request kubernetes#889 from mmamczur/deps_1.33.4
b272abd 
Update k8s dependencies to 1.33.4.
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 14, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Aug 14, 2025

Hi @cloud-team-rebase-bot[bot]. Thanks for your PR.

I'm waiting for a openshift 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.

Details

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.

@openshift-ci openshift-ci bot requested review from nrb and racheljpg August 14, 2025 12:54
08volt and others added 2 commits August 14, 2025 13:29
@08volt @FelipeYepez
Update TestGetLoadBalancer with finalizer check
8409f31 
The `GetLoadBalancer` function returns `found=true` with an empty status if the underlying forwarding rule is deleted but the Service object still contains a finalizer (`ILBFinalizerV1` or `NetLBFinalizerV1`). This indicates to the controller that resource cleanup is still in progress.

This commit updates `TestGetLoadBalancer` to verify this behavior. After the load balancer is deleted, the test now adds a finalizer to the service and asserts that `GetLoadBalancer` correctly returns `found=true`.
@k8s-ci-robot
Merge pull request kubernetes#892 from FelipeYepez/add-test-get-load-…
409c50f 
…balancer

Update TestGetLoadBalancer with finalizer check
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/cloud-provider-gcp:master (b272abd) into main Merge https://github.com/kubernetes/cloud-provider-gcp:master (409c50f) into main Aug 18, 2025
miyadav and others added 2 commits August 20, 2025 17:10
@miyadav
Adding SyncMutex as unit tests is failing when detecting race
29a1e91 
example - go test -count=1 -race -v $(go list ./...)
@k8s-ci-robot
Merge pull request kubernetes#894 from miyadav/unittestfix
945f9fa 
Adding SyncMutex as unit tests is failing when detecting race
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/cloud-provider-gcp:master (409c50f) into main Merge https://github.com/kubernetes/cloud-provider-gcp:master (945f9fa) into main Aug 21, 2025
@k8s-ci-robot
Merge pull request kubernetes#888 from 08volt/add-test-get-load-balancer
fabdda7 
TestGetLoadBalancer improvement: finalizer check logic in GetLoadBalancer
@k8s-ci-robot
Merge pull request kubernetes#884 from justinsb/fix_lint_problem_in_p…
6ff0ef7 
…rovider_tests

tests: fix linting problem
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/cloud-provider-gcp:master (945f9fa) into main Merge https://github.com/kubernetes/cloud-provider-gcp:master (6ff0ef7) into main Aug 25, 2025
@cloud-team-bot cloud-team-bot bot force-pushed the rebase-bot-main branch 2 times, most recently from f8d45cf to 4e89521 Compare August 28, 2025 12:49
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/cloud-provider-gcp:master (6ff0ef7) into main Merge https://github.com/kubernetes/cloud-provider-gcp:master (ec6f4ce) into main Sep 4, 2025
@08volt
feat(provider/gcp): Added the --enable-rbs-default-l4-netlb boolean f…
4c18268 
…lag to the CCM binary. (kubernetes#843)

When enabled, NetLB controller will consider RBS the default implementation for L4 NetLBs without a LoadBalancerClass specified, and it will not provision the service.
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/cloud-provider-gcp:master (ec6f4ce) into main Merge https://github.com/kubernetes/cloud-provider-gcp:master (4c18268) into main Sep 8, 2025
@cloud-team-bot cloud-team-bot bot force-pushed the rebase-bot-main branch 2 times, most recently from e76cac4 to ee74ba3 Compare September 11, 2025 12:51
@FelipeYepez
Update Kubernetes dependencies to v0.34.0
18cb5af 
This commit updates all k8s.io dependencies to version v0.34.0. This also updates the vendor directory and regenerates the Bazel BUILD files.
@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 27, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2025
@sunzhaohua2
Copy link
Copy Markdown

sunzhaohua2 commented Oct 28, 2025

build image with pr failed

@damdo
Copy link
Copy Markdown
Member

damdo commented Oct 30, 2025

/test images

@damdo damdo changed the title Merge https://github.com/kubernetes/cloud-provider-gcp:master (2e53900) into main OCPCLOUD-3094: Merge https://github.com/kubernetes/cloud-provider-gcp:master (2e53900) into main Oct 30, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 30, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 30, 2025 •
edited by openshift-ci bot
Loading

@cloud-team-rebase-bot[bot]: This pull request references OCPCLOUD-3094 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.21.0" version, but no target version was set.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@damdo
Copy link
Copy Markdown
Member

damdo commented Oct 30, 2025

I think there might be an implicit conflict in the code that makes compilation fail cc. @theobarberbany

@theobarberbany
Copy link
Copy Markdown

theobarberbany commented Oct 30, 2025

sigh rebasebot has auto accepted our patch and merged the conflicts that way. It means the LB patch will need manual picking.

Brace for this potentially taking a while @damdo

YifeiZhuang and others added 11 commits October 31, 2025 18:18
@YifeiZhuang
update dependencies to kubernetes 1.34.1
8849df0
@k8s-ci-robot
Merge pull request kubernetes#913 from YifeiZhuang/release-m
4bc9861 
update dependencies to kubernetes 1.34.1
merge upstream/master into main
6fc1879
@Fedosin
UPSTREAM: <carry>: Add files required for OpenShift
3296185
@theobarberbany
UPSTREAM: <carry>: Adds auth-provider-gcp .spec file and build script
b98f432 
This adds the .spec required for building auth-provider-gcp as an RPM

To keep naming consistent across credential provider specs, we use the
name gcr-credential-provider

It also includes build-rpms.sh, used to build the RPM in CI.
@JoelSpeed
UPSTREAM: <carry>: Resolve dynamic resource allocation unknown revision
4ba83ca
@theobarberbany
UPSTREAM: <carry>: Reuse instance-groups for internal load balancers
f82d04a 
This commit rewrites 49f5389.

Work around GCP internal load balancer restrictions for multi-subnet clusters.

GCP internal load balancers have specific restrictions that prevent
straightforward load balancing across multiple subnets:

1. "Don't put a VM in more than one load-balanced instance group"
2. Instance groups can "only select VMs that are in the same zone, VPC network, and subnet"
3. "All VMs in an instance group must have their primary network interface in the same VPC network"
4. Internal LBs can load balance to VMs in same region but different subnets

For clusters with nodes across multiple subnets, the previous implementation
would fail to create internal load balancers. This change implements a
two-pass approach:

1. Find existing external instance groups (matching externalInstanceGroupsPrefix)
   that contain ONLY cluster nodes and reuse them for the backend service
2. Create internal instance groups only for remaining nodes not covered by
   external groups

This ensures compliance with GCP restrictions while enabling multi-subnet
load balancing for Kubernetes clusters.

References:
- Internal LB docs: https://cloud.google.com/load-balancing/docs/internal
- Backend service restrictions: https://cloud.google.com/load-balancing/docs/backend-service#restrictions_and_guidance
- Instance group constraints: https://cloud.google.com/compute/docs/instance-groups/creating-groups-of-unmanaged-instances#addinstances

🤖 Commit message & comments Generated with [Claude Code](https://claude.ai/code)
@chrischdi
UPSTREAM: <carry>: Remove symlink for providers by using go.work
09ef3eb
@RadekManak
UPSTREAM: <carry>: Sync OWNERS file
989be41
UPSTREAM: <carry>: Updating ose-gcp-cloud-controller-manager-containe…
ffbcd83 
…r image to be consistent with ART for 4.21

Reconciling with https://github.com/openshift/ocp-build-data/tree/3fdad9b43ac7aa4e2ed5db0c6f5266809a9ebbc0/images/ose-gcp-cloud-controller-manager.yml
UPSTREAM: <drop>: Updating and vendoring go modules after an upstream…
1563cbf 
… rebase
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title OCPCLOUD-3094: Merge https://github.com/kubernetes/cloud-provider-gcp:master (2e53900) into main OCPCLOUD-3094: Merge https://github.com/kubernetes/cloud-provider-gcp:master (4bc9861) into main Nov 6, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 6, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Nov 6, 2025

New changes are detected. LGTM label has been removed.

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Nov 6, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

Details 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

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Nov 6, 2025

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the openshift org. You can then trigger verification by writing /verify-owners in a comment.

  • aojea
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
  • bowei
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
  • mmamczur
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
  • thockin
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
  • felipeyepez
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Nov 6, 2025

@cloud-team-rebase-bot[bot]: 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
ci/prow/images 1563cbf link true /test images
ci/prow/verify-vendor-work 1563cbf link true /test verify-vendor-work
ci/prow/e2e-gcp-ovn-upgrade 1563cbf link true /test e2e-gcp-ovn-upgrade
ci/prow/unit 1563cbf link true /test unit
ci/prow/okd-scos-images 1563cbf link true /test okd-scos-images
ci/prow/regression-clusterinfra-gcp-ipi-ccm 1563cbf link false /test regression-clusterinfra-gcp-ipi-ccm
ci/prow/e2e-gcp-ovn 1563cbf link true /test e2e-gcp-ovn
ci/prow/okd-scos-e2e-aws-ovn 1563cbf link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Details

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
Copy link
Copy Markdown
Member

damdo commented Nov 10, 2025

/close

In favour of #93

@damdo damdo closed this Nov 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nrb nrb Awaiting requested review from nrb

@racheljpg racheljpg Awaiting requested review from racheljpg

Assignees

@theobarberbany theobarberbany

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.