feat: Bump grafana to 8.5.0

licenses.d2iq.yaml

@@ -35,7 +35,7 @@ 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.1.5
     sources:
       - license_path: LICENSE
         notice_path: NOTICE.md
@@ -82,7 +82,12 @@ resources:
       - license_path: LICENSE.txt
         ref: ${image_tag}
         url: https://github.com/jimmidyson/configmap-reload
-  - container_image: ghcr.io/mesosphere/dkp-container-images/docker.io/kiwigrid/k8s-sidecar:1.25.3-d2iq.1
+  - container_image: ghcr.io/mesosphere/dkp-container-images/docker.io/kiwigrid/k8s-sidecar:1.26.1-d2iq.1
+    sources:
+      - license_path: LICENSE
+        ref: ${image_tag%-d2iq.1}
+        url: https://github.com/kiwigrid/k8s-sidecar
+  - container_image: ghcr.io/mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar:1.26.1-d2iq.1
     sources:
       - license_path: LICENSE
         ref: ${image_tag%-d2iq.1}
@@ -475,11 +480,16 @@ resources:
       - license_path: LICENSE
         ref: ${image_tag%-distro}
         url: https://github.com/kiali/kiali
-  - container_image: ghcr.io/mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar:1.26.1-d2iq.1
+  - container_image: quay.io/kiwigrid/k8s-sidecar:1.26.1
     sources:
       - license_path: LICENSE
         ref: ${image_tag%-d2iq.1}
         url: https://github.com/kiwigrid/k8s-sidecar
+  - container_image: quay.io/kiwigrid/k8s-sidecar:1.27.4
+    sources:
+      - license_path: LICENSE
+        ref: ${image_tag}
+        url: https://github.com/kiwigrid/k8s-sidecar
   - container_image: quay.io/kubernetes_incubator/nfs-provisioner:v2.3.0
     sources:
       - license_path: LICENSE

services/centralized-grafana/60.4.1/defaults/cm.yaml

@@ -20,10 +20,10 @@ data:
           prometheus.kommander.d2iq.io/select: "true"
         path: "/dkp/kommander/monitoring/grafana/metrics"
       sidecar:
-        image:
-          registry: ghcr.io
-          repository: mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar
-          tag: 1.26.1-d2iq.1
+        sidecar:
+          image:
+            repository: quay.io/kiwigrid/k8s-sidecar
+            tag: 1.27.6
         dashboards:
           enabled: true
           # label that the configmaps with dashboards are marked with

services/centralized-kubecost/0.37.5/defaults/cm.yaml

@@ -73,7 +73,7 @@ data:
         sidecar:
           image:
             repository: ghcr.io/mesosphere/dkp-container-images/docker.io/kiwigrid/k8s-sidecar
-            tag: 1.25.3-d2iq.0
+            tag: 1.26.1-d2iq.1
           dashboards:
             enabled: true
             label: grafana_dashboard_kommander

services/grafana-logging/8.3.6/defaults/cm.yaml → services/grafana-logging/8.5.0/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.0-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |

services/grafana-logging/8.3.6/grafana.yaml → services/grafana-logging/8.5.0/grafana.yaml

@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: 8.3.4
+      version: 8.5.0
   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.0-d2iq-defaults
   targetNamespace: ${releaseNamespace}
 ---
 apiVersion: v1

services/kube-prometheus-stack/60.4.1/defaults/cm.yaml

@@ -351,10 +351,10 @@ data:
         path: /dkp/grafana
         pathType: ImplementationSpecific
       sidecar:
-        image:
-          registry: ghcr.io
-          repository: mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar
-          tag: 1.26.1-d2iq.1
+        sidecar:
+          image:
+            repository: quay.io/kiwigrid/k8s-sidecar
+            tag: 1.27.6
         dashboards:
           enabled: true
           label: grafana_dashboard

services/kubecost/0.37.6/defaults/cm.yaml

@@ -84,7 +84,7 @@ data:
         sidecar:
           image:
             repository: ghcr.io/mesosphere/dkp-container-images/docker.io/kiwigrid/k8s-sidecar
-            tag: 1.25.3-d2iq.1
+            tag: 1.26.1-d2iq.1
 
       kubecostProductConfigs:
         grafanaURL: "/dkp/kubecost/grafana"

services/project-grafana-logging/8.3.5/defaults/cm.yaml → services/project-grafana-logging/8.5.0/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.0-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
@@ -28,10 +28,10 @@ data:
       pathType: ImplementationSpecific
 
     sidecar:
-      image:
-        registry: ghcr.io
-        repository: mesosphere/dkp-container-images/quay.io/kiwigrid/k8s-sidecar
-        tag: 1.26.1-d2iq.1
+      sidecar:
+          image:
+            repository: quay.io/kiwigrid/k8s-sidecar
+            tag: 1.27.6
       dashboards:
         enabled: true
         label: project_grafana_logging_dashboard

services/project-grafana-logging/8.3.5/project-grafana.yaml → services/project-grafana-logging/8.5.0/project-grafana.yaml

@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: 8.3.4
+      version: 8.5.0
   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.0-d2iq-defaults
   targetNamespace: ${releaseNamespace}