Skip to content

Commit

Permalink
fix(policies): adjust MeshTrace to follow the memo (#5743)
Browse files Browse the repository at this point in the history 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Charly Molter <charly.molter@konghq.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Charly Molter <charly.molter@konghq.com>
  • Loading branch information
@lobkovilya @github-actions @lahabana
3 people authored Jan 19, 2023
1 parent 4bb9d2c commit 60024ab
Show file tree
Hide file tree
Showing 20 changed files with 433 additions and 149 deletions.
14 changes: 12 additions & 2 deletions app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2419,13 +2419,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 @@ -2437,9 +2443,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 @@ -2489,15 +2496,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
Original file line number Diff line number Diff line change
Expand Up @@ -2419,13 +2419,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 @@ -2437,9 +2443,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 @@ -2489,15 +2496,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
Original file line number Diff line number Diff line change
Expand Up @@ -2551,13 +2551,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 @@ -2569,9 +2575,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 @@ -2621,15 +2628,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
Original file line number Diff line number Diff line change
Expand Up @@ -2439,13 +2439,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 @@ -2457,9 +2463,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 @@ -2509,15 +2516,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
Original file line number Diff line number Diff line change
Expand Up @@ -3545,13 +3545,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 @@ -3563,9 +3569,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 @@ -3615,15 +3622,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
Original file line number Diff line number Diff line change
Expand Up @@ -3677,13 +3677,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 @@ -3695,9 +3701,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 @@ -3747,15 +3754,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
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
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
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
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

0 comments on commit 60024ab

Please sign in to comment.