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

v1.10 backports 2021-05-26 #16320

Closed
wants to merge 10 commits into from

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented May 26, 2021

Skipped:

Once this PR is merged, you can update the PR labels via:

$ for pr in 16126 16263 16293 16081 16268 16288 16211 16286; do contrib/backporting/set-labels.py $pr done 1.10; done

nbusseneau and others added 10 commits May 26, 2021 17:51
[ upstream commit 85f4c56 ]

Also refactor hubble-cli installation accordingly.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 35de58a ]

`parsed-literal` blocks are required for parsing RST references but they
don't play nice with console examples: they allow copy-pasting `$`
prefixes even though they're not part of the commands.

`shell-session` blocks play nice with console examples but do not work
with RST references...

This is compromise where we remove `$` prefixes from parsed-literal
blocks for easier copy/pasting and switch to proper `shell-session`
blocks otherwise.

Also reworked the `curl` commands to add `--max-time` for commands
supposed to fail so that user doesn't have to cancal, and switch to
`curl -I {url} | head -1` notation to avoid output flood.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 497ac33 ]

In cilium#15979, the old `k8s-install-validate.rst` and `k8s-install-connectivity-test.rst`
were refactored to use the CLI, which broke the flow of several pages:
in particular, all installations based on Helm were half-broken due to
referencing Cilium CLI commands when the user was never instructed to
install it.

This commit moves all CLI-related operations to independent `cli-*.rst`,
and then refactors `k8s-install-validate.rst` to have both the new CLI
status check and connectivity test and the older manual status check and
connectivity test.

It then refactors CLI-based installation guides to use the `cli-*.rst`
in the order that makes the most sense for each page.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 6c0604e ]

Signed-off-by: Tobias Mose <tobias.mose@xentom.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 5d2e72f ]

According to WireGuard's Trademark Usage Policy [1], WireGuard must be
written with a capital W and a capital G.

[1] https://www.wireguard.com/trademark-policy/

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 205f300 ]

* Update links to download scripts
* Tweak examples
* Update k8s-cilium-exec.sh to handle multiple containers in a pod
* Update k8s-get-cilium-pod.sh to handle non-standard cilium namespace

Signed-off-by: Tom Payne <tom@isovalent.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 83391b4 ]

As we can receive different type of namespace events, like difference in
the annotations. We can ignore all of these events unless the labels are
different.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 076f475 ]

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 415c624 ]

Remove request headers from response access logs, except for
'x-request-id', which is retained for request/response correlation
purposes.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit e6ae6fb ]

The logic to ignore errors is inverted and the errors are still being
printed as warnings. This commit inverts the logic so that only relevant
warnings are printed.

Fixes: 0ab4fa1 ("pkg/k8s: ignore certain ipcache errors")
Fixes: 465cac1 ("pkg/k8s: ignore overwrite source "custom-resource" with "k8s" errors")
Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet qmonnet requested review from a team as code owners May 26, 2021 17:12
@qmonnet qmonnet added backport/1.10 kind/backports This PR provides functionality previously merged into master. labels May 26, 2021
@qmonnet qmonnet requested a review from nathanjsweet May 26, 2021 17:12
@qmonnet
Copy link
Member Author

qmonnet commented May 26, 2021

My bad, switching to draft until #16269 is merged.

@qmonnet qmonnet marked this pull request as draft May 26, 2021 17:22
@pchaigno
Copy link
Member

pchaigno commented Jun 1, 2021

#16269 was merged, this needs a rebase. It should now also be possible to include #16274 and #16310 without much (any?) conflicts.

@pchaigno pchaigno added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Jun 1, 2021
@qmonnet
Copy link
Member Author

qmonnet commented Jun 1, 2021

Closing in favour of #16384.

@qmonnet qmonnet closed this Jun 1, 2021
@qmonnet qmonnet deleted the pr/v1.10-backport-2021-05-26 branch June 4, 2021 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants