From 57f7feb06e958cc690c8baa3a3ff0bc8d5a4273c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 15 Apr 2023 03:12:11 +0000 Subject: [PATCH] ingresses --- k8s/apps/ingresses/values-dev.yaml | 7 +++ k8s/apps/ingresses/values-prod.yaml | 10 +++++ k8s/apps/ingresses/values.yaml | 47 ++++++++++++++++++++ k8s/argoapps/templates/argoappset-apps.yaml | 9 ++-- k8s/argocd/values/dev/ingresses.yaml | 9 +--- k8s/argocd/values/prod/ingresses.yaml | 12 +---- k8s/argocd/values/shared/ingresses.yaml | 49 +-------------------- 7 files changed, 72 insertions(+), 71 deletions(-) create mode 100644 k8s/apps/ingresses/values-dev.yaml create mode 100644 k8s/apps/ingresses/values-prod.yaml diff --git a/k8s/apps/ingresses/values-dev.yaml b/k8s/apps/ingresses/values-dev.yaml new file mode 100644 index 0000000..d5c19ca --- /dev/null +++ b/k8s/apps/ingresses/values-dev.yaml @@ -0,0 +1,7 @@ +reverseProxy: + home: + port: "8123" + ip: "192.168.0.20" + yellow: + port: "8123" + ip: "192.168.0.23" diff --git a/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml new file mode 100644 index 0000000..1e39b39 --- /dev/null +++ b/k8s/apps/ingresses/values-prod.yaml @@ -0,0 +1,10 @@ +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/apps/ingresses/values.yaml b/k8s/apps/ingresses/values.yaml index e69de29..86a003f 100644 --- a/k8s/apps/ingresses/values.yaml +++ b/k8s/apps/ingresses/values.yaml @@ -0,0 +1,47 @@ +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 diff --git a/k8s/argoapps/templates/argoappset-apps.yaml b/k8s/argoapps/templates/argoappset-apps.yaml index db68920..f2175e5 100644 --- a/k8s/argoapps/templates/argoappset-apps.yaml +++ b/k8s/argoapps/templates/argoappset-apps.yaml @@ -20,16 +20,17 @@ metadata: spec: project: {{ $argoappsetApps }} source: - repoURL: "git@github.com:{{ .Values.gitops.repo }}.git" - targetRevision: "{{ .Values.gitops.commit }}" + repoURL: "git@github.com:{{ $.Values.gitops.repo }}.git" + targetRevision: "{{ $.Values.gitops.commit }}" path: 'k8s/apps/{{ $appName }}' helm: valueFiles: - values.yaml + - values-{{$.Values.global.deployment}}.yaml values: |- + {{- tpl $appProps $ | nindent 8 }} global: - {{- .Values.global | toYaml | nindent 28 }} - {{- tpl ($appProps | default "") $ | nindent 8}} + {{- $.Values.global | toYaml | nindent 10 }} releaseName: {{ $appName }} destination: server: https://kubernetes.default.svc diff --git a/k8s/argocd/values/dev/ingresses.yaml b/k8s/argocd/values/dev/ingresses.yaml index 6f13651..967c0fc 100644 --- a/k8s/argocd/values/dev/ingresses.yaml +++ b/k8s/argocd/values/dev/ingresses.yaml @@ -1,9 +1,2 @@ apps: - ingresses: - reverseProxy: - home: - port: "8123" - ip: "192.168.0.20" - yellow: - port: "8123" - ip: "192.168.0.23" + ingresses: "" diff --git a/k8s/argocd/values/prod/ingresses.yaml b/k8s/argocd/values/prod/ingresses.yaml index a984abb..967c0fc 100644 --- a/k8s/argocd/values/prod/ingresses.yaml +++ b/k8s/argocd/values/prod/ingresses.yaml @@ -1,12 +1,2 @@ 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" + ingresses: "" diff --git a/k8s/argocd/values/shared/ingresses.yaml b/k8s/argocd/values/shared/ingresses.yaml index 76e959f..967c0fc 100644 --- a/k8s/argocd/values/shared/ingresses.yaml +++ b/k8s/argocd/values/shared/ingresses.yaml @@ -1,49 +1,2 @@ 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 + ingresses: ""