Gubernator environment (#684)

* Update config from observatorium * loki updates
rhobs · Apr 5, 2024 · 4eb0b0c · 4eb0b0c
1 parent b35695b
commit 4eb0b0c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/crds/loki.grafana.com_alertingrules.libsonnet b/crds/loki.grafana.com_alertingrules.libsonnet
@@ -7,11 +7,11 @@
     },
     creationTimestamp: null,
     labels: {
-      'app.kubernetes.io/instance': 'loki-operator-v0.5.0',
+      'app.kubernetes.io/instance': 'loki-operator-v0.6.0',
       'app.kubernetes.io/managed-by': 'operator-lifecycle-manager',
       'app.kubernetes.io/name': 'loki-operator',
       'app.kubernetes.io/part-of': 'loki-operator',
-      'app.kubernetes.io/version': '0.5.0',
+      'app.kubernetes.io/version': '0.6.0',
     },
     name: 'alertingrules.loki.grafana.com',
   },

diff --git a/crds/loki.grafana.com_recordingrules.libsonnet b/crds/loki.grafana.com_recordingrules.libsonnet
@@ -7,11 +7,11 @@
     },
     creationTimestamp: null,
     labels: {
-      'app.kubernetes.io/instance': 'loki-operator-v0.5.0',
+      'app.kubernetes.io/instance': 'loki-operator-v0.6.0',
       'app.kubernetes.io/managed-by': 'operator-lifecycle-manager',
       'app.kubernetes.io/name': 'loki-operator',
       'app.kubernetes.io/part-of': 'loki-operator',
-      'app.kubernetes.io/version': '0.5.0',
+      'app.kubernetes.io/version': '0.6.0',
     },
     name: 'recordingrules.loki.grafana.com',
   },

diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -230,8 +230,8 @@
           "subdir": "configuration"
         }
       },
-      "version": "6b4f08ef692e55bcfaa5cc86500b84582a1d739a",
-      "sum": "QMVHXmQ6fFl5Cg9XZ/5KgUwwEqyHwA9PGUfhxRLWp+E="
+      "version": "e743a6abc673774e60bf37b94e6454e542db46f0",
+      "sum": "AuUPEXXfd/hxMbKWdURRKaCTBPcTJD4cs9XApBIZbiA="
     },
     {
       "source": {

diff --git a/resources/crds/observatorium-logs-crds-template.yaml b/resources/crds/observatorium-logs-crds-template.yaml
@@ -10,11 +10,11 @@ objects:
       controller-gen.kubebuilder.io/version: v0.14.0
     creationTimestamp: null
     labels:
-      app.kubernetes.io/instance: loki-operator-v0.5.0
+      app.kubernetes.io/instance: loki-operator-v0.6.0
       app.kubernetes.io/managed-by: operator-lifecycle-manager
       app.kubernetes.io/name: loki-operator
       app.kubernetes.io/part-of: loki-operator
-      app.kubernetes.io/version: 0.5.0
+      app.kubernetes.io/version: 0.6.0
     name: alertingrules.loki.grafana.com
   spec:
     group: loki.grafana.com
@@ -356,11 +356,11 @@ objects:
       controller-gen.kubebuilder.io/version: v0.14.0
     creationTimestamp: null
     labels:
-      app.kubernetes.io/instance: loki-operator-v0.5.0
+      app.kubernetes.io/instance: loki-operator-v0.6.0
       app.kubernetes.io/managed-by: operator-lifecycle-manager
       app.kubernetes.io/name: loki-operator
       app.kubernetes.io/part-of: loki-operator
-      app.kubernetes.io/version: 0.5.0
+      app.kubernetes.io/version: 0.6.0
     name: recordingrules.loki.grafana.com
   spec:
     group: loki.grafana.com

diff --git a/resources/services/observatorium-template.yaml b/resources/services/observatorium-template.yaml
@@ -1485,6 +1485,8 @@ objects:
             value: k8s
           - name: GUBER_LOG_LEVEL
             value: ${GUBERNATOR_LOG_LEVEL}
+          - name: OTEL_TRACES_EXPORTER
+            value: none
           image: ${GUBERNATOR_IMAGE}:${GUBERNATOR_IMAGE_TAG}
           imagePullPolicy: IfNotPresent
           name: gubernator