Merge branch 'main' into uds-common-renovate-config

defenseunicorns · May 8, 2024 · cbe6a19 · cbe6a19
2 parents 7cd4b01 + 49cb11a
commit cbe6a19
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/neuvector/values/registry1-values.yaml b/src/neuvector/values/registry1-values.yaml
@@ -47,7 +47,7 @@ cve:
     image:
       registry: registry1.dso.mil
       repository: ironbank/redhat/ubi/ubi9-minimal
-      tag: "9.3"
+      tag: "9.4"
     containerSecurityContext:
       capabilities:
         drop:

diff --git a/src/neuvector/zarf.yaml b/src/neuvector/zarf.yaml
@@ -44,7 +44,7 @@ components:
     images:
       - registry1.dso.mil/ironbank/neuvector/neuvector/controller:5.3.2
       - registry1.dso.mil/ironbank/neuvector/neuvector/manager:5.3.2
-      - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.3
+      - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4
       - registry1.dso.mil/ironbank/neuvector/neuvector/scanner:5
       - registry1.dso.mil/ironbank/neuvector/neuvector/enforcer:5.3.2
       - registry1.dso.mil/ironbank/neuvector/neuvector/prometheus-exporter:5.3.2
diff --git a/src/prometheus-stack/common/zarf.yaml b/src/prometheus-stack/common/zarf.yaml
@@ -15,7 +15,7 @@ components:
       - name: kube-prometheus-stack
         namespace: monitoring
         url: https://prometheus-community.github.io/helm-charts
-        version: 58.1.2
+        version: 58.4.0
         valuesFiles:
           - "../values/values.yaml"
     actions:

diff --git a/src/prometheus-stack/values/registry1-values.yaml b/src/prometheus-stack/values/registry1-values.yaml
@@ -25,7 +25,7 @@ prometheus-node-exporter:
   image:
     registry: registry1.dso.mil
     repository: ironbank/opensource/prometheus/node-exporter
-    tag: v1.7.0
+    tag: v1.8.0
 prometheusOperator:
   admissionWebhooks:
     containerSecurityContext:
@@ -48,9 +48,9 @@ prometheusOperator:
   image:
     registry: registry1.dso.mil
     repository: ironbank/opensource/prometheus-operator/prometheus-operator
-    tag: v0.73.1
+    tag: v0.73.2
   prometheusConfigReloader:
     image:
       registry: registry1.dso.mil
       repository: ironbank/opensource/prometheus-operator/prometheus-config-reloader
-      tag: v0.73.1
+      tag: v0.73.2
diff --git a/src/prometheus-stack/values/upstream-values.yaml b/src/prometheus-stack/values/upstream-values.yaml
@@ -25,7 +25,7 @@ prometheus-node-exporter:
   image:
     registry: quay.io
     repository: prometheus/node-exporter
-    tag: v1.7.0
+    tag: v1.8.0
 prometheusOperator:
   admissionWebhooks:
     patch:
@@ -40,9 +40,9 @@ prometheusOperator:
   image:
     registry: quay.io
     repository: prometheus-operator/prometheus-operator
-    tag: v0.73.1
+    tag: v0.73.2
   prometheusConfigReloader:
     image:
       registry: quay.io
       repository: prometheus-operator/prometheus-config-reloader
-      tag: v0.73.1
+      tag: v0.73.2
diff --git a/src/prometheus-stack/zarf.yaml b/src/prometheus-stack/zarf.yaml
@@ -27,11 +27,11 @@ components:
         valuesFiles:
           - "values/upstream-values.yaml"
     images:
-      - "quay.io/prometheus/node-exporter:v1.7.0"
-      - "quay.io/prometheus-operator/prometheus-operator:v0.73.1"
+      - "quay.io/prometheus/node-exporter:v1.8.0"
+      - "quay.io/prometheus-operator/prometheus-operator:v0.73.2"
       - "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.12.0"
       - "quay.io/prometheus/alertmanager:v0.27.0"
-      - "quay.io/prometheus-operator/prometheus-config-reloader:v0.73.1"
+      - "quay.io/prometheus-operator/prometheus-config-reloader:v0.73.2"
       - "quay.io/prometheus/prometheus:v2.51.2"
       - "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6"
 
@@ -47,10 +47,10 @@ components:
         valuesFiles:
           - "values/registry1-values.yaml"
     images:
-      - "registry1.dso.mil/ironbank/opensource/prometheus/node-exporter:v1.7.0"
-      - "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-operator:v0.73.1"
+      - "registry1.dso.mil/ironbank/opensource/prometheus/node-exporter:v1.8.0"
+      - "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-operator:v0.73.2"
       - "registry1.dso.mil/ironbank/opensource/kubernetes/kube-state-metrics:v2.12.0"
       - "registry1.dso.mil/ironbank/opensource/prometheus/alertmanager:v0.27.0"
-      - "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-config-reloader:v0.73.1"
+      - "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-config-reloader:v0.73.2"
       - "registry1.dso.mil/ironbank/opensource/prometheus/prometheus:v2.51.2"
       - "registry1.dso.mil/ironbank/opensource/ingress-nginx/kube-webhook-certgen:v1.3.0"