feat: Bump grafana to 8.5.8 (#2771)

* chore: Update grafana-logging 8.3.6 => 8.5.8 * chore: Move grafana-logging/8.3.6 => 8.5.8 * chore: Update project-grafana-logging 8.3.5 => 8.5.8 * chore: Move project-grafana-logging/8.3.5 => 8.5.8 * build: Updated licenses.d2iq.yaml * fix: license --------- Co-authored-by: d2iq-mergebot <ci-mergebot@d2iq.com> Co-authored-by: Martin Hrabovcin <martin.hrabovcin@nutanix.com>
mesosphere · Oct 25, 2024 · 1ee3105 · 1ee3105
1 parent 067ec33
commit 1ee3105
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -30,11 +30,11 @@ resources:
         notice_path: NOTICE.md
         ref: v${image_tag}
         url: https://github.com/grafana/grafana
-  - container_image: docker.io/grafana/grafana:11.1.0
+  - container_image: docker.io/grafana/grafana:11.2.2-security-01
     sources:
       - license_path: LICENSE
         notice_path: NOTICE.md
-        ref: v${image_tag}
+        ref: v${image_tag%-security-01}
         url: https://github.com/grafana/grafana
   - container_image: docker.io/grafana/loki:2.9.8
     sources:

diff --git a/...es/grafana-logging/8.3.6/defaults/cm.yaml → ...es/grafana-logging/8.5.8/defaults/cm.yaml b/...es/grafana-logging/8.3.6/defaults/cm.yaml → ...es/grafana-logging/8.5.8/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-logging-8.3.6-d2iq-defaults
+  name: grafana-logging-8.5.8-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |

diff --git a/...logging/8.3.6/defaults/kustomization.yaml → ...logging/8.5.8/defaults/kustomization.yaml b/...logging/8.3.6/defaults/kustomization.yaml → ...logging/8.5.8/defaults/kustomization.yaml
diff --git a/services/grafana-logging/8.3.6/grafana.yaml → services/grafana-logging/8.5.8/grafana.yaml b/services/grafana-logging/8.3.6/grafana.yaml → services/grafana-logging/8.5.8/grafana.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: 8.3.4
+      version: 8.5.8
   interval: 15s
   install:
     crds: CreateReplace
@@ -24,7 +24,7 @@ spec:
   releaseName: grafana-logging
   valuesFrom:
     - kind: ConfigMap
-      name: grafana-logging-8.3.6-d2iq-defaults
+      name: grafana-logging-8.5.8-d2iq-defaults
   targetNamespace: ${releaseNamespace}
 ---
 apiVersion: v1

diff --git a/.../grafana-logging/8.3.6/kustomization.yaml → .../grafana-logging/8.5.8/kustomization.yaml b/.../grafana-logging/8.3.6/kustomization.yaml → .../grafana-logging/8.5.8/kustomization.yaml
diff --git a/...ct-grafana-logging/8.3.5/defaults/cm.yaml → ...ct-grafana-logging/8.5.8/defaults/cm.yaml b/...ct-grafana-logging/8.3.5/defaults/cm.yaml → ...ct-grafana-logging/8.5.8/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: project-grafana-logging-8.3.5-d2iq-defaults
+  name: project-grafana-logging-8.5.8-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |

diff --git a/...logging/8.3.5/defaults/kustomization.yaml → ...logging/8.5.8/defaults/kustomization.yaml b/...logging/8.3.5/defaults/kustomization.yaml → ...logging/8.5.8/defaults/kustomization.yaml
diff --git a/...-grafana-logging/8.3.5/kustomization.yaml → ...-grafana-logging/8.5.8/kustomization.yaml b/...-grafana-logging/8.3.5/kustomization.yaml → ...-grafana-logging/8.5.8/kustomization.yaml
diff --git a/...rafana-logging/8.3.5/project-grafana.yaml → ...rafana-logging/8.5.8/project-grafana.yaml b/...rafana-logging/8.3.5/project-grafana.yaml → ...rafana-logging/8.5.8/project-grafana.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: 8.3.4
+      version: 8.5.8
   interval: 15s
   install:
     crds: CreateReplace
@@ -23,5 +23,5 @@ spec:
       retries: 30
   valuesFrom:
     - kind: ConfigMap
-      name: project-grafana-logging-8.3.5-d2iq-defaults
+      name: project-grafana-logging-8.5.8-d2iq-defaults
   targetNamespace: ${releaseNamespace}