Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Allow control plane provider to set endpoint #10667

Conversation

vincepri
Copy link
Member

@vincepri vincepri commented May 23, 2024

What this PR does / why we need it:
/area api

This small change allows the controlPlaneRef, if set, to conditionally set the controlPlaneEndpoint. This change is a short term solution that allows the control plane provider to be on parity with the infrastructure provider, and helps reduce the heavy requirement on the infrastructureRef we have today.

Eventually, once the ClusterEndpoint proposal is implemented, those endpoints will superseded this change.

@k8s-ci-robot k8s-ci-robot added area/api Issues or PRs related to the APIs cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 23, 2024
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 23, 2024
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this PR!

Eventually, once the ClusterEndpoint proposal is implemented, those endpoints will superseded this change.

What about adding a note on top of https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20230407-flexible-managed-k8s-endpoints.md so we keep track we have implemented this / it should be considered when someone pick up
the implementation

I also think we should fix documentation in:

@vincepri vincepri force-pushed the allow-controlplaneprovider-endpoint branch from 3dedc70 to 686a919 Compare May 28, 2024 23:07
@vincepri
Copy link
Member Author

@fabriziopandini done, ptal

Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last nit.
If possible, please add a note in https://cluster-api.sigs.k8s.io/developer/architecture/controllers/cluster#infrastructure-provider indicating that the control plane endpoint might be not provided by the infrastructure cluster (sorry if I forgot to list this page in the first pass)

@enxebre
Copy link
Member

enxebre commented May 29, 2024

The change seems reasonable to me.

@vincepri vincepri force-pushed the allow-controlplaneprovider-endpoint branch from 686a919 to e3f594d Compare May 30, 2024 15:33
@vincepri
Copy link
Member Author

@sbueringer & others, ptal

@enxebre
Copy link
Member

enxebre commented May 31, 2024

/lgtm

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

LGTM label has been added.

Git tree hash: d6f31e3d259613f74ca4b67474655243b96724e9

@chrischdi
Copy link
Member

/approve

Besides the naming nit

/hold in case @sbueringer or others want to take a look too.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 31, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 May 31, 2024
@sbueringer sbueringer dismissed their stale review June 3, 2024 11:39

wrong button

@vincepri vincepri force-pushed the allow-controlplaneprovider-endpoint branch from e3f594d to 309b262 Compare June 3, 2024 22:56
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 3, 2024
@k8s-ci-robot k8s-ci-robot requested a review from enxebre June 3, 2024 22:56
@vincepri vincepri force-pushed the allow-controlplaneprovider-endpoint branch from 309b262 to 6b230b8 Compare June 3, 2024 22:57
@enxebre
Copy link
Member

enxebre commented Jun 4, 2024

/lgtm

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

LGTM label has been added.

Git tree hash: 26cb7a5167caecaf21b06da10ceca36bf64c3990

Signed-off-by: Vince Prignano <vince@prigna.com>
@vincepri vincepri force-pushed the allow-controlplaneprovider-endpoint branch from 6b230b8 to d4c61cd Compare June 4, 2024 13:22
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2024
@vincepri
Copy link
Member Author

vincepri commented Jun 4, 2024

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 4, 2024
@vincepri
Copy link
Member Author

vincepri commented Jun 4, 2024

@sbueringer @enxebre ready for another review

@enxebre
Copy link
Member

enxebre commented Jun 5, 2024

/lgtm
/hold
in case Stefan wants to have another look

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jun 5, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: dba32f9fff1ebb273d4fe2b0463a6dfedb3c6356

Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@vincepri
Copy link
Member Author

vincepri commented Jun 5, 2024

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 5, 2024
@k8s-ci-robot k8s-ci-robot merged commit 2ed53da into kubernetes-sigs:main Jun 5, 2024
21 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Jun 5, 2024
@sbueringer
Copy link
Member

/lgtm

from my side as well

@vincepri
Copy link
Member Author

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

@vincepri: #10667 failed to apply on top of branch "release-1.7":

Applying: Allow control plane provider to set endpoint
Using index info to reconstruct a base tree...
M	docs/book/src/developer/architecture/controllers/cluster.md
M	docs/book/src/developer/architecture/controllers/control-plane.md
M	internal/controllers/cluster/cluster_controller_phases.go
M	internal/controllers/cluster/cluster_controller_phases_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controllers/cluster/cluster_controller_phases_test.go
Auto-merging internal/controllers/cluster/cluster_controller_phases.go
Auto-merging docs/book/src/developer/architecture/controllers/control-plane.md
Auto-merging docs/book/src/developer/architecture/controllers/cluster.md
CONFLICT (content): Merge conflict in docs/book/src/developer/architecture/controllers/cluster.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Allow control plane provider to set endpoint
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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.

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/api Issues or PRs related to the APIs 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.

None yet

7 participants