Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor how Kiosk vms are created #124

Merged
merged 4 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
182 changes: 0 additions & 182 deletions charts/hub/edge-gitops-vms/templates/rhel8-kiosk-with-svc.yaml

This file was deleted.

7 changes: 3 additions & 4 deletions charts/hub/edge-gitops-vms/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion overrides/values-egv-4.13.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
---
defaultStorageClassName: "ocs-storagecluster-ceph-rbd"
vmDefaults:
storageClassName: "ocs-storagecluster-ceph-rbd"
5 changes: 5 additions & 0 deletions overrides/values-egv-vms.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
vms:
kiosk:
count: 2
role: kiosk
1 change: 1 addition & 0 deletions values-hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading