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

Helm mode: Handle "cluster.name" Helm value #1796

Merged
merged 2 commits into from
Jul 6, 2023
Merged

Conversation

michi-covalent
Copy link
Contributor

  • Refactor preinstall to call HelmOpts.MergeValues() once at the top of
    the function, and pass the merged values to autodetectAndValidate().
  • Set install.Parameters.ClusterName to cluster.name Helm value if it's
    not empty.
  • Skip the cluster name validation altogether in Helm mode. I boldly
    assert that any input validation must be performed inside the Helm
    chart, and not in cilium-cli. This ensures that the validation logic
    is consistent between "helm install" and "cilium install".

Fixes: #490

Signed-off-by: Michi Mutsuzaki michi@isovalent.com

@michi-covalent michi-covalent temporarily deployed to ci July 4, 2023 23:16 — with GitHub Actions Inactive
@michi-covalent michi-covalent temporarily deployed to ci July 4, 2023 23:21 — with GitHub Actions Inactive
@michi-covalent michi-covalent temporarily deployed to ci July 4, 2023 23:36 — with GitHub Actions Inactive
@michi-covalent michi-covalent temporarily deployed to ci July 4, 2023 23:41 — with GitHub Actions Inactive
@michi-covalent michi-covalent temporarily deployed to ci July 5, 2023 00:49 — with GitHub Actions Inactive
@michi-covalent michi-covalent marked this pull request as ready for review July 5, 2023 04:16
@michi-covalent michi-covalent requested review from a team as code owners July 5, 2023 04:17
install/autodetect.go Outdated Show resolved Hide resolved
- Refactor preinstall to call HelmOpts.MergeValues() once at the top of
  the function, and pass the merged values to autodetectAndValidate().
- Set install.Parameters.ClusterName to cluster.name Helm value if it's
  not empty.
- Skip the cluster name validation altogether in Helm mode. I boldly
  assert that any input validation must be performed inside the Helm
  chart, and not in cilium-cli. This ensures that the validation logic
  is consistent between "helm install" and "cilium install".

Fixes: #490

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Because why not.

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
@michi-covalent michi-covalent temporarily deployed to ci July 5, 2023 23:12 — with GitHub Actions Inactive
@tklauser tklauser merged commit 0d38880 into main Jul 6, 2023
19 checks passed
@tklauser tklauser deleted the pr/michi/clustername branch July 6, 2023 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow dots to be used when cilium install is executed
4 participants