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: use proper helm param name for specifying pod cidr #27141

Merged
merged 1 commit into from Jul 31, 2023

Conversation

yandzee
Copy link
Contributor

@yandzee yandzee commented Jul 29, 2023

No description provided.

@yandzee yandzee requested a review from a team as a code owner July 29, 2023 18:59
@yandzee yandzee requested a review from learnitall July 29, 2023 18:59
@maintainer-s-little-helper
Copy link

Commit 874533f93b42b071f619bd34446b110dff3fd1b2 does not contain "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 Jul 29, 2023
@yandzee yandzee force-pushed the pr/renat/k3s-docs-typo-fix branch from 874533f to 582b91a Compare July 29, 2023 19:00
@maintainer-s-little-helper
Copy link

Commit 874533f93b42b071f619bd34446b110dff3fd1b2 does not contain "Signed-off-by".

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

Signed-off-by: Renat Tuktarov <yandzeek@gmail.com>
@yandzee yandzee force-pushed the pr/renat/k3s-docs-typo-fix branch from 582b91a to 8c0c325 Compare July 29, 2023 19:02
@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 Jul 29, 2023
Copy link
Contributor

@learnitall learnitall left a comment

Choose a reason for hiding this comment

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

Nice catch! Thank you! One small nit that I have for you is the commit message, which could be a bit more specific. Something like:

docs: remove `clusterPoolIPv4PodCIDR option in k3s install

The option `clusterPoolIPv4PodCIDR option was deprecated in
Cilium 1.11 and removed from helm values in commit 1eef5ac.
This commit replaces an outdated reference to this option in
the k3s installation docs with the preferred option
`clusterPoolIPv4PodCIDRList`

@qmonnet qmonnet added area/documentation Impacts the documentation, including textual changes, sphinx, or other doc generation code. release-note/misc This PR makes changes that have no direct user impact. labels Jul 31, 2023
@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 Jul 31, 2023
@qmonnet
Copy link
Member

qmonnet commented Jul 31, 2023

Introduced in d3f2bcb ("Doc: Update k3s cilium installation to match k3s default podCIDR") which is in 1.14, I'm marking for backports for that release.

@qmonnet qmonnet added the needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch label Jul 31, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.1 Jul 31, 2023
@joestringer
Copy link
Member

/test

@joestringer joestringer merged commit 6ba173d into main Jul 31, 2023
54 checks passed
@joestringer joestringer deleted the pr/renat/k3s-docs-typo-fix branch July 31, 2023 17:18
@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 Jul 31, 2023
@sayboras sayboras mentioned this pull request Aug 3, 2023
11 tasks
@sayboras sayboras added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Aug 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.1 Aug 3, 2023
@sayboras sayboras added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Aug 4, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.1 Aug 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/documentation Impacts the documentation, including textual changes, sphinx, or other doc generation code. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. 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.14.1
Backport done to v1.14
Development

Successfully merging this pull request may close these issues.

None yet

5 participants