Merge pull request #124 from mhjacks/main

mhjacks · web-flow · commit 8ac62203bede · 2024-10-24T10:56:53.000-05:00
Refactor how Kiosk vms are created
diff --git a/Changes.md b/Changes.md
@@ -64,3 +64,5 @@
   the end of its maintenance support lifecycle.
 * Refactor installation mechannism to use standard configuration-as-code approach, which will make it easier to drop
   in a new config-as-code repository.
+* Move VM definitions outside of edge-gitops-vms chart so that derived patterns do not inherit the HMI kiosks. Kiosk
+  VMs now defined by default in overrides.
diff --git a/charts/hub/edge-gitops-vms/templates/rhel8-kiosk-with-svc.yaml b/charts/hub/edge-gitops-vms/templates/rhel8-kiosk-with-svc.yaml
diff --git a/charts/hub/edge-gitops-vms/values.yaml b/charts/hub/edge-gitops-vms/values.yaml
@@ -38,10 +38,9 @@ vmDefaults:
       protocol: TCP
       targetPort: 22
 
-vms:
-  kiosk:
-    count: 2
-    role: kiosk
+# Define the VMs you want to create with any specific attributes from vmDefaults
+# in an overrides file.
+vms: {}
 
 serviceAccountName: ansible-edge-gitops-sa
 rbac:
diff --git a/overrides/values-egv-4.13.yaml b/overrides/values-egv-4.13.yaml
@@ -1,2 +1,3 @@
 ---
-defaultStorageClassName: "ocs-storagecluster-ceph-rbd"
+vmDefaults:
+  storageClassName: "ocs-storagecluster-ceph-rbd"
diff --git a/overrides/values-egv-vms.yaml b/overrides/values-egv-vms.yaml
@@ -0,0 +1,5 @@
+---
+vms:
+  kiosk:
+    count: 2
+    role: kiosk
diff --git a/values-hub.yaml b/values-hub.yaml
@@ -106,6 +106,7 @@ clusterGroup:
       project: hub
       path: charts/hub/edge-gitops-vms
       extraValueFiles:
+        - '$patternref/overrides/values-egv-vms.yaml'
         - '$patternref/overrides/values-egv-{{ $.Values.global.clusterVersion }}.yaml'
 
   # Only the hub cluster here - managed entities are edge nodes
