Merge branch 'main' into 1309-switch-to-variable

defenseunicorns · Feb 24, 2025 · d98062b · d98062b
2 parents 25b3df9 + ffda059
commit d98062b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/grafana/common/zarf.yaml b/src/grafana/common/zarf.yaml
@@ -19,7 +19,7 @@ components:
           - ../chart/values.yaml
       - name: grafana
         url: https://grafana.github.io/helm-charts/
-        version: 8.9.0
+        version: 8.10.1
         namespace: grafana
         valuesFiles:
           - ../values/values.yaml
diff --git a/src/grafana/values/registry1-values.yaml b/src/grafana/values/registry1-values.yaml
@@ -4,7 +4,7 @@
 image:
   registry: registry1.dso.mil
   repository: ironbank/opensource/grafana/grafana
-  tag: 11.5.1
+  tag: 11.5.2
 
 initChownData:
   image:

diff --git a/src/grafana/values/unicorn-values.yaml b/src/grafana/values/unicorn-values.yaml
@@ -4,7 +4,7 @@
 image:
   registry: cgr.dev
   repository: du-uds-defenseunicorns/grafana-fips
-  tag: 11.5.1
+  tag: 11.5.2
 
 initChownData:
   image:
@@ -21,4 +21,4 @@ sidecar:
   image:
     registry: cgr.dev
     repository: du-uds-defenseunicorns/k8s-sidecar-fips
-    tag: 1.30.0
+    tag: 1.30.1
diff --git a/src/grafana/values/upstream-values.yaml b/src/grafana/values/upstream-values.yaml
@@ -6,12 +6,12 @@ sidecar:
     # -- The Docker registry
     registry: ghcr.io
     repository: kiwigrid/k8s-sidecar
-    tag: 1.30.0
+    tag: 1.30.1
 
 image:
   registry: docker.io
   repository: grafana/grafana
-  tag: 11.5.1
+  tag: 11.5.2
 
 initChownData:
   image:

diff --git a/src/grafana/zarf.yaml b/src/grafana/zarf.yaml
@@ -27,10 +27,10 @@ components:
         valuesFiles:
           - values/upstream-values.yaml
     images:
-      - docker.io/grafana/grafana:11.5.1
+      - docker.io/grafana/grafana:11.5.2
       - docker.io/curlimages/curl:8.12.1
       - docker.io/library/busybox:1.37.0
-      - ghcr.io/kiwigrid/k8s-sidecar:1.30.0
+      - ghcr.io/kiwigrid/k8s-sidecar:1.30.1
 
   - name: grafana
     required: true
@@ -43,7 +43,7 @@ components:
         valuesFiles:
           - values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/opensource/grafana/grafana:11.5.1
+      - registry1.dso.mil/ironbank/opensource/grafana/grafana:11.5.2
       - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.5
       - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.30.0
 
@@ -58,7 +58,7 @@ components:
         valuesFiles:
           - values/unicorn-values.yaml
     images:
-      - cgr.dev/du-uds-defenseunicorns/grafana-fips:11.5.1
+      - cgr.dev/du-uds-defenseunicorns/grafana-fips:11.5.2
       - cgr.dev/du-uds-defenseunicorns/busybox-fips:1.37.0
       - cgr.dev/du-uds-defenseunicorns/curl-fips:8.12.1
-      - cgr.dev/du-uds-defenseunicorns/k8s-sidecar-fips:1.30.0
+      - cgr.dev/du-uds-defenseunicorns/k8s-sidecar-fips:1.30.1