From 00d90bfa21b45f91ecafededcf5f11b6a10daff7 Mon Sep 17 00:00:00 2001 From: Morten Olsen Date: Wed, 3 Sep 2025 17:08:46 +0200 Subject: [PATCH] more-stuff --- .../{ollama => ollama.disabled}/Chart.yaml | 0 .../templates/deployment.yaml | 0 .../templates/pvc.yaml | 0 .../templates/service.yaml | 0 .../{ollama => ollama.disabled}/values.yaml | 0 charts/apps/values.yaml | 0 charts/root/Chart.yaml | 3 ++ charts/root/templates/apps.yaml | 33 +++++++++++++++++++ charts/root/templates/root.yaml | 21 ++++++++++++ charts/root/values.yaml | 4 +++ .../homelab/environment/environment.ts | 6 +++- 11 files changed, 66 insertions(+), 1 deletion(-) rename charts/apps/{ollama => ollama.disabled}/Chart.yaml (100%) rename charts/apps/{ollama => ollama.disabled}/templates/deployment.yaml (100%) rename charts/apps/{ollama => ollama.disabled}/templates/pvc.yaml (100%) rename charts/apps/{ollama => ollama.disabled}/templates/service.yaml (100%) rename charts/apps/{ollama => ollama.disabled}/values.yaml (100%) create mode 100644 charts/apps/values.yaml create mode 100644 charts/root/Chart.yaml create mode 100644 charts/root/templates/apps.yaml create mode 100644 charts/root/templates/root.yaml create mode 100644 charts/root/values.yaml diff --git a/charts/apps/ollama/Chart.yaml b/charts/apps/ollama.disabled/Chart.yaml similarity index 100% rename from charts/apps/ollama/Chart.yaml rename to charts/apps/ollama.disabled/Chart.yaml diff --git a/charts/apps/ollama/templates/deployment.yaml b/charts/apps/ollama.disabled/templates/deployment.yaml similarity index 100% rename from charts/apps/ollama/templates/deployment.yaml rename to charts/apps/ollama.disabled/templates/deployment.yaml diff --git a/charts/apps/ollama/templates/pvc.yaml b/charts/apps/ollama.disabled/templates/pvc.yaml similarity index 100% rename from charts/apps/ollama/templates/pvc.yaml rename to charts/apps/ollama.disabled/templates/pvc.yaml diff --git a/charts/apps/ollama/templates/service.yaml b/charts/apps/ollama.disabled/templates/service.yaml similarity index 100% rename from charts/apps/ollama/templates/service.yaml rename to charts/apps/ollama.disabled/templates/service.yaml diff --git a/charts/apps/ollama/values.yaml b/charts/apps/ollama.disabled/values.yaml similarity index 100% rename from charts/apps/ollama/values.yaml rename to charts/apps/ollama.disabled/values.yaml diff --git a/charts/apps/values.yaml b/charts/apps/values.yaml new file mode 100644 index 0000000..e69de29 diff --git a/charts/root/Chart.yaml b/charts/root/Chart.yaml new file mode 100644 index 0000000..49eec5d --- /dev/null +++ b/charts/root/Chart.yaml @@ -0,0 +1,3 @@ +apiVersion: v2 +version: 1.0.0 +name: root diff --git a/charts/root/templates/apps.yaml b/charts/root/templates/apps.yaml new file mode 100644 index 0000000..1b4cc92 --- /dev/null +++ b/charts/root/templates/apps.yaml @@ -0,0 +1,33 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: homelab-apps + namespace: '{{ .Values.env }}-argo' +spec: + generators: + - git: + repoURL: '{{ .Values.repo }}' + revision: '{{ .Values.ref }}' + directories: + - path: charts/apps/* + include: '.*' + exclude: '.*.disabled' + template: + metadata: + name: '{{`{{path.basename}}`}}' + spec: + project: default + source: + repoURL: '{{ .Values.repo }}' + targetRevision: '{{ .Values.ref }}' + path: charts/apps/{{`{{path.basename}}`}} + helm: + values: | + globals: {{ .Values.globals | toYaml | nindent 14 }} + destination: + server: https://kubernetes.default.svc + namespace: '{{ .Values.globals.env }}' + syncPolicy: + automated: + prune: true + selfHeal: true diff --git a/charts/root/templates/root.yaml b/charts/root/templates/root.yaml new file mode 100644 index 0000000..524a69e --- /dev/null +++ b/charts/root/templates/root.yaml @@ -0,0 +1,21 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: homelab-root + namespace: '{{ .Values.globals.env }}-argo' +spec: + project: default + source: + repoURL: '{{ .Values.repo }}' + targetRevision: '{{ .Values.ref }}' + path: charts/root + helm: + valueFiles: + - values.yaml + destination: + server: https://kubernetes.default.svc + namespace: '{{ .Values.globals.env }}-argo' + syncPolicy: + automated: + prune: true + selfHeal: true diff --git a/charts/root/values.yaml b/charts/root/values.yaml new file mode 100644 index 0000000..f15f3d6 --- /dev/null +++ b/charts/root/values.yaml @@ -0,0 +1,4 @@ +globals: + env: prod +repo: https://github.com/morten-olsen/homelab-operator.git +ref: HEAD diff --git a/src/resources/homelab/environment/environment.ts b/src/resources/homelab/environment/environment.ts index a315bac..494f60b 100644 --- a/src/resources/homelab/environment/environment.ts +++ b/src/resources/homelab/environment/environment.ts @@ -204,7 +204,11 @@ class Environment extends CustomResource { spec: { targetNamespace: this.#argoNamespace.name, interval: '1h', - values: {}, + values: { + applicationset: { + enabled: true, + }, + }, chart: { spec: { chart: 'argo-cd',