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

Fix helm chart incompatible types for comparison #32025

Merged
merged 1 commit into from
Apr 22, 2024

Conversation

lou-lan
Copy link
Contributor

@lou-lan lou-lan commented Apr 17, 2024

Please ensure your pull request adheres to the following guidelines:

  • For first time contributors, read Submitting a pull request
  • All code is covered by unit and/or runtime tests where feasible.
  • All commits contain a well written commit description including a title,
    description and a Fixes: #XXX line if the commit addresses a particular
    GitHub issue.
  • If your commit description contains a Fixes: <commit-id> tag, then
    please add the commit author[s] as reviewer[s] to this issue.
  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • Are you a user of Cilium? Please add yourself to the Users doc
  • Thanks for contributing!

Fixes: #32024

Fix helm chart incompatible types for comparison

@lou-lan lou-lan requested review from a team as code owners April 17, 2024 11:30
@lou-lan lou-lan requested review from tommyp1ckles and gandro April 17, 2024 11:30
@maintainer-s-little-helper
Copy link

Commit 16f2c97 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 17, 2024
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Apr 17, 2024
@maintainer-s-little-helper
Copy link

Commit 16f2c97 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Apr 17, 2024
@lou-lan
Copy link
Contributor Author

lou-lan commented Apr 17, 2024

Commit 16f2c97 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

I am already add Signed-off-by: xxx in my commit msg.

Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Thanks!

@gandro gandro added release-note/misc This PR makes changes that have no direct user impact. area/helm Impacts helm charts and user deployment experience needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Apr 17, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 17, 2024
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Actually, I believe (ne (quote $kubeProxyReplacement) "strict") will now always be true. Would toString work instead of quote?

Fixes: cilium#32024

Signed-off-by: lou-lan <loulan@loulan.me>
@lou-lan
Copy link
Contributor Author

lou-lan commented Apr 17, 2024

Actually, I believe (ne (quote $kubeProxyReplacement) "strict") will now always be true. Would toString work instead of quote?

I am change to toString.

set kubeProxyReplacement to false and waitForKubeProxy to true

$ helm template cilium-release ./cilium-1.15.4.tgz \
--namespace kube-system     \
--set routingMode=native     \
--set ipv4NativeRoutingCIDR="172.16.25.134/24"     \
--set kubeProxyReplacement="false"     \
--set loadBalancer.mode=dsr     \
--set loadBalancer.dsrDispatch=opt     \
--set k8sServiceHost=172.16.25.134     \
--set k8sServicePort=6443 \
--set waitForKubeProxy=true | grep wait-for-kube-proxy

      - name: wait-for-kube-proxy
        terminationMessagePolicy: FallbackToLogsOnError # wait-for-kube-proxy

set kubeProxyReplacement to true and without waitForKubeProxy

helm template cilium-release ./cilium-1.15.4.tgz \
--namespace kube-system     \
--set routingMode=native     \
--set ipv4NativeRoutingCIDR="172.16.25.134/24"     \
--set kubeProxyReplacement="true"     \
--set loadBalancer.mode=dsr     \
--set loadBalancer.dsrDispatch=opt     \
--set k8sServiceHost=172.16.25.134     \
--set k8sServicePort=6443  | grep 'wait-for-kube-proxy'

          mountPath: /var/run/cilium # wait-for-kube-proxy

@gandro
Copy link
Member

gandro commented Apr 17, 2024

/test

@aanm aanm added this pull request to the merge queue Apr 22, 2024
@gandro gandro removed the request for review from tommyp1ckles April 22, 2024 09:23
Merged via the queue into cilium:main with commit 19f2268 Apr 22, 2024
62 checks passed
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 22, 2024
@gandro gandro mentioned this pull request Apr 29, 2024
18 tasks
@gandro gandro added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Apr 29, 2024
@github-actions github-actions bot added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm Impacts helm charts and user deployment experience backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

helm installation incompatible types for comparison
3 participants