Merge branch '2021-enable-driftdetection-in-flux-observability' into 'master'

Resolve "Enable driftDetection in flux"

Closes #2021 and big-bang/product/packages/grafana#109

See merge request !4754

chart/templates/eck-operator/helmrelease.yaml

@@ -12,6 +12,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/eck-operator/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   targetNamespace: eck-operator
   chart:
     spec:

chart/templates/elasticsearch-kibana/helmrelease.yaml

@@ -12,6 +12,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/elasticsearch-kibana/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   targetNamespace: logging
   chart:
     spec:

chart/templates/fluentbit/helmrelease.yaml

@@ -12,6 +12,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/fluentbit/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   targetNamespace: fluentbit
   releaseName: fluentbit
   chart:

chart/templates/grafana/helmrelease.yaml

@@ -12,6 +12,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/grafana/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   targetNamespace: monitoring
   chart:
     spec:

chart/templates/grafana/values.yaml

@@ -68,10 +68,6 @@ vault:
   enabled: {{ .Values.addons.vault.enabled }}
   tlsDisable: {{ dig "global" "tlsDisable" true .Values.addons.vault.values }}
 
-global:
-  imagePullSecrets:
-  - name: private-registry
-
 sso:
   enabled: {{ or .Values.grafana.sso.enabled .Values.grafana.sso.enabled }}
 

chart/templates/jaeger/helmrelease.yaml

@@ -12,6 +12,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/jaeger/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   targetNamespace: jaeger
   chart:
     spec:

chart/templates/loki/helmrelease.yaml

@@ -12,6 +12,15 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/loki/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
+    ignore:
+      - paths: [""]
+        target:
+          kind: Tenant
+      - paths: [""]
+        target:
+         kind: Sidecar
   releaseName: {{ default "logging-loki" .Values.loki.releaseName }}
   targetNamespace: logging
   chart:

chart/templates/metrics-server/helmrelease.yaml

@@ -15,6 +15,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/metrics-server/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   releaseName: metrics-server
   targetNamespace: metrics-server
   chart:

chart/templates/monitoring/helmrelease.yaml

@@ -12,6 +12,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/monitoring/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   targetNamespace: monitoring
   chart:
     spec:

chart/templates/promtail/helmrelease.yaml

@@ -12,6 +12,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/promtail/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   targetNamespace: promtail
   chart:
     spec:

chart/templates/tempo/helmrelease.yaml

@@ -12,6 +12,8 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/tempo/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
   targetNamespace: tempo
   chart:
     spec:

chart/templates/thanos/helmrelease.yaml

@@ -12,6 +12,12 @@ metadata:
   annotations:
     checksum/bigbang-values: {{ include (print $.Template.BasePath "/thanos/values.yaml") . | sha256sum }}
 spec:
+  driftDetection:
+    mode: warn
+    ignore:
+      - paths: [""]
+        target:
+          kind: Tenant
   releaseName: {{ $pkg }}
   targetNamespace: {{ $pkg }}
   chart:

tests/test-values.yaml

@@ -912,6 +912,11 @@ loki:
                 - 'repo1.dso.mil'
                 - 'grafana.dev.bigbang.mil'
                 - 'optimizationguide-pa.googleapis.com'
+                - 'clientservices.googleapis.com'
+                - 'accounts.google.com'
+                - 'redirector.gvt1.com'
+                - 'content-autofill.googleapis.com'
+                - 'safebrowsing.googleapis.com'
               location: MESH_EXTERNAL
               ports:
                 - number: 443