From 69c9bb8ea35483fbb24b57a9e3fbe68541582677 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 21 Dec 2023 10:25:19 -0500 Subject: [PATCH] updated webapps loading --- k8s/apps/{basic-webapps => webapps}/Chart.yaml | 2 +- .../templates/sts-services.yaml | 0 k8s/apps/{basic-webapps => webapps}/values-dev.yaml | 0 k8s/apps/{basic-webapps => webapps}/values-prod.yaml | 0 k8s/apps/{basic-webapps => webapps}/values.yaml | 0 k8s/argoapps/apps-values/ingresses.yaml | 11 +++++++---- .../apps-values/{basic-webapp.yaml => webapps.yaml} | 0 k8s/argoapps/values.yaml | 4 ++-- 8 files changed, 10 insertions(+), 7 deletions(-) rename k8s/apps/{basic-webapps => webapps}/Chart.yaml (85%) rename k8s/apps/{basic-webapps => webapps}/templates/sts-services.yaml (100%) rename k8s/apps/{basic-webapps => webapps}/values-dev.yaml (100%) rename k8s/apps/{basic-webapps => webapps}/values-prod.yaml (100%) rename k8s/apps/{basic-webapps => webapps}/values.yaml (100%) rename k8s/argoapps/apps-values/{basic-webapp.yaml => webapps.yaml} (100%) diff --git a/k8s/apps/basic-webapps/Chart.yaml b/k8s/apps/webapps/Chart.yaml similarity index 85% rename from k8s/apps/basic-webapps/Chart.yaml rename to k8s/apps/webapps/Chart.yaml index b82bb8c..99dc4ae 100644 --- a/k8s/apps/basic-webapps/Chart.yaml +++ b/k8s/apps/webapps/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: basic-webapps +name: webapps description: An applications service for homelab type: application version: 0.1.0 diff --git a/k8s/apps/basic-webapps/templates/sts-services.yaml b/k8s/apps/webapps/templates/sts-services.yaml similarity index 100% rename from k8s/apps/basic-webapps/templates/sts-services.yaml rename to k8s/apps/webapps/templates/sts-services.yaml diff --git a/k8s/apps/basic-webapps/values-dev.yaml b/k8s/apps/webapps/values-dev.yaml similarity index 100% rename from k8s/apps/basic-webapps/values-dev.yaml rename to k8s/apps/webapps/values-dev.yaml diff --git a/k8s/apps/basic-webapps/values-prod.yaml b/k8s/apps/webapps/values-prod.yaml similarity index 100% rename from k8s/apps/basic-webapps/values-prod.yaml rename to k8s/apps/webapps/values-prod.yaml diff --git a/k8s/apps/basic-webapps/values.yaml b/k8s/apps/webapps/values.yaml similarity index 100% rename from k8s/apps/basic-webapps/values.yaml rename to k8s/apps/webapps/values.yaml diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 911a741..1bf035d 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -107,11 +107,13 @@ services: middleware: "apps-ingresses-chain-authentik" group: "Video Hosting" {{- end }} - # basic-webapp services - {{- range $k, $v := .Values.basic-webapps.apps }} + # webapp services + {{ $webapps := .Files.Get .Values.apps.webapps.valuesFile }} + {{ $webapps := tpl $webapps . | fromYaml }} + {{- range $k, $v := $webapps.apps }} - prefix: "{{ $k }}.wa" service: "{{ $k }}" - namespace: "apps-basic-webapps" + namespace: "apps-webapps" port: {{ $v.ports.tcp.web }} {{ if $.ingress }} middleware: {{ $.ingress.middleware | default "apps-ingresses-chain-authentik" }} @@ -119,4 +121,5 @@ services: middleware: "apps-ingresses-chain-authentik" {{ end }} group: "Basic Webapps" - {{- end }} \ No newline at end of file + {{- end }} + \ No newline at end of file diff --git a/k8s/argoapps/apps-values/basic-webapp.yaml b/k8s/argoapps/apps-values/webapps.yaml similarity index 100% rename from k8s/argoapps/apps-values/basic-webapp.yaml rename to k8s/argoapps/apps-values/webapps.yaml diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index ebcee88..2553671 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -40,8 +40,8 @@ videohosting: 6881: 6881 apps: - basic-webapps: - valuesFile: basic-webapp.yaml + webapps: + valuesFile: webapps.yaml syncPolicy: automated: selfHeal: true