Merge branch 'main' into keycloak-ha-fixes

defenseunicorns · Aug 1, 2024 · 94231a3 · 94231a3
2 parents d5f773f + bc2d673
commit 94231a3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/.github/bundles/uds-bundle.yaml b/.github/bundles/uds-bundle.yaml
@@ -16,6 +16,8 @@ packages:
     # x-release-please-start-version
     ref: 0.24.1
     # x-release-please-end
+    optionalComponents:
+      - metrics-server
     overrides:
       velero:
         velero:

diff --git a/bundles/k3d-slim-dev/uds-bundle.yaml b/bundles/k3d-slim-dev/uds-bundle.yaml
@@ -36,6 +36,8 @@ packages:
     # x-release-please-start-version
     ref: 0.24.1
     # x-release-please-end
+    optionalComponents:
+      - metrics-server
     overrides:
       istio-admin-gateway:
         uds-istio-config:

diff --git a/bundles/k3d-standard/uds-bundle.yaml b/bundles/k3d-standard/uds-bundle.yaml
@@ -38,6 +38,7 @@ packages:
     # x-release-please-end
     optionalComponents:
       - istio-passthrough-gateway
+      - metrics-server
     overrides:
       loki:
         loki:

diff --git a/src/metrics-server/common/zarf.yaml b/src/metrics-server/common/zarf.yaml
@@ -6,7 +6,7 @@ metadata:
 
 components:
   - name: metrics-server
-    required: true
+    required: false # This component is optional since most k8s distros provide this out of the box
     charts:
       - name: uds-metrics-server-config
         namespace: metrics-server