Add support for tracing-service-insecure

Kuadrant · Feb 1, 2024 · ac6dd3f · ac6dd3f
1 parent dbeb036
commit ac6dd3f
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -182,10 +182,11 @@ Port numbers of the authorization server.
 
 Configuration of the OpenTelemetry tracing exporter.
 
-| Field    |  Type  | Description                                                                                         | Required/Default |
-|----------|:------:|-----------------------------------------------------------------------------------------------------|------------------|
-| endpoint | String | Full endpoint of the OpenTelemetry tracing collector service (e.g. http://jaeger:14268/api/traces). | Required         |
-| tags     |  Map   | Key-value map of fixed tags to add to all OpenTelemetry traces emitted by Authorino.                | Optional         |
+| Field    |  Type   | Description                                                                                         | Required/Default |
+|----------|:-------:|-----------------------------------------------------------------------------------------------------|------------------|
+| endpoint | String  | Full endpoint of the OpenTelemetry tracing collector service (e.g. http://jaeger:14268/api/traces). | Required         |
+| tags     |  Map    | Key-value map of fixed tags to add to all OpenTelemetry traces emitted by Authorino.                | Optional         |
+| insecure | Boolean | Enable/disable insecure connection to the tracing endpoint                                          | Default: `false` |
 
 #### Metrics
 

diff --git a/api/v1beta1/authorino_types.go b/api/v1beta1/authorino_types.go
@@ -105,6 +105,7 @@ type Ports struct {
 type Tracing struct {
 	Endpoint string            `json:"endpoint"`
 	Tags     map[string]string `json:"tags,omitempty"`
+	Insecure bool              `json:"insecure,omitempty"`
 }
 
 type Metrics struct {

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/operator.authorino.kuadrant.io_authorinos.yaml b/bundle/manifests/operator.authorino.kuadrant.io_authorinos.yaml
@@ -144,6 +144,8 @@ spec:
                 properties:
                   endpoint:
                     type: string
+                  insecure:
+                    type: boolean
                   tags:
                     additionalProperties:
                       type: string

diff --git a/config/crd/bases/operator.authorino.kuadrant.io_authorinos.yaml b/config/crd/bases/operator.authorino.kuadrant.io_authorinos.yaml
@@ -146,6 +146,8 @@ spec:
                 properties:
                   endpoint:
                     type: string
+                  insecure:
+                    type: boolean
                   tags:
                     additionalProperties:
                       type: string

diff --git a/config/deploy/manifests.yaml b/config/deploy/manifests.yaml
@@ -5545,6 +5545,8 @@ spec:
                 properties:
                   endpoint:
                     type: string
+                  insecure:
+                    type: boolean
                   tags:
                     additionalProperties:
                       type: string

diff --git a/config/install/manifests.yaml b/config/install/manifests.yaml
@@ -144,6 +144,8 @@ spec:
                 properties:
                   endpoint:
                     type: string
+                  insecure:
+                    type: boolean
                   tags:
                     additionalProperties:
                       type: string

diff --git a/controllers/authorino_controller.go b/controllers/authorino_controller.go
@@ -380,12 +380,15 @@ func (r *AuthorinoReconciler) buildAuthorinoArgs(authorino *api.Authorino) []str
 		args = append(args, fmt.Sprintf("--%s=%d", flagEvaluatorCacheSize, *evaluatorCacheSize))
 	}
 
-	// tracing-service-endpoint and tracing-service-tag
+	// tracing-service-endpoint, tracing-service-tag, and tracing-service-insecure
 	if tracingServiceEndpoint := authorino.Spec.Tracing.Endpoint; tracingServiceEndpoint != "" {
 		args = append(args, fmt.Sprintf("--%s=%s", flagTracingServiceEndpoint, tracingServiceEndpoint))
 		for key, value := range authorino.Spec.Tracing.Tags {
 			args = append(args, fmt.Sprintf(`--%s="%s=%s"`, flagTracingServiceTag, key, value))
 		}
+		if authorino.Spec.Tracing.Insecure {
+			args = append(args, fmt.Sprintf(`--%s`, flagTracingServiceInsecure))
+		}
 	}
 
 	// deep-metrics-enabled

diff --git a/controllers/authorino_controller_test.go b/controllers/authorino_controller_test.go
@@ -302,6 +302,7 @@ func newFullAuthorinoInstance() *api.Authorino {
 					"env":     "test",
 					"version": "1.0.0",
 				},
+				Insecure: true,
 			},
 		},
 	}
@@ -354,6 +355,8 @@ func checkAuthorinoArgs(authorinoInstance *api.Authorino, args []string) {
 			kv := strings.Split(strings.TrimPrefix(strings.TrimSuffix(value, `"`), `"`), "=")
 			Expect(len(kv)).Should(Equal(2))
 			Expect(kv[1]).Should(Equal(authorinoInstance.Spec.Tracing.Tags[kv[0]]))
+		case flagTracingServiceInsecure:
+			Expect(authorinoInstance.Spec.Tracing.Insecure).Should(BeTrue())
 		case flagDeepMetricsEnabled:
 			Expect(authorinoInstance.Spec.Metrics.DeepMetricsEnabled).ShouldNot(BeNil())
 			Expect(*authorinoInstance.Spec.Metrics.DeepMetricsEnabled).Should(BeTrue())

diff --git a/controllers/constants.go b/controllers/constants.go
@@ -47,6 +47,7 @@ const (
 	flagEvaluatorCacheSize             string = "evaluator-cache-size"
 	flagTracingServiceEndpoint         string = "tracing-service-endpoint"
 	flagTracingServiceTag              string = "tracing-service-tag"
+	flagTracingServiceInsecure         string = "tracing-service-insecure"
 	flagDeepMetricsEnabled             string = "deep-metrics-enabled"
 	flagMetricsAddr                    string = "metrics-addr"
 	flagHealthProbeAddr                string = "health-probe-addr"