diff --git a/k8s/argoapps/templates/charts-infra.yaml b/k8s/argoapps/templates/charts-infra.yaml index f03595f..641b294 100644 --- a/k8s/argoapps/templates/charts-infra.yaml +++ b/k8s/argoapps/templates/charts-infra.yaml @@ -1,5 +1,5 @@ {{- $infraChartProjectName := "infrastructure-charts" -}} -{{ include "homelab.argo.project" (dict "Values" $.Values "name" $infraChartProjectName "description" "infrastructure helm charts")}} +{{ include "homelab.argo.project" (dict "name" $infraChartProjectName "description" "infrastructure helm charts")}} {{ range $chartName, $chartProps := .Values.infrastructureCharts }} diff --git a/k8s/argocd/values/dev/ingresses.yaml b/k8s/argocd/values/dev/ingresses.yaml index d5c19ca..6f13651 100644 --- a/k8s/argocd/values/dev/ingresses.yaml +++ b/k8s/argocd/values/dev/ingresses.yaml @@ -1,7 +1,9 @@ -reverseProxy: - home: - port: "8123" - ip: "192.168.0.20" - yellow: - port: "8123" - ip: "192.168.0.23" +apps: + ingresses: + reverseProxy: + home: + port: "8123" + ip: "192.168.0.20" + yellow: + port: "8123" + ip: "192.168.0.23" diff --git a/k8s/argocd/values/prod/ingresses.yaml b/k8s/argocd/values/prod/ingresses.yaml index 1e39b39..a984abb 100644 --- a/k8s/argocd/values/prod/ingresses.yaml +++ b/k8s/argocd/values/prod/ingresses.yaml @@ -1,10 +1,12 @@ -reverseProxy: - main: - port: "8123" - ip: "192.168.0.20" - yellow: - port: "8123" - ip: "192.168.0.23" - nas: - ip: "192.168.8.107" - port: "80" +apps: + ingresses: + reverseProxy: + main: + port: "8123" + ip: "192.168.0.20" + yellow: + port: "8123" + ip: "192.168.0.23" + nas: + ip: "192.168.8.107" + port: "80" diff --git a/k8s/argocd/values/shared/ingresses.yaml b/k8s/argocd/values/shared/ingresses.yaml index ee8f177..76e959f 100644 --- a/k8s/argocd/values/shared/ingresses.yaml +++ b/k8s/argocd/values/shared/ingresses.yaml @@ -1,48 +1,49 @@ -reverseProxy: {} -services: - - prefix: "argocd.core" - service: "argocd-server" - namespace: "argocd" - - prefix: "demo" - service: "dummy-app" - namespace: "ingresses" - middleware: "ingresses-chain-authelia" -# - prefix: "client.torrent" -# service: "transmission" -# namespace: "app-videohosting" -# port: "9091" -# middleware: "ingresses-chain-authelia" -# - prefix: "radarr.torrent" -# service: "radarr" -# namespace: "app-videohosting" -# port: "7878" -# middleware: "ingresses-chain-authelia" -# # - prefix: "q.torrent" -# # service: "qbittorrent" -# # namespace: "app-videohosting" -# # port: "8080" -# # middleware: "ingresses-chain-authelia" -# - prefix: "sonarr.torrent" -# service: "sonarr" -# namespace: "app-videohosting" -# port: "8989" -# middleware: "ingresses-chain-authelia" -# - prefix: "jackett.torrent" -# service: "jackett" -# namespace: "app-videohosting" -# port: "9117" -# middleware: "ingresses-chain-authelia" -# - prefix: "nextcloud" -# service: "nextcloud" -# namespace: "app-nextcloud" -# port: 8080 -# middleware: "app-nextcloud-nextcloud" -# - prefix: "authentik.core" -# service: "authentik" -# namespace: "authentik" -# port: 80 -# - prefix: "plex" -# service: "plex" -# namespace: "app-videohosting" -# port: 32400 - +apps: + ingresses: + reverseProxy: {} + services: + - prefix: "argocd.core" + service: "argocd-server" + namespace: "argocd" + - prefix: "demo" + service: "dummy-app" + namespace: "ingresses" + middleware: "ingresses-chain-authelia" + # - prefix: "client.torrent" + # service: "transmission" + # namespace: "app-videohosting" + # port: "9091" + # middleware: "ingresses-chain-authelia" + # - prefix: "radarr.torrent" + # service: "radarr" + # namespace: "app-videohosting" + # port: "7878" + # middleware: "ingresses-chain-authelia" + # # - prefix: "q.torrent" + # # service: "qbittorrent" + # # namespace: "app-videohosting" + # # port: "8080" + # # middleware: "ingresses-chain-authelia" + # - prefix: "sonarr.torrent" + # service: "sonarr" + # namespace: "app-videohosting" + # port: "8989" + # middleware: "ingresses-chain-authelia" + # - prefix: "jackett.torrent" + # service: "jackett" + # namespace: "app-videohosting" + # port: "9117" + # middleware: "ingresses-chain-authelia" + # - prefix: "nextcloud" + # service: "nextcloud" + # namespace: "app-nextcloud" + # port: 8080 + # middleware: "app-nextcloud-nextcloud" + # - prefix: "authentik.core" + # service: "authentik" + # namespace: "authentik" + # port: 80 + # - prefix: "plex" + # service: "plex" + # namespace: "app-videohosting" + # port: 32400