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-10-02 #28350

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 28249 28225 28272; do contrib/backporting/set-labels.py $pr done 1.13; done

nbusseneau and others added 3 commits October 2, 2023 22:01
[ upstream commit 4f1f08e ]

The plague of copy/pasting strikes again...

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit c6fbeb1 ]

This target should completely ignore the existing contents of
`cilium/values.yaml` since we always generate from the template files.

Co-authored-by: Donia Chaiehloudj <donia.cld@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
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 11:04
@sayboras sayboras 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 Oct 2, 2023
@sayboras
Copy link
Member Author

sayboras commented Oct 2, 2023

/test-backport-1.13

@sayboras
Copy link
Member Author

sayboras commented Oct 2, 2023

All required CI jobs are passed, reviews are in. 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 2, 2023
@sayboras
Copy link
Member Author

sayboras commented Oct 3, 2023

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

@aanm aanm merged commit 3191c23 into cilium:v1.13 Oct 3, 2023
60 of 61 checks passed
@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
@sayboras sayboras deleted the pr/v1.13-backport-2023-10-02 branch October 3, 2023 13:10
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

3 participants