✨ Add support for add-on providers in clusterctl #8472

Jont828 · 2023-04-04T18:52:00Z

What this PR does / why we need it: Add support for add-on providers in clusterctl so we can use CAAPH with clusterctl init

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 #

killianmuldoon

Looks good at first glance - will give it a proper review and test later in the week.

cmd/clusterctl/api/v1alpha3/provider_type.go

cmd/clusterctl/client/config/providers_client.go

Jont828 · 2023-04-04T20:15:14Z

@fabriziopandini I based this off of #7288, what are your thoughts on adding an add-on provider type so we can set up CAAPH with clusterctl init?

test/e2e/config/docker.yaml

fabriziopandini

great to see this moving!
I will start by harmonizing usage of addon and add-on across the board, then we can nail down other nits progressively

cmd/clusterctl/client/repository/client.go

cmd/clusterctl/cmd/delete.go

cmd/clusterctl/cmd/generate_provider.go

cmd/clusterctl/hack/create-local-repository.py

hack/tools/tilt-prepare/main.go

test/e2e/config/docker.yaml

test/e2e/data/shared/addons/metadata.yaml

ykakarap

Did an initial pass and overall it seems okay. I will do a full pass and test this locally.

cmd/clusterctl/cmd/init.go

cmd/clusterctl/cmd/upgrade_apply.go

cmd/clusterctl/hack/create-local-repository.py

test/e2e/self_hosted.go

ykakarap

Some notes:

No action needed but I wanted highlight it just in case: clusterctl upgrade plan/apply will not suggest upgrade for CAAPH right because all the versions of CAAPH are pre-release versions. If a user is on v0.1.0-alpha.1 clusterctl will report it as on the "latest version" and users will have to manually upgrade. This is working as expected and we do not want to change the behavior but just wanted to highlight it here. clusterctl init will pick up the latest alpha so clusterctl init --addon helm should work.
clusterctl_upgrade.go e2e should be modified to support addons.

cmd/clusterctl/cmd/generate_provider.go

cmd/clusterctl/cmd/init.go

test/framework/clusterctl/client.go

test/framework/clusterctl/e2e_config.go

ykakarap

Some notes:

No action needed but I wanted highlight it just in case: clusterctl upgrade plan/apply will not suggest upgrade for CAAPH right because all the versions of CAAPH are pre-release versions. If a user is on v0.1.0-alpha.1 clusterctl will report it as on the "latest version" and users will have to manually upgrade. This is working as expected and we do not want to change the behavior but just wanted to highlight it here. clusterctl init will pick up the latest alpha so clusterctl init --addon helm should work.
clusterctl_upgrade.go e2e should be modified to support addons.

Jont828 · 2023-05-10T20:57:52Z

@ykakarap Went over some of these changes. WDYT?

ykakarap · 2023-05-10T23:52:34Z

/test ?

k8s-ci-robot · 2023-05-10T23:52:36Z

@ykakarap: The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-test-main
/test pull-cluster-api-test-mink8s-main
/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main
/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-informing-ipv6-main
/test pull-cluster-api-e2e-informing-main
/test pull-cluster-api-e2e-scale-main-experimental
/test pull-cluster-api-e2e-workload-upgrade-1-27-latest-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main
pull-cluster-api-build-main
pull-cluster-api-e2e-informing-ipv6-main
pull-cluster-api-e2e-informing-main
pull-cluster-api-e2e-main
pull-cluster-api-test-main
pull-cluster-api-test-mink8s-main
pull-cluster-api-verify-main

In response to this:

/test ?

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/test-infra repository.

test/e2e/config/docker.yaml

ykakarap · 2023-05-10T23:53:51Z

/test pull-cluster-api-e2e-full-main

ykakarap · 2023-05-10T23:54:27Z

Overall looks good. I think this is getting close to ready.

Jont828 · 2023-05-11T17:07:41Z

/test pull-cluster-api-e2e-full-main

cmd/clusterctl/client/config/providers_client.go

cmd/clusterctl/client/config/providers_client_test.go

cmd/clusterctl/cmd/delete.go

cmd/clusterctl/hack/create-local-repository.py

docs/book/src/clusterctl/provider-contract.md

cmd/clusterctl/cmd/config_repositories_test.go

ykakarap · 2023-05-15T23:19:45Z

Overall looks good. LGTM pending tests fix.

sbueringer · 2023-05-16T06:07:06Z

lgtm pending test fix + confirmation on #8472 (comment)

ykakarap · 2023-05-16T23:53:51Z

Except for a few comments looks like we are using addon everywhere. This is not a blocker for me.

@Jont828 Thank you adding addon support to clusterctl! Great work 🚀

/lgtm

k8s-ci-robot · 2023-05-16T23:53:57Z

LGTM label has been added.

Git tree hash: cb998de5c72966f0851ff2565ce9fb1901c88a9e

ykakarap · 2023-05-16T23:55:44Z

/hold until the release file in CAAPH is renamed to addon-components.yaml. Feel free to cancel hold if needed.

sbueringer · 2023-05-17T13:22:48Z

/approve

k8s-ci-robot · 2023-05-17T13:22:57Z

