crd updates

netobserv · Mar 30, 2023 · cb6c6a2 · cb6c6a2
1 parent 3f140a4
commit cb6c6a2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml
@@ -282,6 +282,21 @@ metadata:
               "maxBackoff": "5s",
               "maxRetries": 2,
               "minBackoff": "1s",
+              "statusTls": {
+                "caCert": {
+                  "certFile": "service-ca.crt",
+                  "name": "loki-ca-bundle",
+                  "type": "configmap"
+                },
+                "enable": false,
+                "insecureSkipVerify": false,
+                "userCert": {
+                  "certFile": "tls.crt",
+                  "certKey": "tls.key",
+                  "name": "loki-query-frontend-http",
+                  "type": "secret"
+                }
+              },
               "tls": {
                 "caCert": {
                   "certFile": "service-ca.crt",

diff --git a/config/samples/flows_v1alpha1_flowcollector.yaml b/config/samples/flows_v1alpha1_flowcollector.yaml
@@ -62,6 +62,7 @@ spec:
   loki:
     url: 'http://loki.netobserv.svc:3100/'
     # Uncomment lines below for typical installation with loki-operator (5.6+ needed)
+    # and ensure tls is enabled
     # url: 'https://loki-gateway-http.netobserv.svc:8080/api/logs/v1/network/'
     # statusUrl: 'https://loki-query-frontend-http.netobserv.svc:3100/'
     # authToken: HOST

diff --git a/config/samples/flows_v1beta1_flowcollector.yaml b/config/samples/flows_v1beta1_flowcollector.yaml
@@ -66,27 +66,29 @@ spec:
   loki:
     url: 'http://loki.netobserv.svc:3100/'
     # Uncomment lines below for typical installation with loki-operator (5.6+ needed)
+    # and ensure tls and statusTls are enabled
     # url: 'https://loki-gateway-http.netobserv.svc:8080/api/logs/v1/network/'
     # statusUrl: 'https://loki-query-frontend-http.netobserv.svc:3100/'
     # authToken: FORWARD
-    # statusTls:
-    #   enable: true
-    #   caCert:
-    #     certFile: service-ca.crt
-    #     name: loki-ca-bundle
-    #     type: configmap
-    #   userCert:
-    #     certFile: tls.crt
-    #     certKey: tls.key
-    #     name: loki-query-frontend-http
-    #     type: secret
     tls:
       enable: false
       caCert:
         type: configmap
         name: loki-gateway-ca-bundle
         certFile: service-ca.crt
       insecureSkipVerify: false
+    statusTls:
+      enable: false
+      caCert:
+        certFile: service-ca.crt
+        name: loki-ca-bundle
+        type: configmap
+      insecureSkipVerify: false
+      userCert:
+        certFile: tls.crt
+        certKey: tls.key
+        name: loki-query-frontend-http
+        type: secret
     batchWait: 1s
     batchSize: 10485760
     minBackoff: 1s