Skip to content

Conversation

jibi
Copy link
Member

@jibi jibi commented May 31, 2022

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

$ for pr in 16647 19885 19888 19886 19856 19927 19809 19893 19930 19955; do contrib/backporting/set-labels.py $pr done 1.10; done

or with

$ make add-label BRANCH=v1.10 ISSUES=16647,19885,19888,19886,19856,19927,19809,19893,19930,19955

pchaigno and others added 2 commits May 31, 2022 10:14
[ upstream commit c88244c ]

We encoded the SPI (aka keyID) on 4 bits [1] in the xfrm and packet
marks. The maximum value is therefore 15 and not 16. This commit fixes
the check on the maximum keyID value.

Note the documentation for IPsec key rotation already has the correct
value [2] so there shouldn't be any users with an incorrect keyID.

1 - https://github.com/cilium/cilium/blob/v1.10.1/pkg/datapath/linux/ipsec/ipsec_linux.go#L147-L150
2 - https://docs.cilium.io/en/v1.10/gettingstarted/encryption-ipsec/#key-rotation
Fixes: b698972 ("cilium: ipsec, support rolling updates")
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 70676ec ]

With "make render-docs-live-preview", we use the cilium/docs-builder
image to build a preview of the documentation, to serve it locally, and
to watch the source files for changes to update automatically the
preview.

When the Docker image is present locally, the command uses it. When this
is not the case, it pulls it from Docker, in its ":latest" version by
default. This can be an issue due to commit 0da7224 ("ci: pin down
image for documentation workflow"), where we pinned down the
docs-builder image to use in the CI. Since this commit, the reference
image is not longer ":latest", but the tag in use in the CI files. As a
consequence, the live preview may attempt to use an outdated version of
the image. This is currently the case: running the command with no local
image raises an error about a missing "myst_parser" extension, which is
not present on the version tagged with ":latest".

To fix this, we mark builder-image as a dependency for the
render-docs-live-preview target, so that the image gets built locally.

Reported-by: Yoyo Wu <yoyo19980720@163.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
@jibi jibi requested review from a team as code owners May 31, 2022 08:19
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.10 kind/backports This PR provides functionality previously merged into master. labels May 31, 2022
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

My PRs look good. Thanks!

Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

Looks good for my commits and thanks 💯

Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

  • #19885 -- docs: Add docs-builder build as dependency to live preview (@qmonnet)
  • #19888 -- docs: Remove '\r' chars from grep result to parse Alpine image name (@qmonnet)
    • small conflict as the builder-image command was slightly different

Good to me, they look. Thanks!

Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Backport of my PR looks good. Thanks!

qmonnet and others added 8 commits May 31, 2022 14:00
[ upstream commit f17a17a ]

The first step for building the cilium/docs-builder image, used for
building Cilium's documentation, consists in pre-pulling the image with
Docker (to avoid failures from buildkit). The relevant command is formed
by parsing the name of the Alpine image from the Dockerfile.

On some setups, for example on Ubuntu running in Windows WSL with the
Cilium repository mounted from a Windows partition, the Dockerfile may
contain DOS-style line breaks (CR-LF). The result from "grep" being
piped to xargs and passed to "docker pull", we get an error because
Docker cannot recognise a valid reference with this '\r' character at
the end of the string. Let's remove any carriage return characters
before feeding the line to xargs.

Reported-by: Yoyo Wu <yoyo19980720@163.com>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 0b58178 ]

Configure the peerService to access hubble on the
hubble.peerService.targetPort rather than determining the port from
hubble.listenAddress which may be empty when using a sidecar to proxy to hubble.

Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit b13dc89 ]

The tc command prints out information not shown by bpftool.
As well, it is possible that we may need information about
tc entities that are not managed by Cilium when debugging
Cilium issues.

This adds extra bugtool commands to be run with cilium-bugtool.
Including listing tc qdisc and getting filter/class/chain info
for all network interfaces.

Fixes: #17468

Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 80092ce ]

Since commit 67f74ff ("images/cilium: remove cilium group from
Dockerfile") the cilium group is no longer created in the image running
the agent, resulting in the following log message on cilium-agent start:

level=info msg="Group not found" error="group: unknown group cilium" file-path=/var/run/cilium/cilium.sock group=cilium subsys=api

Change the log message to debug level to avoid confusion.

Suggested-by: André Martins <andre@cilium.io>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 2926892 ]

Signed-off-by: Vlad Ungureanu <ungureanuvladvictor@gmil.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 54d708e ]

The SPI value is expected to take 4 bits at most so it's maximum value
should be 15 not 16. Let's fix that in the key rotation documentation.

The agent also rejects value 0, so allowed values are [1;15].

Reported-by: Odin Ugedal via Slack
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 9c6e424 ]

Fixes: f6ce522 ("FQDN: Added garbage collector functions.")
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 070ded0 ]

The previous PR #18478 wraps existing viper GetStringMapString function
to get around upstream bugs, however, it's unintentionally restricted a
few formats, which supported before in cilium, such as:

- --aws-instance-limit-mapping=c6a.2xlarge=4,15,15,m4.xlarge=1,5,10
- --api-rate-limit=endpoint-create=rate-limit:10/s,rate-burst:10,parallel-requests:10,auto-adjust:true

For complicated attribute, we are allowing comma character in value part
of key value pair. As golang didn't support look-ahead functionalities in
built-in regex library, this commit is to replace string.Split function
by custom implementation to handle such scenario.

Relates: #18478
Fixes: #18973
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
@jibi jibi force-pushed the pr/v1.10-backport-2022-05-31 branch from 5b5143b to 189b5bf Compare May 31, 2022 12:01
@jibi
Copy link
Member Author

jibi commented May 31, 2022

/test-backport-1.10

Copy link
Contributor

@chancez chancez left a comment

Choose a reason for hiding this comment

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

Peer service changes look good.

Copy link
Member

@ungureanuvladvictor ungureanuvladvictor left a comment

Choose a reason for hiding this comment

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

@joamaki
Copy link
Contributor

joamaki commented Jun 3, 2022

/test-backport-1.10

@joamaki
Copy link
Contributor

joamaki commented Jun 3, 2022

/test-gke

@joamaki
Copy link
Contributor

joamaki commented Jun 7, 2022

/test-backport-1.10

@joamaki
Copy link
Contributor

joamaki commented Jun 7, 2022

Backport tests pass, merging.

@joamaki joamaki merged commit f4b2e1d into v1.10 Jun 7, 2022
@joamaki joamaki deleted the pr/v1.10-backport-2022-05-31 branch June 7, 2022 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants