Skip to content

Conversation

@faiq
Copy link
Contributor

@faiq faiq commented Nov 5, 2025

What this PR does / why we need it:

If spec.ControlPlaneEndpoint is set on the control plane object we should ignore that when merging the objects together. We follow a similar pattern for infrastructureCluster objects.

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 #

/area clusterclass

@k8s-ci-robot k8s-ci-robot added area/clusterclass Issues or PRs related to clusterclass cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 5, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 5, 2025
@faiq
Copy link
Contributor Author

faiq commented Nov 5, 2025

/assign @sbueringer

@sbueringer sbueringer changed the title 🐛 fix: ignore if control plane if spec.controlPlane is set 🐛 Stop writing zero values for spec.controlPlane to ControlPlane objects Nov 8, 2025
@sbueringer sbueringer changed the title 🐛 Stop writing zero values for spec.controlPlane to ControlPlane objects 🐛 Stop writing zero values for spec.controlPlaneEndpoint to ControlPlane objects Nov 8, 2025
@sbueringer
Copy link
Member

Thank you!

/test pull-cluster-api-e2e-main-gke
/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 8, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 51a8271791bf96cac0b626cacc62fdb741349859

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2025
@k8s-ci-robot k8s-ci-robot merged commit 7be10c2 into kubernetes-sigs:main Nov 8, 2025
36 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Nov 8, 2025
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. area/clusterclass Issues or PRs related to clusterclass cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants