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.

Sign up for GitHub

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

fix: adjust MeshTrace to follow the memo #5743

Merged
merged 5 commits into from
Jan 19, 2023
Merged

fix: adjust MeshTrace to follow the memo #5743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14946c0
fix: adjust MeshTrace to follow the memo
lobkovilya Jan 17, 2023
b2328dd
fix: update golden
lobkovilya Jan 17, 2023
ad6d42b
fix(ci): format files
github-actions[bot] Jan 18, 2023
064249f
make apiVersion an enum
lahabana Jan 18, 2023
9b6f807
Merge branch 'master' into fix/adjust-mt
lahabana Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,13 +2375,19 @@ spec:
description: Address of Datadog collector, only host
and port are allowed (no paths, fragments etc.)
type: string
required:
- url
type: object
zipkin:
description: Zipkin backend configuration.
properties:
apiVersion:
default: httpJson
description: 'Version of the API. values: httpJson,
httpProto. Default: httpJson see https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L66'
enum:
- httpJson
- httpProto
type: string
sharedSpanContext:
description: 'Determines whether client and server spans
Expand All @@ -2393,9 +2399,10 @@ spec:
url:
description: Address of Zipkin collector.
type: string
required:
- url
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -2445,15 +2452,18 @@ spec:
name:
description: Name of the header.
type: string
required:
- name
type: object
literal:
description: Tag taken from literal value.
type: string
name:
description: Name of the tag.
type: string
required:
- name
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down
14 changes: 12 additions & 2 deletions app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present-not-enabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,13 +2375,19 @@ spec:
description: Address of Datadog collector, only host
and port are allowed (no paths, fragments etc.)
type: string
required:
- url
type: object
zipkin:
description: Zipkin backend configuration.
properties:
apiVersion:
default: httpJson
description: 'Version of the API. values: httpJson,
httpProto. Default: httpJson see https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L66'
enum:
- httpJson
- httpProto
type: string
sharedSpanContext:
description: 'Determines whether client and server spans
Expand All @@ -2393,9 +2399,10 @@ spec:
url:
description: Address of Zipkin collector.
type: string
required:
- url
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -2445,15 +2452,18 @@ spec:
name:
description: Name of the header.
type: string
required:
- name
type: object
literal:
description: Tag taken from literal value.
type: string
name:
description: Name of the tag.
type: string
required:
- name
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down
14 changes: 12 additions & 2 deletions app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2507,13 +2507,19 @@ spec:
description: Address of Datadog collector, only host
and port are allowed (no paths, fragments etc.)
type: string
required:
- url
type: object
zipkin:
description: Zipkin backend configuration.
properties:
apiVersion:
default: httpJson
description: 'Version of the API. values: httpJson,
httpProto. Default: httpJson see https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L66'
enum:
- httpJson
- httpProto
type: string
sharedSpanContext:
description: 'Determines whether client and server spans
Expand All @@ -2525,9 +2531,10 @@ spec:
url:
description: Address of Zipkin collector.
type: string
required:
- url
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -2577,15 +2584,18 @@ spec:
name:
description: Name of the header.
type: string
required:
- name
type: object
literal:
description: Tag taken from literal value.
type: string
name:
description: Name of the tag.
type: string
required:
- name
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down
14 changes: 12 additions & 2 deletions app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2395,13 +2395,19 @@ spec:
description: Address of Datadog collector, only host
and port are allowed (no paths, fragments etc.)
type: string
required:
- url
type: object
zipkin:
description: Zipkin backend configuration.
properties:
apiVersion:
default: httpJson
description: 'Version of the API. values: httpJson,
httpProto. Default: httpJson see https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L66'
enum:
- httpJson
- httpProto
type: string
sharedSpanContext:
description: 'Determines whether client and server spans
Expand All @@ -2413,9 +2419,10 @@ spec:
url:
description: Address of Zipkin collector.
type: string
required:
- url
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -2465,15 +2472,18 @@ spec:
name:
description: Name of the header.
type: string
required:
- name
type: object
literal:
description: Tag taken from literal value.
type: string
name:
description: Name of the tag.
type: string
required:
- name
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down
14 changes: 12 additions & 2 deletions app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3501,13 +3501,19 @@ spec:
description: Address of Datadog collector, only host
and port are allowed (no paths, fragments etc.)
type: string
required:
- url
type: object
zipkin:
description: Zipkin backend configuration.
properties:
apiVersion:
default: httpJson
description: 'Version of the API. values: httpJson,
httpProto. Default: httpJson see https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L66'
enum:
- httpJson
- httpProto
type: string
sharedSpanContext:
description: 'Determines whether client and server spans
Expand All @@ -3519,9 +3525,10 @@ spec:
url:
description: Address of Zipkin collector.
type: string
required:
- url
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -3571,15 +3578,18 @@ spec:
name:
description: Name of the header.
type: string
required:
- name
type: object
literal:
description: Tag taken from literal value.
type: string
name:
description: Name of the tag.
type: string
required:
- name
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down
14 changes: 12 additions & 2 deletions app/kumactl/cmd/install/testdata/install-crds.experimental-gatewayapi.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3633,13 +3633,19 @@ spec:
description: Address of Datadog collector, only host
and port are allowed (no paths, fragments etc.)
type: string
required:
- url
type: object
zipkin:
description: Zipkin backend configuration.
properties:
apiVersion:
default: httpJson
description: 'Version of the API. values: httpJson,
httpProto. Default: httpJson see https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L66'
enum:
- httpJson
- httpProto
type: string
sharedSpanContext:
description: 'Determines whether client and server spans
Expand All @@ -3651,9 +3657,10 @@ spec:
url:
description: Address of Zipkin collector.
type: string
required:
- url
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -3703,15 +3710,18 @@ spec:
name:
description: Name of the header.
type: string
required:
- name
type: object
literal:
description: Tag taken from literal value.
type: string
name:
description: Name of the tag.
type: string
required:
- name
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down
14 changes: 12 additions & 2 deletions deployments/charts/kuma/crds/kuma.io_meshtraces.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,19 @@ spec:
description: Address of Datadog collector, only host
and port are allowed (no paths, fragments etc.)
type: string
required:
- url
type: object
zipkin:
description: Zipkin backend configuration.
properties:
apiVersion:
default: httpJson
description: 'Version of the API. values: httpJson,
httpProto. Default: httpJson see https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L66'
enum:
- httpJson
- httpProto
type: string
sharedSpanContext:
description: 'Determines whether client and server spans
Expand All @@ -82,9 +88,10 @@ spec:
url:
description: Address of Zipkin collector.
type: string
required:
- url
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -134,15 +141,18 @@ spec:
name:
description: Name of the header.
type: string
required:
- name
type: object
literal:
description: Tag taken from literal value.
type: string
name:
description: Name of the tag.
type: string
required:
- name
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down
4 changes: 1 addition & 3 deletions pkg/api-server/testdata/inspect_dataplane_rules.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@
"url": "http://jaeger-collector.mesh-observability:9411/api/v2/spans"
}
}
],
"sampling": {},
"tags": null
]
},
"origins": [
{
Expand Down
1 change: 0 additions & 1 deletion pkg/core/xds/testdata/rules/06.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Rules:
backends:
- zipkin:
url: http://jaeger-collector.mesh-observability:9411/api/v2/spans
sampling: {}
tags:
- literal: core
name: team
Expand Down
1 change: 0 additions & 1 deletion pkg/core/xds/testdata/rules/07.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Rules:
backends:
- datadog:
url: http://ingest.datadoghq.eu:8126
sampling: {}
tags:
- literal: support
name: team
Expand Down
Loading