sysdump: Add more envoy resource types #1756
Merged
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
|
Commit 709faa2 does not contain "Signed-off-by". Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin |
sayboras
force-pushed
the
tam/envoy-unmarshal
branch
from
709faa2
to
7d2209c
Compare
|
Commit 709faa2 does not contain "Signed-off-by". Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin |
sayboras
force-pushed
the
tam/envoy-unmarshal
branch
from
7d2209c
to
d0ec11e
Compare
This is to fix the issue in which CEC resources are unable to unmarshal
to json due to missing registered type. Please find below one of the
example failure.
```
馃攳 Collecting the Cilium SPIRE agent daemonset
馃攳 Collecting the Cilium SPIRE agent configuration
level=warning msg="Ignoring invalid CiliumEnvoyConfig JSON (proto: (line 1:405): unable to resolve \"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router\": \"not found\"): {\n\t\"@type\": \"type.googleapis.com/envoy.config.listener.v3.Listener\",\n\t\"filterChains\": [\n\t\t{\n\t\t\t\"filterChainMatch\": {\n\t\t\t\t\"transportProtocol\": \"raw_buffer\"\n\t\t\t},\n\t\t\t\"filters\": [\n\t\t\t\t{\n\t\t\t\t\t\"name\": \"envoy.filters.network.http_connection_manager\",\n\t\t\t\t\t\"typedConfig\": {\n\t\t\t\t\t\t\"@type\": \"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager\",\n\t\t\t\t\t\t\"httpFilters\": [\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\"name\": \"envoy.filters.http.router\",\n\t\t\t\t\t\t\t\t\"typedConfig\": {\n\t\t\t\t\t\t\t\t\t\"@type\": \"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router\"\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t],\n\t\t\t\t\t\t\"rds\": {\n\t\t\t\t\t\t\t\"routeConfigName\": \"listener-insecure\"\n\t\t\t\t\t\t},\n\t\t\t\t\t\t\"statPrefix\": \"listener-insecure\",\n\t\t\t\t\t\t\"upgradeConfigs\": [\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\"upgradeType\": \"websocket\"\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t],\n\t\t\t\t\t\t\"useRemoteAddress\": true\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t]\n\t\t}\n\t],\n\t\"listenerFilters\": [\n\t\t{\n\t\t\t\"name\": \"envoy.filters.listener.tls_inspector\",\n\t\t\t\"typedConfig\": {\n\t\t\t\t\"@type\": \"type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector\"\n\t\t\t}\n\t\t}\n\t],\n\t\"name\": \"listener\",\n\t\"socketOptions\": [\n\t\t{\n\t\t\t\"description\": \"Enable TCP keep-alive (default to enabled)\",\n\t\t\t\"intValue\": \"1\",\n\t\t\t\"level\": \"1\",\n\t\t\t\"name\": \"9\",\n\t\t\t\"state\": \"STATE_LISTENING\"\n\t\t},\n\t\t{\n\t\t\t\"description\": \"TCP keep-alive idle time (in seconds) (defaults to 10s)\",\n\t\t\t\"intValue\": \"10\",\n\t\t\t\"level\": \"6\",\n\t\t\t\"name\": \"4\",\n\t\t\t\"state\": \"STATE_LISTENING\"\n\t\t},\n\t\t{\n\t\t\t\"description\": \"TCP keep-alive probe intervals (in seconds) (defaults to 5s)\",\n\t\t\t\"intValue\": \"5\",\n\t\t\t\"level\": \"6\",\n\t\t\t\"name\": \"5\",\n\t\t\t\"state\": \"STATE_LISTENING\"\n\t\t},\n\t\t{\n\t\t\t\"description\": \"TCP keep-alive probe max failures.\",\n\t\t\t\"intValue\": \"10\",\n\t\t\t\"level\": \"6\",\n\t\t\t\"name\": \"6\",\n\t\t\t\"state\": \"STATE_LISTENING\"\n\t\t}\n\t]\n}" subsys=k8s-apis-cilium.io-v2
...
```
Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
force-pushed
the
tam/envoy-unmarshal
branch
from
d0ec11e
to
3ae4a0f
Compare
michi-covalent
approved these changes
Jun 23, 2023
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 24, 2023
This is to avoid any potential Relates: cilium#1756
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 24, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 24, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 24, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 24, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Relates: cilium/cilium#26469 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 28, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Relates: cilium/cilium#26469 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 30, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Relates: cilium/cilium#26469 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 30, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Relates: cilium/cilium#26469 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 30, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
to sayboras/cilium-cli
that referenced
this pull request
Jun 30, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: cilium#1756 Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added a commit
that referenced
this pull request
Jun 30, 2023
This is to avoid the similar happening again in the future, when we add more envoy resource types. Relates: #1756 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
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.
Description
This is to fix the issue in which CEC resources are unable to unmarshal to json due to missing registered type. Please find below one of the example failures.