✨ Add featureGates to ControlPlaneProvider #536

kahirokunn · 2024-05-24T07:01:47Z

What this PR does / why we need it:

This PR adds support for specifying featureGates in the ControlPlaneProvider. This is particularly necessary when using infrastructure=docker, as we need to pass CLUSTER_TOPOLOGY=true to the kubeadm provider. Currently, there is no way to do this, and this feature is essential for enabling cluster topology features in kubeadm.

Usage Example:

To use this feature, you can install the capi-operator with Helm and specify the feature gates in your values file. Here is an example:

helm install capi-operator cluster-api-operator/cluster-api-operator --version 0.10.1 -n capi-operator-system --create-namespace --values ./example-values.yaml

example-values.yaml:

cert-manager:
  enabled: false
  installCRDs: false
infrastructure: docker:v1.7.2
core: cluster-api:v1.7.2
controlPlane: kubeadm:v1.7.2
manager:
  featureGates:
    core:
      ClusterTopology: true
      MachinePool: true
    docker:
      ClusterTopology: true
      MachinePool: true
    kubeadm:
      ClusterTopology: true
      MachinePool: true

Sample Output:

Here is a portion of the expanded manifest showing the applied feature gates:

# Source: cluster-api-operator/templates/control-plane.yaml
apiVersion: operator.cluster.x-k8s.io/v1alpha2
kind: ControlPlaneProvider
metadata:
  name: kubeadm
  namespace: kubeadm-control-plane-system
  annotations:
    "helm.sh/hook": "post-install"
    "helm.sh/hook-weight": "2"
spec:
  version: v1.7.2
  manager:
    featureGates:
      ClusterTopology: true
      MachinePool: true

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 #

k8s-ci-robot · 2024-05-24T07:01:53Z

[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 assign neolit123 for approval. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

OWNERS

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 · 2024-05-24T07:01:55Z

Welcome @kahirokunn!

It looks like this is your first PR to kubernetes-sigs/cluster-api-operator 🎉. 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-operator 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 · 2024-05-24T07:01:56Z

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

netlify · 2024-05-24T07:02:03Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-operator ready!

Name	Link
🔨 Latest commit	`4ba6b3e`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-operator/deploys/66503d2a41367900080f2581
😎 Deploy Preview	https://deploy-preview-536--kubernetes-sigs-cluster-api-operator.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

alexander-demicev

thanks a lot for this PR, can I you to add tests here https://github.com/kubernetes-sigs/cluster-api-operator/blob/main/test/e2e/helm_test.go?

alexander-demicev · 2024-06-04T09:10:35Z

hack/charts/cluster-api-operator/templates/infra-conditions.yaml

@@ -49,6 +49,15 @@ metadata:
 "helm.sh/hook-weight": "2"
 {{- with .Values.configSecret }}
 spec:
+{{- if $.Values.manager }}
+ manager:
+{{- if $.Values.manager.featureGates.kubeadm }}


can we make kubeadm configurable here? for users that are not using kubeadm for bootstrapping

@alexander-demicev
Sorry, I don't seem to understand correctly what you mean.
Could you please explain in more detail?
Thx.

As changes may be made, the test is written after hearing the explanation.
Thx.

@alexander-demicev remind 🙇‍♂️

@kahirokunn current implementation always assumes that manager.featureGates dictionary will use kubeadm as a bootstrap provider and nothing else. However, there is a possibilty that, other bootstrap provider, like rke2 could be used instead of kubeadm, so making manager.featureGates configurable would makes sense here only if we could make the whole ControlPlaneProvider type (starting from line 42) configurable including metadata.name & metadata.namespace.

@alexander-demicev perhaps we could keep it as is, since it is already kubeadm specific, WDYT?

I wrote this because the file is specific to kubeadm
I wrote this because it is a kubeadm-specific file, and I thought it would be confusing if I wrote it in a standard way.

alexander-demicev · 2024-06-04T09:11:39Z

/ok-to-test

furkatgofurov7 · 2024-06-24T08:45:12Z

/retest

furkatgofurov7 · 2024-06-24T08:46:23Z

LGTM, but CI was not agreeing with me. Let's wait if retrigger helps (assuming it was a CI flake).

k8s-ci-robot · 2024-06-24T08:58:22Z

@kahirokunn: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-operator-e2e-main	`4ba6b3e`	link	true	`/test pull-cluster-api-operator-e2e-main`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

furkatgofurov7 · 2024-06-24T10:09:23Z

LGTM, but CI was not agreeing with me. Let's wait if retrigger helps (assuming it was a CI flake).

We would need to check in template if feature gates are set before trying to access them, so that tests won't fail

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 24, 2024

k8s-ci-robot requested review from Danil-Grigorev and Fedosin May 24, 2024 07:01

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 24, 2024

Add featureGates to kubeadm ControlPlaneProvider

4ba6b3e

kahirokunn force-pushed the kubeadm-feature-flag branch from f0c4aea to 4ba6b3e Compare May 24, 2024 07:09

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 24, 2024

kahirokunn changed the title ~~✨ Add featureGates to kubeadm ControlPlaneProvider~~ ✨ Add featureGates to ControlPlaneProvider May 24, 2024

alexander-demicev reviewed Jun 4, 2024

View reviewed changes

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 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Add featureGates to ControlPlaneProvider #536

✨ Add featureGates to ControlPlaneProvider #536

kahirokunn commented May 24, 2024 •

edited

Loading

k8s-ci-robot commented May 24, 2024

k8s-ci-robot commented May 24, 2024

k8s-ci-robot commented May 24, 2024

netlify bot commented May 24, 2024 •

edited

Loading

alexander-demicev left a comment

alexander-demicev Jun 4, 2024

kahirokunn Jun 10, 2024

kahirokunn Jun 10, 2024

kahirokunn Jun 14, 2024

furkatgofurov7 Jun 14, 2024

kahirokunn Jun 14, 2024

alexander-demicev commented Jun 4, 2024

furkatgofurov7 commented Jun 24, 2024

furkatgofurov7 commented Jun 24, 2024

k8s-ci-robot commented Jun 24, 2024

furkatgofurov7 commented Jun 24, 2024

✨ Add featureGates to ControlPlaneProvider #536

Are you sure you want to change the base?

✨ Add featureGates to ControlPlaneProvider #536

Conversation

kahirokunn commented May 24, 2024 • edited Loading

k8s-ci-robot commented May 24, 2024

k8s-ci-robot commented May 24, 2024

k8s-ci-robot commented May 24, 2024

netlify bot commented May 24, 2024 • edited Loading

✅ Deploy Preview for kubernetes-sigs-cluster-api-operator ready!

alexander-demicev left a comment

Choose a reason for hiding this comment

alexander-demicev Jun 4, 2024

Choose a reason for hiding this comment

kahirokunn Jun 10, 2024

Choose a reason for hiding this comment

kahirokunn Jun 10, 2024

Choose a reason for hiding this comment

kahirokunn Jun 14, 2024

Choose a reason for hiding this comment

furkatgofurov7 Jun 14, 2024

Choose a reason for hiding this comment

kahirokunn Jun 14, 2024

Choose a reason for hiding this comment

alexander-demicev commented Jun 4, 2024

furkatgofurov7 commented Jun 24, 2024

furkatgofurov7 commented Jun 24, 2024

k8s-ci-robot commented Jun 24, 2024

furkatgofurov7 commented Jun 24, 2024

kahirokunn commented May 24, 2024 •

edited

Loading

netlify bot commented May 24, 2024 •

edited

Loading