Rework structure

dgiebert · Jun 19, 2024 · 368a1a1 · 368a1a1
1 parent b752d16
commit 368a1a1
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -6,7 +6,7 @@ on:
       - main
 
 env:
-  CHARTS_DIR: chart
+  CHARTS_DIR: deployment/chart
 
 jobs:
   release:

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 .env/
-elemental/registration.yaml
-elemental/seedimage.yaml
+rancher/elemental/registration.yaml
+rancher/elemental/seedimage.yaml
 certs/*
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,7 @@
 ARG PYTHON_VERSION=3.12
 FROM registry.suse.com/bci/python:${PYTHON_VERSION} as builder
 
-RUN zypper in -y gcc \
-    && python3 -m venv /opt/venv
+RUN zypper in -y gcc && python3 -m venv /opt/venv
 
 ENV PATH="/opt/venv/bin:$PATH"
 

diff --git a/chart/.helmignore → deployment/chart/.helmignore b/chart/.helmignore → deployment/chart/.helmignore
diff --git a/chart/Chart.yaml → deployment/chart/Chart.yaml b/chart/Chart.yaml → deployment/chart/Chart.yaml
diff --git a/chart/templates/_helpers.tpl → deployment/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl → deployment/chart/templates/_helpers.tpl
diff --git a/chart/templates/deployment.yaml → deployment/chart/templates/deployment.yaml b/chart/templates/deployment.yaml → deployment/chart/templates/deployment.yaml
diff --git a/chart/templates/secret.yaml → deployment/chart/templates/secret.yaml b/chart/templates/secret.yaml → deployment/chart/templates/secret.yaml
diff --git a/chart/templates/serviceaccount.yaml → ...yment/chart/templates/serviceaccount.yaml b/chart/templates/serviceaccount.yaml → ...yment/chart/templates/serviceaccount.yaml
diff --git a/chart/values.yaml → deployment/chart/values.yaml b/chart/values.yaml → deployment/chart/values.yaml
diff --git a/fleet/fleet.yaml → deployment/fleet/fleet.yaml b/fleet/fleet.yaml → deployment/fleet/fleet.yaml
diff --git a/deployment/gitrepo.yaml b/deployment/gitrepo.yaml
@@ -0,0 +1,19 @@
+# /var/lib/rancher/k3s/server/manifests/gitrepo-cloudland-2024.yaml
+apiVersion: fleet.cattle.io/v1alpha1
+kind: GitRepo
+metadata:
+  name: cloudland-2024
+  namespace: fleet-default
+spec:
+  branch: main
+  correctDrift:
+    enabled: true
+  forceSyncGeneration: 15
+  insecureSkipTLSVerify: false
+  paths:
+    - /deployment/fleet
+  repo: https://github.com/dgiebert/cloudland-2024.git
+  targets:
+    - clusterName: lounge2
+    - clusterName: lounge3
+    - clusterName: lounge4
diff --git a/elemental/registration.yaml.example → rancher/elemental/registration.yaml.example b/elemental/registration.yaml.example → rancher/elemental/registration.yaml.example
@@ -30,9 +30,9 @@ spec:
           method=auto
         path: /etc/NetworkManager/system-connections/wifi.nmconnection
         permissions: '0600'
-    runcmd:
-    - grub2-editenv /oem/grubenv set extra_cmdline="iomem=relaxed strict-devmem=0"
-    - reboot
+      runcmd:
+      - grub2-editenv /oem/grubenv set extra_cmdline="iomem=relaxed strict-devmem=0"
+      - reboot
     elemental:
       install:
         device: /dev/mmcblk0

diff --git a/elemental/seedimage.yaml.example → rancher/elemental/seedimage.yaml.example b/elemental/seedimage.yaml.example → rancher/elemental/seedimage.yaml.example