Merge branch 'main' into 458_lula-integration-istio

defenseunicorns · Jul 19, 2024 · ed6da0d · ed6da0d
2 parents b99457f + fab8919
commit ed6da0d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/bundles/k3d-slim-dev/uds-bundle.yaml b/bundles/k3d-slim-dev/uds-bundle.yaml
@@ -9,7 +9,7 @@ metadata:
 packages:
   - name: uds-k3d-dev
     repository: ghcr.io/defenseunicorns/packages/uds-k3d
-    ref: 0.7.0
+    ref: 0.8.0
     overrides:
       uds-dev-stack:
         minio:

diff --git a/bundles/k3d-standard/uds-bundle.yaml b/bundles/k3d-standard/uds-bundle.yaml
@@ -9,7 +9,7 @@ metadata:
 packages:
   - name: uds-k3d-dev
     repository: ghcr.io/defenseunicorns/packages/uds-k3d
-    ref: 0.7.0
+    ref: 0.8.0
     overrides:
       uds-dev-stack:
         minio:

diff --git a/src/istio/values/unicorn-values.yaml b/src/istio/values/unicorn-values.yaml
@@ -1,7 +1,9 @@
 pilot:
-  image: cgr.dev/du-uds-defenseunicorns/istio-pilot-fips:1.22.2
+  image: "cgr.dev/du-uds-defenseunicorns/istio-pilot-fips:1.22.2"
 global:
   proxy_init:
-    image: cgr.dev/du-uds-defenseunicorns/istio-proxy-fips:1.22.2
+    # renovate: image=cgr.dev/du-uds-defenseunicorns/istio-proxy-fips
+    image: "###ZARF_REGISTRY###/du-uds-defenseunicorns/istio-proxy-fips:1.22.2"
   proxy:
-    image: cgr.dev/du-uds-defenseunicorns/istio-proxy-fips:1.22.2
+    # renovate: image=cgr.dev/du-uds-defenseunicorns/istio-proxy-fips
+    image: "###ZARF_REGISTRY###/du-uds-defenseunicorns/istio-proxy-fips:1.22.2"
diff --git a/src/pepr/prometheus/index.ts b/src/pepr/prometheus/index.ts
@@ -8,7 +8,6 @@ import {
   ServiceMonitorEndpoint,
   ServiceMonitorScheme,
 } from "../operator/crd";
-
 // configure subproject logger
 const log = setupLogger(Component.PROMETHEUS);
 
@@ -25,7 +24,7 @@ const { When } = prometheus;
 When(PrometheusServiceMonitor)
   .IsCreatedOrUpdated()
   .Mutate(async sm => {
-    if (sm.Raw.spec === undefined) {
+    if (sm.Raw.spec === undefined || sm.Raw.spec.scrapeClass != undefined) {
       return;
     }
 
@@ -39,6 +38,7 @@ When(PrometheusServiceMonitor)
         `Mutating scrapeClass to exempt ServiceMonitor ${sm.Raw.metadata?.name} from default scrapeClass mTLS config`,
       );
       sm.Raw.spec.scrapeClass = "exempt";
+
       return;
     } else {
       log.info(`Patching service monitor ${sm.Raw.metadata?.name} for mTLS metrics`);
@@ -64,7 +64,7 @@ When(PrometheusServiceMonitor)
 When(PrometheusPodMonitor)
   .IsCreatedOrUpdated()
   .Mutate(async pm => {
-    if (pm.Raw.spec === undefined) {
+    if (pm.Raw.spec === undefined || pm.Raw.spec.scrapeClass != undefined) {
       return;
     }
 
@@ -74,6 +74,7 @@ When(PrometheusPodMonitor)
         `Mutating scrapeClass to exempt PodMonitor ${pm.Raw.metadata?.name} from default scrapeClass mTLS config`,
       );
       pm.Raw.spec.scrapeClass = "exempt";
+
       return;
     } else {
       log.info(`Patching pod monitor ${pm.Raw.metadata?.name} for mTLS metrics`);
@@ -102,5 +103,6 @@ async function isIstioInjected(monitor: PrometheusServiceMonitor | PrometheusPod
       return true;
     }
   }
+
   return false;
 }
diff --git a/tasks.yaml b/tasks.yaml
@@ -4,9 +4,6 @@ variables:
 
   - name: PKG
 
-  - name: K3D_IMAGE
-    default: "rancher/k3s:v1.29.5-k3s1"
-
 includes:
   - create: ./tasks/create.yaml
   - setup: ./tasks/setup.yaml

diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml
@@ -11,12 +11,12 @@ tasks:
   - name: k3d-standard-bundle
     actions:
       - description: "Deploy the UDS Core Standard Bundle"
-        cmd: uds deploy bundles/k3d-standard/uds-bundle-k3d-core-demo-${UDS_ARCH}-${VERSION}.tar.zst --set=uds-k3d-dev.K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress
+        cmd: uds deploy bundles/k3d-standard/uds-bundle-k3d-core-demo-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress
 
   - name: k3d-slim-dev-bundle
     actions:
       - description: "Deploy the UDS Core Slim Dev Only Bundle"
-        cmd: uds deploy bundles/k3d-slim-dev/uds-bundle-k3d-core-slim-dev-${UDS_ARCH}-${VERSION}.tar.zst --set=uds-k3d-dev.K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress
+        cmd: uds deploy bundles/k3d-slim-dev/uds-bundle-k3d-core-slim-dev-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress
 
   - name: single-package
     actions:

diff --git a/tasks/setup.yaml b/tasks/setup.yaml
@@ -3,7 +3,7 @@ tasks:
     actions:
       - description: "Create the K3d cluster"
         # renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver
-        cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.7.0 --set=K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress"
+        cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.8.0 --confirm --no-progress"
 
   - name: k3d-test-cluster
     actions: