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.

Sign up for GitHub

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

Jump to bottom

🐛 Extend helm feature gates #634

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

🐛 Extend helm feature gates #634

wants to merge 3 commits into from

Conversation

gcezaralmeida
Copy link

@gcezaralmeida gcezaralmeida commented Nov 7, 2024 •
edited
Loading

What this PR does / why we need it:
This PR aims to extend the featureGates to the bootstrap provider and controlPlane provider.

Which issue(s) this PR fixes:
Fixes #633

@furkatgofurov7

@linux-foundation-easycla Linux Foundation: EasyCLA
Copy link

linux-foundation-easycla bot commented Nov 7, 2024 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

@k8s-ci-robot
Copy link
Contributor

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

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 cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Nov 7, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @gcezaralmeida!

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
Copy link
Contributor

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

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

netlify bot commented Nov 7, 2024 •
edited
Loading

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

Name Link
🔨 Latest commit 8cc65d8
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-operator/deploys/675cad84dd7ecd00087a2855
😎 Deploy Preview https://deploy-preview-634--kubernetes-sigs-cluster-api-operator.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Nov 7, 2024
@gcezaralmeida gcezaralmeida changed the title Extend helm feature gates (:bug:) Extend helm feature gates Nov 7, 2024
@gcezaralmeida gcezaralmeida changed the title (:bug:) Extend helm feature gates Patch fix: Extend helm feature gates Nov 7, 2024
@gcezaralmeida gcezaralmeida changed the title Patch fix: Extend helm feature gates 🐛 Extend helm feature gates Nov 7, 2024
antonblr
antonblr reviewed Nov 8, 2024
View reviewed changes
hack/charts/cluster-api-operator/values.yaml
Comment on lines +12 to +19
# manager:
# featureGates:
# core:
# KubeadmBootstrapFormatIgnition: true
# bootstrap:
# KubeadmBootstrapFormatIgnition: true
# controlPlane:
# KubeadmBootstrapFormatIgnition: true
Copy link

Choose a reason for hiding this comment

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

Out of scope for this PR, but values.yaml already has core providers listed at the top level - would it make sense to lay-out all the config / params under, instead of duplicating them all over?

e.g.

core:            # <- everything for core provider in once place
  version: "v0.1.0"
  manager:
    featureGates:
      KubeadmBootstrapFormatIgnition: false
  deployment:
    ...
  configSecret:
    ...
  fetchConfig:
    ...
bootstrap:       # <- everything for bootstrap provider in once place
  version: ""
  manager:
    featureGates:
      KubeadmBootstrapFormatIgnition: true 
controlPlane:    # <- everything for controlPlane provider in once place
  manager:
    featureGates:
      KubeadmBootstrapFormatIgnition: true

Copy link
Author

Choose a reason for hiding this comment

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

I think this approach makes sense. Instead of using key-value pairs, we could use an array. This will provide more flexibility, allowing specific configurations for each provider when multiple providers are used. Let me know what you think, I can work on that.

core:            # <- everything for core provider in once place
- name: "cluster-api"
  version: "v0.1.0"
  manager:
    featureGates:
      KubeadmBootstrapFormatIgnition: false
  deployment:
    ...
  configSecret:
    ...
  fetchConfig:
    ...
bootstrap:
- name: "kubeadm"       # <- everything for bootstrap provider in once place
  version: ""
  manager:
    featureGates:
      KubeadmBootstrapFormatIgnition: true 
controlPlane:
- name: "kubeadm"
  version: ""    # <- everything for controlPlane provider in once place
  manager:
    featureGates:
      KubeadmBootstrapFormatIgnition: true

Copy link
Author

Choose a reason for hiding this comment

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

@furkatgofurov7, Do you think that we can go with this PR? Or do we restructure the values.yaml like above example?

@antonblr
Copy link

antonblr commented Nov 8, 2024

Somehow intersects with #536

@furkatgofurov7
Copy link
Member

/ok-to-test

@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 Nov 25, 2024
@furkatgofurov7
Copy link
Member

Somehow intersects with #536

yeap, however it has a pending comment #536 (comment) that needs addressing. It would be great to join the efforts here and have single patch to address both concerns (in fact one is extended version of second)

cc @kahirokunn

@kahirokunn
Copy link
Contributor

kahirokunn commented Nov 25, 2024 •
edited
Loading

Thank you very much!

{{- if or $controlPlaneVersion $.Values.configSecret.name $.Values.manager }}

I have added this conditional statement on my side.

Therefore, if you could stop modifying this file, I believe we can merge your changes with mine smoothly:
hack/charts/cluster-api-operator/templates/control-plane.yaml

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 12, 2024
@furkatgofurov7
Copy link
Member

Please rebase the PR @gcezaralmeida

@gcezaralmeida gcezaralmeida force-pushed the extend-helm-feature-gates branch from 6482db0 to 8cc65d8 Compare December 13, 2024 21:56
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antonblr antonblr antonblr left review comments

@Danil-Grigorev Danil-Grigorev Awaiting requested review from Danil-Grigorev

@timothysc timothysc Awaiting requested review from timothysc

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Missing manager featureGates for Bootstrap and ControlPlane Providers
5 participants
@gcezaralmeida @k8s-ci-robot @antonblr @furkatgofurov7 @kahirokunn