v1.14 Backports 2023-07-18 #26887
Merged
v1.14 Backports 2023-07-18 #26887
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 1543c46 ] This is to include the fix for the below CVE. CVE: GHSA-jfxv-29pc-x22r GHA build: https://github.com/cilium/proxy/actions/runs/5548261876/jobs/10131017073 Signed-off-by: Tam Mach <tam.mach@cilium.io> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 1c18f5c ] We recently dropped usage of Jenkins for the main CI workloads in the Cilium repository in favour of running the same ginkgo jobs directly in GitHub Actions workflows. Remove the documentation for the older Jenkins systems. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 5f3e24c ] Add an initial breakdown of the types of tests and how they are triggered so that newer contributors can more easily understand what's going on in CI and how to interact with it. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit cfaa674 ] This was functionally mostly provided by CiliumCIDRSet in v1.14. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 87cda2d ] When using CILIUM_CLI_MODE=helm (which is the default as of cilium-cli v0.15.0), the --rollback option is no longer available. Omit it from commands. Also include the already existing cilium-cli download and installation instructions. Signed-off-by: Tobias Klauser <tobias@cilium.io> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 04d48fe ] Use this workaround until the issue gets fixed: yaml/pyyaml#601 (comment) Signed-off-by: Michi Mutsuzaki <michi@isovalent.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 0a9b289 ] Signed-off-by: Nico Vibert <nicolas.vibert@isovalent.com> Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 98003d5 ] As with all other `*-ci` images, we should not use check the digest when pulling the image, as it is different for CI builds. On `main` this has not been an issue, because `useDigest` already defaults to `false`, but on release branches (such as `v1.14`), we do check the digest by default. This caused failing workflows on the v1.14 branch which should be fixed by this commit. Reported-by: Joe Stringer <joe@cilium.io> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 0bf7cc5 ] Only configure GetClientCertificate if client keypair is configured, allowing servers to Request ClientCertificates without requiring them. In docs for `GetClientCertificate` it specifies: > GetClientCertificate must return a non-nil Certificate. If > Certificate.Certificate is empty then no certificate will be sent to the > server. If a nil certificate is sent when the server requests a client certificate, the client will return an error. Instead, only configure GetClientCertificate if certificates are provided and the server may choose to how to handle the lack of a client certificate. This is needed primarily for when the server is using RequestClientCert, which requests a certificate, but does not require the client to send one. Previously, you would see this log message: ``` transport: authentication handshake failed: mTLS client certificate requested, but not provided ``` Now, if a server requires a client certificate it should reject the TLS connection and the client will receive the error from the server. Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
maintainer-s-little-helper
bot
added
backport/1.14
|
/test-backport-1.14 |
joestringer
approved these changes
Jul 18, 2023
nvibert
approved these changes
Jul 18, 2023
chancez
approved these changes
Jul 18, 2023
christarazi
approved these changes
Jul 18, 2023
gandro
added
the
ready-to-merge
|
All reviews are in and CI is as green as it's going to get. Marking as ready to merge. |
maintainer-s-little-helper
bot
removed
the
ready-to-merge
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.
useDigest=falsefor Hubble Relay #26869 (@gandro)Once this PR is merged, you can update the PR labels via:
or with