v1.10 backports 2022-01-11 #18445
Merged
v1.10 backports 2022-01-11 #18445
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ upstream commit 5a5755a ] In a version vX.Y.Z, X is called the major version, Y the minor version, and Z the patch version with this commit. Before this commit, Z was the micro version, but that's a bit confusing given we already have 'minor'. The patch terminology also matches semantics documented at semver.org. Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 5e3a7b3 ] This fixes the `first-interface-index` section in the ENI docs where we introduced a new default value and wanted to document that new default, but by doing that accidentally changed a value in the examples. This commit actually fixes the default value and reverts the example to its proper meaning. Ref: cilium#14801 Fixes: 231a217 ("docs: first-interface-index new ENI default") Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit d8577ff ] Previously, the Kubespray documentation recommended changing the role variables. However, changing the role files in an Ansible playbook could lead to problems. So, with this commit, the documentation recommends using the extra variables or editing the group_vars files. Co-authored-by: Yasin Taha Erol <yasintahaerol@gmail.com> Signed-off-by: necatican <necaticanyildirim@gmail.com> Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 05815f7 ] This commit replaces a few references to the janitors team, which was recently renamed to tophat. Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit dddbbe7 ] Our CI nodes no longer have `python` binary, python3 is available instead. Signed-off-by: Maciej Kwiek <maciej@isovalent.com> Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
added
backport/1.10
kind/backports
joestringer
approved these changes
Jan 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only backporting simple changes that don't require end-to-end tests, mostly to pick #18443.
first-interface-indexdocumentation #18327 -- docs: Fixfirst-interface-indexdocumentation (@gandro)bpf.masquerade's default value #18420 -- docs: Fix incorrect mention ofbpf.masquerade's default value (@pchaigno)Skipped:
Once this PR is merged, you can update the PR labels via: