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: 'bpf.ctTcpMax' and 'bpf.ctAnyMax' need to be strings, not integers #14021

Merged
merged 1 commit into from
Dec 15, 2020

Conversation

mvisonneau
Copy link
Contributor

Make it more evident for end users by amending the comment regarding how to configure bpf.ctTcpMax and bpf.ctAnyMax

Helm release would succeed if integers are provided but the Cilium agents would then crash.

@mvisonneau mvisonneau requested review from a team as code owners November 13, 2020 12:10
@mvisonneau mvisonneau requested review from a team, pchaigno, kaworu and brb November 13, 2020 12:10
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Nov 13, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Nov 13, 2020
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

Can you clarify why lbMapMax does not require the integer to be quoted for example?

@mvisonneau
Copy link
Contributor Author

Can you clarify why lbMapMax does not require the integer to be quoted for example?

actually it could be related to using | quote ctAnyMax vs {{ }} lbMapMax

I will give it a try

@mvisonneau
Copy link
Contributor Author

mvisonneau commented Nov 13, 2020

indeed:

-   bpf-ct-global-tcp-max: "2097152"
-   bpf-ct-global-any-max: "1048576"
+   bpf-ct-global-tcp-max: "2.097152e+06"
+   bpf-ct-global-any-max: "1.048576e+06"

I assume that the agent is not happy about the scientific notation. Could be related to the coalesce function rather than the quoting part though.

Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

So for consistency we should quote all numbers? @mvisonneau

@mvisonneau
Copy link
Contributor Author

I tried to find a way to update the chart templating logic to be able to leverage numbers but I did not manage to get it to work yet. I believe that it would be interesting to stick to the actually expected type by default but at the same time, current implementation prevents it. Lets perhaps merge this one and create a follow-up issue to figure out what to do with this problem 🤔

@aanm aanm added needs-backport/1.9 release-note/misc This PR makes changes that have no direct user impact. labels Nov 17, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Nov 17, 2020
@joestringer joestringer added this to Needs backport from master in 1.9.1 Nov 17, 2020
@aanm aanm added this to Needs backport from master in 1.9.2 Dec 4, 2020
@aanm aanm removed this from Needs backport from master in 1.9.1 Dec 4, 2020
@joestringer
Copy link
Member

@aanm what do you think of @mvisonneau 's proposal above? If we're fine to merge this as-is, it will need a rebase.

Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

@joestringer joestringer added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Dec 10, 2020
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

👍 just needs to be rebased.

@mvisonneau
Copy link
Contributor Author

rebased! 👍

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

Helm doc failure from the CI pipeline is legit, @mvisonneau please run make -C install/kubernetes docs.

Signed-off-by: Maxime VISONNEAU <maxime.visonneau@gmail.com>
@mvisonneau
Copy link
Contributor Author

ah right! I rebased again and ran the formatting command 👍, sorry about that

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

[EDIT: deleted - sorry, missclick]

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

@mvisonneau Thanks! Marking this as ready-to-merge as it doesn't warrant a full CI run.

@kaworu kaworu added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. labels Dec 15, 2020
@joestringer joestringer merged commit 6d3143f into cilium:master Dec 15, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.2 Jan 6, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.2 Jan 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
1.9.2
Backport done to v1.9
Development

Successfully merging this pull request may close these issues.

None yet

7 participants