From 3d7140c1221c9a7e295c6405c4bc184f85dba99e Mon Sep 17 00:00:00 2001
From: Josune Cordoba <49480155+josunect@users.noreply.github.com>
Date: Tue, 5 Dec 2023 14:51:14 +0000
Subject: [PATCH] Add new settings for the otel collector (#728)

* Add new settings for the OTel collector

---------

Co-authored-by: John Mazzitelli <mazz@redhat.com>
---
 crd-docs/cr/kiali.io_v1alpha1_kiali.yaml     | 3 +++
 crd-docs/crd/kiali.io_kialis.yaml            | 9 +++++++++
 roles/default/kiali-deploy/defaults/main.yml | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml
index 0796aa3f..49ba7032 100644
--- a/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml
+++ b/crd-docs/cr/kiali.io_v1alpha1_kiali.yaml
@@ -452,7 +452,10 @@ spec:
         collector_url: "http://jaeger-collector.istio-system:14268/api/traces"
         enabled: false
         otel:
+          ca_name: ""
           protocol: "http"
+          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 cbdfca8f..2a04a04c 100644
--- a/crd-docs/crd/kiali.io_kialis.yaml
+++ b/crd-docs/crd/kiali.io_kialis.yaml
@@ -1297,9 +1297,18 @@ spec:
                             description: "Specific properties when the collector type is `otel`."
                             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
+                              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 2eefb169..29e99c06 100644
--- a/roles/default/kiali-deploy/defaults/main.yml
+++ b/roles/default/kiali-deploy/defaults/main.yml
@@ -336,7 +336,10 @@ kiali_defaults:
         collector_url: http://jaeger-collector.istio-system:14268/api/traces
         enabled: false
         otel:
+          ca_name: ""
           protocol: "http"
+          skip_verify: false
+          tls_enabled: false
     port: 20001
     web_fqdn: ""
     web_history_mode: ""