[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:

~~OWNERS~~ [sbueringer]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

sbueringer · 2023-05-17T13:23:35Z

File is correct now.

@Jont828 Thank you very much for working on this!! 🎉

/hold cancel

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/clusterctl Issues or PRs related to clusterctl size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 4, 2023

k8s-ci-robot requested review from jackfrancis and richardcase April 4, 2023 18:52

killianmuldoon reviewed Apr 4, 2023

View reviewed changes

cmd/clusterctl/api/v1alpha3/provider_type.go Outdated Show resolved Hide resolved

cmd/clusterctl/client/config/providers_client.go Show resolved Hide resolved

cmd/clusterctl/client/config/providers_client.go Show resolved Hide resolved

Jont828 force-pushed the clusterctl-addon-providers branch from 0e4d9e2 to 30b4e45 Compare April 10, 2023 22:50

killianmuldoon reviewed Apr 13, 2023

View reviewed changes

test/e2e/config/docker.yaml Outdated Show resolved Hide resolved

killianmuldoon reviewed Apr 13, 2023

View reviewed changes

test/e2e/config/docker.yaml Outdated Show resolved Hide resolved

fabriziopandini reviewed Apr 14, 2023

View reviewed changes

Jont828 force-pushed the clusterctl-addon-providers branch from 726a812 to a502e50 Compare April 14, 2023 21:56

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

Jont828 force-pushed the clusterctl-addon-providers branch from a502e50 to 6a95c43 Compare April 14, 2023 21:59

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 14, 2023

ykakarap reviewed May 4, 2023

View reviewed changes

cmd/clusterctl/cmd/init.go Outdated Show resolved Hide resolved

cmd/clusterctl/cmd/upgrade_apply.go Outdated Show resolved Hide resolved

cmd/clusterctl/hack/create-local-repository.py Outdated Show resolved Hide resolved

test/e2e/self_hosted.go Show resolved Hide resolved

ykakarap reviewed May 9, 2023

View reviewed changes

cmd/clusterctl/cmd/generate_provider.go Show resolved Hide resolved

cmd/clusterctl/cmd/init.go Outdated Show resolved Hide resolved

test/framework/clusterctl/client.go Outdated Show resolved Hide resolved

test/framework/clusterctl/e2e_config.go Show resolved Hide resolved

ykakarap reviewed May 9, 2023

View reviewed changes

ykakarap reviewed May 10, 2023

View reviewed changes

test/e2e/config/docker.yaml Outdated Show resolved Hide resolved

Jont828 force-pushed the clusterctl-addon-providers branch from 980da14 to b743994 Compare May 11, 2023 16:30

sbueringer reviewed May 15, 2023

View reviewed changes

Jont828 force-pushed the clusterctl-addon-providers branch from b743994 to 3486493 Compare May 15, 2023 22:31

ykakarap reviewed May 15, 2023

View reviewed changes

cmd/clusterctl/cmd/config_repositories_test.go Outdated Show resolved Hide resolved

Support add-on providers in clusterctl

fc125b0

Jont828 force-pushed the clusterctl-addon-providers branch from 3486493 to fc125b0 Compare May 16, 2023 22:37

Jont828 mentioned this pull request May 16, 2023

🌱 Rename 'add-on-components.yaml' to 'addon-components.yaml' in make target kubernetes-sigs/cluster-api-addon-provider-helm#73

Merged

k8s-ci-robot assigned ykakarap May 16, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 16, 2023

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 16, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 17, 2023

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 17, 2023

k8s-ci-robot merged commit ba50476 into kubernetes-sigs:main May 17, 2023

k8s-ci-robot added this to the v1.5 milestone May 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Add support for add-on providers in clusterctl #8472

✨ Add support for add-on providers in clusterctl #8472

Jont828 commented Apr 4, 2023

killianmuldoon left a comment

Jont828 commented Apr 4, 2023

fabriziopandini left a comment

ykakarap left a comment •

edited

Loading

ykakarap left a comment

ykakarap left a comment

Jont828 commented May 10, 2023

ykakarap commented May 10, 2023

k8s-ci-robot commented May 10, 2023

ykakarap commented May 10, 2023

ykakarap commented May 10, 2023

Jont828 commented May 11, 2023

ykakarap commented May 15, 2023

sbueringer commented May 16, 2023

ykakarap commented May 16, 2023

k8s-ci-robot commented May 16, 2023

ykakarap commented May 16, 2023

sbueringer commented May 17, 2023

k8s-ci-robot commented May 17, 2023

sbueringer commented May 17, 2023

✨ Add support for add-on providers in clusterctl #8472

✨ Add support for add-on providers in clusterctl #8472

Conversation

Jont828 commented Apr 4, 2023

killianmuldoon left a comment

Choose a reason for hiding this comment

Jont828 commented Apr 4, 2023

fabriziopandini left a comment

Choose a reason for hiding this comment

ykakarap left a comment • edited Loading

Choose a reason for hiding this comment

ykakarap left a comment

Choose a reason for hiding this comment

ykakarap left a comment

Choose a reason for hiding this comment

Jont828 commented May 10, 2023

ykakarap commented May 10, 2023

k8s-ci-robot commented May 10, 2023

ykakarap commented May 10, 2023

ykakarap commented May 10, 2023

Jont828 commented May 11, 2023

ykakarap commented May 15, 2023

sbueringer commented May 16, 2023

ykakarap commented May 16, 2023

k8s-ci-robot commented May 16, 2023

ykakarap commented May 16, 2023

sbueringer commented May 17, 2023

k8s-ci-robot commented May 17, 2023

sbueringer commented May 17, 2023

ykakarap left a comment •

edited

Loading