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.13 Backports 2023-07-19 #26915

Merged
merged 5 commits into from
Jul 19, 2023
Merged

v1.13 Backports 2023-07-19 #26915

merged 5 commits into from
Jul 19, 2023

Conversation

gandro
Copy link
Member

@gandro gandro commented Jul 19, 2023

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

for pr in 26874 26812 26883 26797 26856; do contrib/backporting/set-labels.py $pr done 1.13; done

or with

make add-labels BRANCH=v1.13 ISSUES=26874,26812,26883,26797,26856

michi-covalent and others added 5 commits July 19, 2023 08:09
[ 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 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>
[ upstream commit e06e70e ]

Revert commit 04d48fe, and pick up PyYAML 6.0.1.

Fixes: #26873

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 57249b1 ]

Signed-off-by: toVersus <toversus2357@gmail.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit b10d096 ]

Otherwise, when the IPv6 is disabled, the check-log-errors fails with:

    Error while inserting service in LB map" error="Unable to upsert
    service [fd00:10:96::8f2f]:8080 as IPv6 is disabled"
    k8sNamespace=cilium-test k8sSvcName=echo-same-node

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Jul 19, 2023
@gandro gandro marked this pull request as ready for review July 19, 2023 08:13
@gandro gandro requested review from a team as code owners July 19, 2023 08:13
@gandro
Copy link
Member Author

gandro commented Jul 19, 2023

/test-backport-1.13

Edit:

Copy link
Contributor

@viktor-kurchenko viktor-kurchenko left a comment

Choose a reason for hiding this comment

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

LGTM.

@gandro
Copy link
Member Author

gandro commented Jul 19, 2023

  • test-1.26-net-next failed all over the place. I'm not exactly sure why, as previous runs on the branch were fine and there are really no significant changes to the agent. Inspecting the logs also doesn't yield anything of note (e.g. such as a complexity issue). I'm restarting

@gandro
Copy link
Member Author

gandro commented Jul 19, 2023

/test-1.26-net-next

Copy link
Contributor

@michi-covalent michi-covalent left a comment

Choose a reason for hiding this comment

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

wonderful

Copy link
Member

@brb brb left a comment

Choose a reason for hiding this comment

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

Thanks!

@gandro gandro merged commit ea7a1c6 into v1.13 Jul 19, 2023
115 checks passed
@gandro gandro deleted the pr/v1.13-backport-2023-07-19 branch July 19, 2023 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. 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

6 participants