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

envoy: Sync supported resources in CiliumEnvoyConfig #28272

Merged
merged 1 commit into from Sep 29, 2023

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Sep 26, 2023

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\")
envoy: Sync supported resources to fix not found issue

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 review from a team as code owners September 26, 2023 02:54
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Sep 26, 2023
@sayboras sayboras added area/proxy Impacts proxy components, including DNS, Kafka, Envoy and/or XDS servers. release-note/misc This PR makes changes that have no direct user impact. dependencies Pull requests that update a dependency file labels Sep 26, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Sep 26, 2023
sayboras added a commit to sayboras/cilium-cli that referenced this pull request Sep 26, 2023
This is mainly to get the changes from below PR.

Relates: cilium/cilium#28272
Signed-off-by: Tam Mach <tam.mach@cilium.io>
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.

LGTM

@sayboras
Copy link
Member Author

/test

Copy link
Member

@pippolo84 pippolo84 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 sayboras added the needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch label Sep 29, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.3 Sep 29, 2023
@sayboras sayboras added needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Sep 29, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.8 Sep 29, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.12.15 Sep 29, 2023
Copy link
Member

@rolinh rolinh left a comment

Choose a reason for hiding this comment

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

Vendor changes lgtm.

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 29, 2023
@sayboras sayboras merged commit cc56e70 into main Sep 29, 2023
255 checks passed
@sayboras sayboras deleted the tam/sync-envoy-resources branch September 29, 2023 12:45
sayboras added a commit to sayboras/cilium-cli that referenced this pull request Sep 29, 2023
This is mainly to get the changes from below PR.

Relates: cilium/cilium#28272
Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras added a commit to sayboras/cilium-cli that referenced this pull request Sep 30, 2023
This is mainly to get the changes from below PR.

Relates: cilium/cilium#28272
Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras added a commit to sayboras/cilium-cli that referenced this pull request Sep 30, 2023
This is mainly to get the changes from below PR.

Relates: cilium/cilium#28272
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras mentioned this pull request Oct 2, 2023
3 tasks
@sayboras sayboras mentioned this pull request Oct 2, 2023
3 tasks
@sayboras sayboras added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.13 in 1.13.8 Oct 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.3 Oct 2, 2023
@sayboras sayboras mentioned this pull request Oct 2, 2023
2 tasks
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.15 Oct 2, 2023
@aanm aanm added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Oct 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.3 Oct 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.3 Oct 3, 2023
@sayboras sayboras added kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. and removed release-note/misc This PR makes changes that have no direct user impact. labels Oct 3, 2023
@aanm aanm added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Oct 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.13 to Backport done to v1.13 in 1.13.8 Oct 3, 2023
@julianwiedmann julianwiedmann added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.12 labels Oct 5, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Backport done to v1.12 in 1.12.15 Oct 5, 2023
sayboras added a commit to sayboras/cilium-cli that referenced this pull request Oct 6, 2023
This is mainly to get the changes from below PR.

Relates: cilium/cilium#28272
Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras added a commit to sayboras/cilium-cli that referenced this pull request Oct 9, 2023
This is mainly to get the changes from below PR. Also, syncing up the
replace directive statements from cilium/cilium as well.

Relates: cilium/cilium#28272
Signed-off-by: Tam Mach <tam.mach@cilium.io>
michi-covalent pushed a commit to cilium/cilium-cli that referenced this pull request Oct 9, 2023
This is mainly to get the changes from below PR. Also, syncing up the
replace directive statements from cilium/cilium as well.

Relates: cilium/cilium#28272
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/proxy Impacts proxy components, including DNS, Kafka, Envoy and/or XDS servers. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. dependencies Pull requests that update a dependency file kind/bug This is a bug in the Cilium logic. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.12.15
Backport done to v1.12
1.13.8
Backport done to v1.13
1.14.3
Backport done to v1.14
Development

Successfully merging this pull request may close these issues.

None yet

6 participants