diff --git a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml index 49ba7032..6e15b29e 100644 --- a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml +++ b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml @@ -448,14 +448,13 @@ spec: enabled: true port: 9090 tracing: - collector_type: "jaeger" - collector_url: "http://jaeger-collector.istio-system:14268/api/traces" + collector_url: "jaeger-collector.istio-system:4318" enabled: false - otel: + protocol: "http" + tls_config: ca_name: "" - protocol: "http" + enabled: false skip_verify: false - tls_enabled: false port: 20001 web_fqdn: "" web_history_mode: "" diff --git a/crd-docs/crd/kiali.io_kialis.yaml b/crd-docs/crd/kiali.io_kialis.yaml index 2a04a04c..a0b2f00c 100644 --- a/crd-docs/crd/kiali.io_kialis.yaml +++ b/crd-docs/crd/kiali.io_kialis.yaml @@ -1284,31 +1284,28 @@ spec: description: "Settings that control how the Kiali server itself emits its own tracing data." type: object properties: - collector_type: - description: "The collector type to use. Value must be one of: `jaeger` or `otel`." - type: string collector_url: description: "The URL used to determine where the Kiali server tracing data will be stored." type: string enabled: description: "When true, the Kiali server itself will product its own tracing data." type: boolean - otel: - description: "Specific properties when the collector type is `otel`." + protocol: + description: "Protocol. Supported values are: `http`, `https` or `grpc`." + type: string + tls_config: + description: "Specific tls properties when `tls_enabled` is `true`." type: object properties: ca_name: description: "The name of the CA cert; this is used when `tls_enabled` is `true` and `skip_verify` is `false`." type: string - protocol: - description: "Protocol. Supported values are: `http`, `https` or `grpc`." - type: string + enabled: + description: "Enable TLS for the collector. This must be specified when `protocol` is `https` or `grpc`. When you set this to `true`, you must also set a `ca_name` or set `skip_verify` to true." + type: boolean skip_verify: description: "If true, TLS certificate verification will not be performed. This is an unsecure option and is recommended only for testing." type: boolean - tls_enabled: - description: "Enable TLS for the collector. This must be specified when `protocol` is `https` or `grpc`. When you set this to `true`, you must also set a `ca_name` or set `skip_verify` to true." - type: boolean port: description: "The port that the server will bind to in order to receive console and API requests." type: integer diff --git a/roles/default/kiali-deploy/defaults/main.yml b/roles/default/kiali-deploy/defaults/main.yml index 29e99c06..73bb1fe9 100644 --- a/roles/default/kiali-deploy/defaults/main.yml +++ b/roles/default/kiali-deploy/defaults/main.yml @@ -332,14 +332,13 @@ kiali_defaults: enabled: true port: 9090 tracing: - collector_type: "jaeger" - collector_url: http://jaeger-collector.istio-system:14268/api/traces + collector_url: jaeger-collector.istio-system:4318 enabled: false - otel: + protocol: "http" + tls_config: ca_name: "" - protocol: "http" + enabled: false skip_verify: false - tls_enabled: false port: 20001 web_fqdn: "" web_history_mode: ""