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.14 backports 2023-10-02 #28349

Merged
merged 3 commits into from Oct 3, 2023
Merged

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Oct 2, 2023

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

$ for pr in 27926 28305 28272; do contrib/backporting/set-labels.py $pr done 1.14; done

PhilipSchmid and others added 3 commits October 2, 2023 21:46
[ upstream commit dde4722 ]

- Improved description for tunnel, tunnelProtocol, routingMode flags to make it clearer for users to know the possible values.
- Added deprecation note for the tunnel flag to be in line with the v1.14.0 release notes and cilium#24561.

Signed-off-by: Philip Schmid <philip.schmid@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 682038d ]

Also, remove setting custom nameserver
(cilium/little-vm-helper-images#186).

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit cc56e70 ]

These resources are enabled in cilum-proxy build, and can be used in
CiliumEnvoyConfig directly, however, without related imported
statements, Cilium agent will fail to marshal/unmarshal objects.

Sample error

```
level=warning msg="Ignoring invalid CiliumEnvoyConfig JSON (proto:\u00a0(line 1:405): unable to resolve \"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router\": \"not found\")
```

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras requested a review from a team as a code owner October 2, 2023 10:56
@sayboras sayboras added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Oct 2, 2023
@sayboras
Copy link
Member Author

sayboras commented Oct 2, 2023

/test-backport-1.14

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!

@sayboras
Copy link
Member Author

sayboras commented Oct 3, 2023

Reviews are in, CI is superb, marking this ready to merge.

@sayboras sayboras added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 3, 2023
@aanm aanm merged commit af3d172 into cilium:v1.14 Oct 3, 2023
58 checks passed
@sayboras sayboras deleted the pr/v1.14-backport-2023-10-02 branch October 3, 2023 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.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

4 participants