Skip to content

✨ Add Scaleway infrastructure provider to clusterctl #12357

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

Merged
merged 1 commit into from
Jun 20, 2025

Conversation

Tomy2e
Copy link
Contributor

@Tomy2e Tomy2e commented Jun 13, 2025

What this PR does / why we need it: This PR adds the newly created Scaleway infrastructure provider to clusterctl. The documentation was updated accordingly.

/area clusterctl

@k8s-ci-robot k8s-ci-robot added area/clusterctl Issues or PRs related to clusterctl cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 13, 2025
@k8s-ci-robot k8s-ci-robot requested review from Jont828 and sivchari June 13, 2025 16:25
@k8s-ci-robot
Copy link
Contributor

Welcome @Tomy2e!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 13, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @Tomy2e. 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.

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.

/ok-to-test

@@ -72,6 +72,7 @@ const (
IonosCloudProviderName = "ionoscloud-ionoscloud"
VultrProviderName = "vultr-vultr"
OpenNebulaProviderName = "opennebula"
ScalewayProviderName = "scaleway"
Copy link
Member

Choose a reason for hiding this comment

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

just to double check with @sbueringer

we are ok on omitting the prefix (the github organization) because in this case prefix and provider name match.

this won't lead to name clash in the future, because if someone from another org wants to create a scaleway provider, in this case the org could not not be omitted

https://cluster-api.sigs.k8s.io/developer/providers/contracts/clusterctl#providers-github-org-prefix

Copy link
Member

Choose a reason for hiding this comment

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

Yes exactly

@k8s-ci-robot 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 Jun 18, 2025
@sbueringer
Copy link
Member

/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 Jun 20, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c83bc2b6d101b0ba28177fd0aacc1bf327522424

@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 Jun 20, 2025
@sbueringer
Copy link
Member

@mboersma Can you please take a look at the broken link? https://github.com/kubernetes-sigs/cluster-api/actions/runs/15686602040/job/44330408531?pr=12357 (https://capz.sigs.k8s.io/getting-started.html#prerequisites)

And open a separate PR to fix it, thank you!

@mboersma
Copy link
Contributor

See also kubernetes-sigs/image-builder#1771 for image building reference. Go Scaleway!

@sbueringer
Copy link
Member

Merging here manually as the broken link is independent of this PR

@sbueringer sbueringer merged commit 59b0f3f into kubernetes-sigs:main Jun 20, 2025
18 of 20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jun 20, 2025
@sbueringer
Copy link
Member

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@sbueringer: #12357 failed to apply on top of branch "release-1.10":

Applying: Add Scaleway infrastructure provider to clusterctl
Using index info to reconstruct a base tree...
M	cmd/clusterctl/client/config/providers_client.go
M	cmd/clusterctl/client/config_test.go
M	cmd/clusterctl/cmd/config_repositories_test.go
M	docs/book/src/developer/providers/contracts/clusterctl.md
M	docs/book/src/reference/providers.md
M	docs/book/src/user/quick-start.md
Falling back to patching base and 3-way merge...
Auto-merging docs/book/src/user/quick-start.md
CONFLICT (content): Merge conflict in docs/book/src/user/quick-start.md
Auto-merging docs/book/src/reference/providers.md
Auto-merging docs/book/src/developer/providers/contracts/clusterctl.md
CONFLICT (content): Merge conflict in docs/book/src/developer/providers/contracts/clusterctl.md
Auto-merging cmd/clusterctl/cmd/config_repositories_test.go
Auto-merging cmd/clusterctl/client/config_test.go
Auto-merging cmd/clusterctl/client/config/providers_client.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add Scaleway infrastructure provider to clusterctl

In response to this:

/cherry-pick release-1.10

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.

@sbueringer
Copy link
Member

@Tomy2e Feel free to open a PR against v1.10 as well, so it will directly show up in our book

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/clusterctl Issues or PRs related to clusterctl 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants