From a5a23969088dffc0a5d891c15953cc0e20a5efa8 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 29 Feb 2024 10:38:05 -0500 Subject: [PATCH 01/24] updated videohosting --- k8s/apps/videohosting/values.yaml | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/k8s/apps/videohosting/values.yaml b/k8s/apps/videohosting/values.yaml index 1b44834..c7ca3c6 100644 --- a/k8s/apps/videohosting/values.yaml +++ b/k8s/apps/videohosting/values.yaml @@ -8,8 +8,8 @@ global: familyvideos: "changeme" plex: repo: "plexinc/pms-docker" - tag: "1.32.7.7621-871adbd44" - resources: + tag: "1.40.0.7998-c29d4c0c8" + resources: limits: memory: "14Gi" requests: @@ -18,7 +18,7 @@ plex: jellyfin: repo: "lscr.io/linuxserver/jellyfin" tag: latest - resources: + resources: limits: memory: "14Gi" requests: @@ -28,8 +28,8 @@ jellyfin: arrs: sonarr: repo: lscr.io/linuxserver/sonarr - tag: "4.0.1.929-ls225" - migrateDbFromSqllite: + tag: "4.0.2.1183-ls229" + migrateDbFromSqllite: enabled: false claimName: config-sonarr-0 usePostgres: true @@ -48,11 +48,11 @@ arrs: Sosnovsky Sonarr External DisabledForLocalAddresses - + radarr: repo: lscr.io/linuxserver/radarr - tag: "5.2.6.8376-ls203" - migrateDbFromSqllite: + tag: "5.3.6.8612-ls206" + migrateDbFromSqllite: enabled: false claimName: config-radarr-0 usePostgres: true @@ -71,11 +71,11 @@ arrs: Sosnovsky Radarr External DisabledForLocalAddresses - + readarr: repo: lscr.io/linuxserver/readarr tag: "develop-0.3.18.2411-ls88" - migrateDbFromSqllite: + migrateDbFromSqllite: enabled: false usePostgres: true podResources: @@ -92,11 +92,11 @@ arrs: extraConfigXml: |- Sosnovsky Readarr DisabledForLocalAddresses - + prowlarr: repo: lscr.io/linuxserver/prowlarr - tag: "1.13.3.4273-ls53" - migrateDbFromSqllite: + tag: "1.13.3.4273-ls54" + migrateDbFromSqllite: enabled: false claimName: config-prowlarr-0 usePostgres: true @@ -120,7 +120,7 @@ services: bazarr: kind: StatefulSet repo: lscr.io/linuxserver/bazarr - tag: "v1.4.1-ls238" + tag: "v1.4.2-ls240" ports: tcp: web: 6767 @@ -134,7 +134,7 @@ services: requests: cpu: 250m memory: "500M" - + jellyplex: kind: Deployment disableSVC: true @@ -154,4 +154,4 @@ services: memory: "500M" requests: cpu: 50m - memory: "500M" \ No newline at end of file + memory: "500M" From 1ce73976bcef826af4c1afd1addd4a5652561c3b Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 29 Feb 2024 10:40:19 -0500 Subject: [PATCH 02/24] nfs-generic for redis --- k8s/argoapps/apps-values/nextcloud.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/k8s/argoapps/apps-values/nextcloud.yaml b/k8s/argoapps/apps-values/nextcloud.yaml index 1f04c1b..077c050 100644 --- a/k8s/argoapps/apps-values/nextcloud.yaml +++ b/k8s/argoapps/apps-values/nextcloud.yaml @@ -1,16 +1,16 @@ global: - storageClass: {{ .Values.global.nfs.storageClass }} + storageClass: { { .Values.global.nfs.storageClass } } nextcloud: nextcloud: host: "nextcloud.{{ .Values.global.domain }}" externalDatabase: host: postgres.chart-database.svc.cluster.local persistence: - storageClass: {{ .Values.global.nfs.storageClass }} - existingClaim: {{ .Values.storage.nextcloudConfig.name }} + storageClass: { { .Values.global.nfs.storageClass } } + existingClaim: { { .Values.storage.nextcloudConfig.name } } nextcloudData: - storageClass: {{ .Values.global.nfs.storageClass }} - existingClaim: {{ .Values.storage.nextcloudData.name }} + storageClass: { { .Values.global.nfs.storageClass } } + existingClaim: { { .Values.storage.nextcloudData.name } } configs: authelia.config.php: |- Date: Thu, 29 Feb 2024 10:40:55 -0500 Subject: [PATCH 03/24] nfs-generic for redis --- k8s/argoapps/apps-values/nextcloud.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/k8s/argoapps/apps-values/nextcloud.yaml b/k8s/argoapps/apps-values/nextcloud.yaml index 077c050..c80f195 100644 --- a/k8s/argoapps/apps-values/nextcloud.yaml +++ b/k8s/argoapps/apps-values/nextcloud.yaml @@ -1,16 +1,16 @@ global: - storageClass: { { .Values.global.nfs.storageClass } } + storageClass: {{ .Values.global.nfs.storageClass }} nextcloud: nextcloud: host: "nextcloud.{{ .Values.global.domain }}" externalDatabase: host: postgres.chart-database.svc.cluster.local persistence: - storageClass: { { .Values.global.nfs.storageClass } } - existingClaim: { { .Values.storage.nextcloudConfig.name } } + storageClass: {{ .Values.global.nfs.storageClass }} + existingClaim: {{ .Values.storage.nextcloudConfig.name }} nextcloudData: - storageClass: { { .Values.global.nfs.storageClass } } - existingClaim: { { .Values.storage.nextcloudData.name } } + storageClass: {{ .Values.global.nfs.storageClass }} + existingClaim: {{ .Values.storage.nextcloudData.name }} configs: authelia.config.php: |- Date: Thu, 29 Feb 2024 11:00:06 -0500 Subject: [PATCH 04/24] nxtcloud redis replica count --- k8s/apps/nextcloud/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/k8s/apps/nextcloud/values.yaml b/k8s/apps/nextcloud/values.yaml index 2d68bbf..a53920f 100644 --- a/k8s/apps/nextcloud/values.yaml +++ b/k8s/apps/nextcloud/values.yaml @@ -9,8 +9,9 @@ nextcloud: nodeSelector: homelab/capacity: high - + cronjob: + enabled: true resources: requests: cpu: "500m" @@ -59,9 +60,8 @@ nextcloud: enabled: true auth: enabled: true - - cronjob: - enabled: true + replica: + replicaCount: 1 persistence: enabled: true @@ -91,4 +91,4 @@ nextcloud: ephemeral-storage: "100Ki" limits: memory: 1Gi - ephemeral-storage: "100Mi" \ No newline at end of file + ephemeral-storage: "100Mi" From a96d04882b68345aeb4138fb1f020dca56ecbba3 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 29 Feb 2024 11:08:49 -0500 Subject: [PATCH 05/24] nxtcloud setup --- k8s/apps/nextcloud/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/apps/nextcloud/values.yaml b/k8s/apps/nextcloud/values.yaml index a53920f..dc219cb 100644 --- a/k8s/apps/nextcloud/values.yaml +++ b/k8s/apps/nextcloud/values.yaml @@ -5,7 +5,7 @@ nextcloud: pullPolicy: IfNotPresent flavor: fpm - replicaCount: 2 + replicaCount: 1 nodeSelector: homelab/capacity: high @@ -70,7 +70,7 @@ nextcloud: resources: requests: cpu: "500m" - memory: "1Gi" + memory: "5Gi" ephemeral-storage: "20Mi" limits: memory: 10Gi From 8b5200785f136f06c2e0d1ca8bf5dd5ad14cecb2 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 29 Feb 2024 11:26:10 -0500 Subject: [PATCH 06/24] nxtcloud setup --- k8s/apps/nextcloud/values.yaml | 7 ++--- k8s/apps/webapps/templates/deploy-apps.yaml | 2 ++ k8s/argoapps/apps-values/webapps.yaml | 33 +++++++++++---------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/k8s/apps/nextcloud/values.yaml b/k8s/apps/nextcloud/values.yaml index dc219cb..8889446 100644 --- a/k8s/apps/nextcloud/values.yaml +++ b/k8s/apps/nextcloud/values.yaml @@ -15,10 +15,9 @@ nextcloud: resources: requests: cpu: "500m" - memory: "1Gi" + memory: "100Mi" ephemeral-storage: "40Ki" limits: - memory: 5Gi ephemeral-storage: "40Mi" nextcloud: @@ -70,10 +69,9 @@ nextcloud: resources: requests: cpu: "500m" - memory: "5Gi" + memory: "2Gi" ephemeral-storage: "20Mi" limits: - memory: 10Gi ephemeral-storage: "200Mi" hpa: @@ -90,5 +88,4 @@ nextcloud: memory: "256Mi" ephemeral-storage: "100Ki" limits: - memory: 1Gi ephemeral-storage: "100Mi" diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index 3bd32bb..8fcd876 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -1,4 +1,5 @@ {{ range $k, $v := .Values.apps }} +{{ if ($v.enabled | default true ) }} --- kind: Service apiVersion: v1 @@ -117,4 +118,5 @@ spec: envFrom: {{ ($v.envFrom | default list) | toJson }} env: {{ ($v.env | default list) | toJson }} volumeMounts: {{ ($v.volumeMounts | default list) | toJson }} +{{ end }} {{ end }} \ No newline at end of file diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 0edac87..c35da2e 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -1,7 +1,8 @@ apps: quirky: + enabled: true ingress: - middleware: apps-ingresses-https-redirect + middleware: apps-ingresses-https-redirect repo: ghcr.io/asosnovsky/quirky tag: "latest" podResources: @@ -20,9 +21,10 @@ apps: - med - low ollama: + enabled: false ingress: - middleware: apps-ingresses-chain-authentik - repo: ollama/ollama + middleware: apps-ingresses-chain-authentik + repo: ollama/ollama tag: "latest" podResources: limits: @@ -36,19 +38,20 @@ apps: tcp: web: 11434 volumes: - - name: config - persistentVolumeClaim: - claimName: {{ .Values.storage.ollama.name }} + - name: config + persistentVolumeClaim: + claimName: { { .Values.storage.ollama.name } } volumeMounts: - - name: config - mountPath: /root/.ollama + - name: config + mountPath: /root/.ollama capacity: - med - high ollama-web: + enabled: false ingress: - middleware: apps-ingresses-chain-authentik - repo: ghcr.io/ollama-webui/ollama-webui + middleware: apps-ingresses-chain-authentik + repo: ghcr.io/ollama-webui/ollama-webui tag: "main" podResources: limits: @@ -66,12 +69,12 @@ apps: tcp: web: 8080 volumes: - - name: config - persistentVolumeClaim: - claimName: {{ .Values.storage.ollamaWebGui.name }} + - name: config + persistentVolumeClaim: + claimName: { { .Values.storage.ollamaWebGui.name } } volumeMounts: - - name: config - mountPath: /app/backend/data + - name: config + mountPath: /app/backend/data capacity: - med - low From 3ed3264568aa38a0ddf202d692b6f4aadb67151d Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 29 Feb 2024 11:27:51 -0500 Subject: [PATCH 07/24] nxtcloud setup --- k8s/argoapps/apps-values/webapps.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index c35da2e..7f84f40 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -40,7 +40,7 @@ apps: volumes: - name: config persistentVolumeClaim: - claimName: { { .Values.storage.ollama.name } } + claimName: {{ .Values.storage.ollama.name }} volumeMounts: - name: config mountPath: /root/.ollama @@ -71,7 +71,7 @@ apps: volumes: - name: config persistentVolumeClaim: - claimName: { { .Values.storage.ollamaWebGui.name } } + claimName: {{ .Values.storage.ollamaWebGui.name }} volumeMounts: - name: config mountPath: /app/backend/data From fba528a48bc14d2a3486de743a502c6fa937fa92 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 29 Feb 2024 11:29:29 -0500 Subject: [PATCH 08/24] nxtcloud setup --- k8s/apps/webapps/templates/deploy-apps.yaml | 2 +- k8s/apps/webapps/values-dev.yaml | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index 8fcd876..a9455da 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -1,5 +1,5 @@ {{ range $k, $v := .Values.apps }} -{{ if ($v.enabled | default true ) }} +{{ if $v.enabled }} --- kind: Service apiVersion: v1 diff --git a/k8s/apps/webapps/values-dev.yaml b/k8s/apps/webapps/values-dev.yaml index 7d686b5..a8acad0 100644 --- a/k8s/apps/webapps/values-dev.yaml +++ b/k8s/apps/webapps/values-dev.yaml @@ -1,7 +1,8 @@ apps: quirky: + enabled: true ingress: - middleware: apps-ingresses-https-redirect + middleware: apps-ingresses-https-redirect repo: ghcr.io/asosnovsky/quirky tag: "latest" podResources: @@ -20,9 +21,10 @@ apps: - med - low ollama: + enabled: false ingress: - middleware: apps-ingresses-chain-authentik - repo: ollama/ollama + middleware: apps-ingresses-chain-authentik + repo: ollama/ollama tag: "latest" podResources: limits: @@ -39,12 +41,12 @@ apps: tcp: web: 11434 volumes: - - name: config - persistentVolumeClaim: - claimName: pv-ollama + - name: config + persistentVolumeClaim: + claimName: pv-ollama volumeMounts: - - name: config - mountPath: /root/.ollama + - name: config + mountPath: /root/.ollama capacity: - med - - high \ No newline at end of file + - high From 5a93b7830a65ff274f21eb47e8732c7595901f93 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Mon, 4 Mar 2024 10:34:21 -0500 Subject: [PATCH 09/24] added nextcloud v28.0.2 --- k8s/apps/nextcloud/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/nextcloud/values.yaml b/k8s/apps/nextcloud/values.yaml index 8889446..32c5ba9 100644 --- a/k8s/apps/nextcloud/values.yaml +++ b/k8s/apps/nextcloud/values.yaml @@ -1,7 +1,7 @@ nextcloud: image: repository: "ghcr.io/asosnovsky/nextcloud" - tag: "v1.1.1" + tag: "v28.0.2" pullPolicy: IfNotPresent flavor: fpm From fc99788e2e6d4fa26dc8a1d8bab3c51a3779aaea Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 11:53:33 -0500 Subject: [PATCH 10/24] Added service cluster mappings --- k8s/argocd/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index 3fd966d..3c9af46 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -6,6 +6,9 @@ argo-cd: server.insecure: true server.basehref: / server.rootpath: "" + redis.server: "argocd-redis.argocd.svc.cluster.local:6379" + repo.server: "argocd-repo-server.argocd.svc.cluster.local:8081" + server.dex.server: "http://argocd-dex-server.argocd.svc.cluster.local:5556" crds: install: true keep: false From dfaeb1a5f6edd7fc42106ae95dd86d6d2b3967b6 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:15:50 -0500 Subject: [PATCH 11/24] Updated argo + dryrun script --- bin/dryrun-argo.sh | 13 ++++++++++--- k8s/argocd/Chart.yaml | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/dryrun-argo.sh b/bin/dryrun-argo.sh index 88f7a73..2be7e18 100755 --- a/bin/dryrun-argo.sh +++ b/bin/dryrun-argo.sh @@ -2,6 +2,8 @@ mkdir -p .tmp deployment=${1:-dev} +keep_old=${2:-no} +keep_old=$(echo "${keep_old:0:1}" | tr '[:upper:]' '[:lower:]') app=argocd location=k8s/$app full_path=$(realpath $location) @@ -14,10 +16,15 @@ popd &> /dev/null if [ -f "$tmp_path" ]; then echo "Found existing file" - echo " -> Renaming old file to "$tmp_path".old" - mv $tmp_path $tmp_path".old" + if [[ -f "$tmp_path".old && "${keep_old:0:1}" == "y" ]]; then + num_files=$(ls -1q "${tmp_path}.old"* 2> /dev/null | wc -l | tr -d '[:space:]') + echo " -> Renaming old file to "$tmp_path".old.${num_files}" + mv $tmp_path $tmp_path".old.${num_files}" + else + echo " -> Renaming old file to "$tmp_path".old" + mv $tmp_path $tmp_path".old" + fi fi - helm template $app $full_path --namespace $app \ --debug \ --create-namespace \ diff --git a/k8s/argocd/Chart.yaml b/k8s/argocd/Chart.yaml index 1594a60..79733dc 100644 --- a/k8s/argocd/Chart.yaml +++ b/k8s/argocd/Chart.yaml @@ -5,5 +5,5 @@ type: application version: 0.1.0 dependencies: - name: argo-cd - version: 5.35.0 - repository: https://argoproj.github.io/argo-helm \ No newline at end of file + version: 6.6.0 + repository: https://argoproj.github.io/argo-helm From ae350e895b6c657163d7cbbf8da4c0768cbc69fd Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:21:54 -0500 Subject: [PATCH 12/24] Updated script + argocdUrl --- bin/dryrun-argo.sh | 2 ++ k8s/argocd/templates/app-self.yaml | 1 + k8s/argocd/values-dev.yaml | 3 +++ k8s/argocd/values-prod.yaml | 3 +++ k8s/argocd/values.yaml | 2 ++ shell.nix | 0 6 files changed, 11 insertions(+) create mode 100644 k8s/argocd/values-dev.yaml create mode 100644 k8s/argocd/values-prod.yaml create mode 100644 shell.nix diff --git a/bin/dryrun-argo.sh b/bin/dryrun-argo.sh index 2be7e18..cb5aa23 100755 --- a/bin/dryrun-argo.sh +++ b/bin/dryrun-argo.sh @@ -21,6 +21,7 @@ if [ -f "$tmp_path" ]; then echo " -> Renaming old file to "$tmp_path".old.${num_files}" mv $tmp_path $tmp_path".old.${num_files}" else + rm $tmp_path".old"* echo " -> Renaming old file to "$tmp_path".old" mv $tmp_path $tmp_path".old" fi @@ -29,6 +30,7 @@ helm template $app $full_path --namespace $app \ --debug \ --create-namespace \ --values k8s/argocd/values.yaml \ + --values k8s/argocd/values-${deployment}.yaml \ --set selfapp.deployment="${deployment}" \ --set selfapp.enabled="true" \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index d7d50f9..4b0b6cc 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -30,6 +30,7 @@ spec: helm: valueFiles: - values.yaml + - values-{{ .Values.selfapp.deployment }}.yaml parameters: - name: "selfapp.deployment" value: {{ .Values.selfapp.deployment | quote }} diff --git a/k8s/argocd/values-dev.yaml b/k8s/argocd/values-dev.yaml new file mode 100644 index 0000000..80d1576 --- /dev/null +++ b/k8s/argocd/values-dev.yaml @@ -0,0 +1,3 @@ +argo-cd: + notifications: + argocdUrl: "https://argocd.home.local" diff --git a/k8s/argocd/values-prod.yaml b/k8s/argocd/values-prod.yaml new file mode 100644 index 0000000..3ad2aaf --- /dev/null +++ b/k8s/argocd/values-prod.yaml @@ -0,0 +1,3 @@ +argo-cd: + notifications: + argocdUrl: "https://argocd.core.home.sosnovsky.ca" diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index 3c9af46..bc17633 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -1,4 +1,6 @@ argo-cd: + notifications: + argocdUrl: "" configs: cm: exec.enabled: true diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..e69de29 From 5503e04155cbd5e9544585b3a0bdceb2355e40ce Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:24:36 -0500 Subject: [PATCH 13/24] Added global domain --- k8s/argocd/values-dev.yaml | 5 ++--- k8s/argocd/values-prod.yaml | 5 ++--- k8s/argocd/values.yaml | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/k8s/argocd/values-dev.yaml b/k8s/argocd/values-dev.yaml index 80d1576..c6996f9 100644 --- a/k8s/argocd/values-dev.yaml +++ b/k8s/argocd/values-dev.yaml @@ -1,3 +1,2 @@ -argo-cd: - notifications: - argocdUrl: "https://argocd.home.local" +global: + domain: argocd.home.internal diff --git a/k8s/argocd/values-prod.yaml b/k8s/argocd/values-prod.yaml index 3ad2aaf..46010d3 100644 --- a/k8s/argocd/values-prod.yaml +++ b/k8s/argocd/values-prod.yaml @@ -1,3 +1,2 @@ -argo-cd: - notifications: - argocdUrl: "https://argocd.core.home.sosnovsky.ca" +global: + domain: argocd.core.home.sosnovsky.ca diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index bc17633..3c9af46 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -1,6 +1,4 @@ argo-cd: - notifications: - argocdUrl: "" configs: cm: exec.enabled: true From cb6d3205fe3048fc134d9d0e23ef0ceca1dde819 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:31:41 -0500 Subject: [PATCH 14/24] Updated Authentik --- k8s/argoapps/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index e8886f0..c2928d9 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -109,7 +109,7 @@ infrastructureCharts: enableServerSideApply: true authentik: repoURL: https://charts.goauthentik.io - targetRevision: "2023.10.5" + targetRevision: "2024.4.4" valuesFile: authentik.yaml homepage: repoURL: https://jameswynn.github.io/helm-charts From 3f5514601d82ce786ab1089fe0c2b8af2ad26d7c Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:33:09 -0500 Subject: [PATCH 15/24] correct auhentik chart version --- k8s/argoapps/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index c2928d9..e7cc37b 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -109,7 +109,7 @@ infrastructureCharts: enableServerSideApply: true authentik: repoURL: https://charts.goauthentik.io - targetRevision: "2024.4.4" + targetRevision: "2024.2.2" valuesFile: authentik.yaml homepage: repoURL: https://jameswynn.github.io/helm-charts From 81bdd75ed0411a710896f47bbaca82ed62363bce Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:38:52 -0500 Subject: [PATCH 16/24] Updated ingress --- .vscode/settings.json | 5 ++++- k8s/argoapps/apps-values/ingresses.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a7ca120..0dda542 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,7 @@ { - "yaml.schemas": {}, + "yaml.schemas": { + "file:///Users/asosnovsky/.vscode/extensions/docsmsft.docs-yaml-1.0.1/dist/toc.schema.json": "/toc\\.yml/i", + "https://json.schemastore.org/helmfile.json": "file:///Users/asosnovsky/git/personal/homelab/k8s/argoapps/apps-values/ingresses.yaml" + }, "git-blame.gitWebUrl": "" } \ No newline at end of file diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 497cbe5..547b034 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -32,7 +32,7 @@ services: icon: "https://grafana.core.home.sosnovsky.ca/public/img/fav32.png" health: "healthz" - prefix: "authentik.core" - service: "authentik" + service: "authentik-server" namespace: "chart-authentik" group: "Core" icon: "https://authentik.core.home.sosnovsky.ca/static/dist/assets/icons/icon.png" From 1a8f4d30b54af136604029b8c93e8f681ae2a981 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:40:33 -0500 Subject: [PATCH 17/24] Moved authentik envFrom --- k8s/argoapps/chart-values/authentik.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/k8s/argoapps/chart-values/authentik.yaml b/k8s/argoapps/chart-values/authentik.yaml index aa68a71..65e4cd0 100644 --- a/k8s/argoapps/chart-values/authentik.yaml +++ b/k8s/argoapps/chart-values/authentik.yaml @@ -1,10 +1,10 @@ authentik: cookie_domain: authentik.core.{{ .Values.global.domain }} email: - from: {{ .Values.global.smtp.email }} + from: { { .Values.global.smtp.email } } host: postfix.email.svc.cluster.local port: 25 - username: {{ .Values.global.smtp.email }} + username: { { .Values.global.smtp.email } } use_ssl: false postgresql: host: postgres.chart-database.svc.cluster.local @@ -14,8 +14,7 @@ postgresql: enabled: false redis: enabled: true -envFrom: - - secretRef: - name: {{ .Values.secrets.authentik.secrets.env.name }} - - +global: + envFrom: + - secretRef: + name: { { .Values.secrets.authentik.secrets.env.name } } From d2dd4ad5d9d091e7cfdb5724badef0a507256bd0 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:41:08 -0500 Subject: [PATCH 18/24] Linters are crazy --- k8s/argoapps/chart-values/authentik.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/k8s/argoapps/chart-values/authentik.yaml b/k8s/argoapps/chart-values/authentik.yaml index 65e4cd0..6fd4c90 100644 --- a/k8s/argoapps/chart-values/authentik.yaml +++ b/k8s/argoapps/chart-values/authentik.yaml @@ -1,10 +1,10 @@ authentik: cookie_domain: authentik.core.{{ .Values.global.domain }} email: - from: { { .Values.global.smtp.email } } + from: {{ .Values.global.smtp.email }} host: postfix.email.svc.cluster.local port: 25 - username: { { .Values.global.smtp.email } } + username: {{ .Values.global.smtp.email }} use_ssl: false postgresql: host: postgres.chart-database.svc.cluster.local @@ -17,4 +17,6 @@ redis: global: envFrom: - secretRef: - name: { { .Values.secrets.authentik.secrets.env.name } } + name: {{ .Values.secrets.authentik.secrets.env.name }} + + From b20adbb07dbc5780e8bc402cfa94397785c67b3a Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:49:35 -0500 Subject: [PATCH 19/24] fixed authentik auth --- k8s/apps/ingresses/templates/middleware-common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/apps/ingresses/templates/middleware-common.yaml b/k8s/apps/ingresses/templates/middleware-common.yaml index e67ff27..7aacc42 100644 --- a/k8s/apps/ingresses/templates/middleware-common.yaml +++ b/k8s/apps/ingresses/templates/middleware-common.yaml @@ -47,7 +47,7 @@ metadata: app.kubernetes.io/name: authentik spec: forwardAuth: - address: http://authentik.chart-authentik.svc.cluster.local:80/outpost.goauthentik.io/auth/traefik + address: http://authentik-server.chart-authentik.svc.cluster.local:80/outpost.goauthentik.io/auth/traefik trustForwardHeader: true authResponseHeaders: - X-authentik-username From 7d98b37ecbd4fd60f63cf57e02272e8a056aa3f9 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:57:21 -0500 Subject: [PATCH 20/24] Updated prom --- k8s/argoapps/chart-values/prometheus.yaml | 1 + k8s/argoapps/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/k8s/argoapps/chart-values/prometheus.yaml b/k8s/argoapps/chart-values/prometheus.yaml index baea455..346c415 100644 --- a/k8s/argoapps/chart-values/prometheus.yaml +++ b/k8s/argoapps/chart-values/prometheus.yaml @@ -1,5 +1,6 @@ cleanPrometheusOperatorObjectNames: false alertmanager: + enabled: true alertmanagerSpec: storage: volumeClaimTemplate: diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index e7cc37b..a2f139a 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -104,7 +104,7 @@ infrastructureCharts: prometheus: chart: kube-prometheus-stack repoURL: "https://prometheus-community.github.io/helm-charts" - targetRevision: "51.10.0" + targetRevision: "56.21.2" valuesFile: prometheus.yaml enableServerSideApply: true authentik: From 3adfeb0fc3461b07b76f1295c604c92ddfd104f4 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 8 Mar 2024 14:13:58 -0500 Subject: [PATCH 21/24] about me --- k8s/argoapps/apps-values/webapps.yaml | 21 +++++++++++++++++++++ k8s/argoapps/values-prod.yaml | 1 + 2 files changed, 22 insertions(+) diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 7f84f40..9310778 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -20,6 +20,27 @@ apps: capacity: - med - low + me: + enabled: true + ingress: + middleware: apps-ingresses-https-redirect + repo: ghcr.io/asosnovsky/aboutme + tag: "latest" + podResources: + limits: + memory: "250Mi" + requests: + cpu: 250m + memory: "250Mi" + health: + readiness: "/" + liveness: "/" + ports: + tcp: + web: 8080 + capacity: + - med + - low ollama: enabled: false ingress: diff --git a/k8s/argoapps/values-prod.yaml b/k8s/argoapps/values-prod.yaml index 387be7b..e9c6fff 100644 --- a/k8s/argoapps/values-prod.yaml +++ b/k8s/argoapps/values-prod.yaml @@ -1,6 +1,7 @@ global: deployment: prod domain: "home.sosnovsky.ca" + secondaryDomain: "skyg.ca" tls: useWildCard: true enabled: true From ee2f953582acb6b8e58f1462ce00a92186d6e0f0 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 8 Mar 2024 14:19:10 -0500 Subject: [PATCH 22/24] about me --- k8s/argoapps/apps-values/ingresses.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index 547b034..fbe9110 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -100,6 +100,7 @@ services: {{- $webapps := .Files.Get (printf "apps-values/%s" .Values.apps.webapps.valuesFile) }} {{- $webapps := tpl $webapps . | fromYaml }} {{- range $k, $v := $webapps.apps }} + {{ if $v.enabled }} - prefix: "{{ $k }}-app" service: "{{ $k }}" namespace: "apps-webapps" @@ -110,4 +111,5 @@ services: middleware: "apps-ingresses-chain-authentik" {{ end -}} group: "Basic Webapps" + {{ end }} {{- end }} \ No newline at end of file From c57b8f6c3f7413fa26bd666d241b9ac7f0531050 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 8 Mar 2024 14:21:30 -0500 Subject: [PATCH 23/24] Updated ignress def --- k8s/argoapps/apps-values/ingresses.yaml | 2 +- k8s/argoapps/apps-values/webapps.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index fbe9110..c532c7e 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -101,7 +101,7 @@ services: {{- $webapps := tpl $webapps . | fromYaml }} {{- range $k, $v := $webapps.apps }} {{ if $v.enabled }} - - prefix: "{{ $k }}-app" + - prefix: "{{ $v.ingress.prefix | default (printf "%s-app" $k) }}" service: "{{ $k }}" namespace: "apps-webapps" port: {{ $v.ports.tcp.web }} diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 9310778..83bf840 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -23,6 +23,7 @@ apps: me: enabled: true ingress: + prefix: aboutme middleware: apps-ingresses-https-redirect repo: ghcr.io/asosnovsky/aboutme tag: "latest" From 75201335392048428e1fad8600da9beb401d682e Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Fri, 8 Mar 2024 14:35:40 -0500 Subject: [PATCH 24/24] support for other domains --- .../ingresses/templates/_helpers/ingress.yaml | 50 ++++++++++--------- .../ingresses/templates/clusterissuer.yaml | 8 +-- k8s/apps/ingresses/values.yaml | 2 + k8s/argoapps/apps-values/ingresses.yaml | 7 +-- k8s/argoapps/values-prod.yaml | 2 +- k8s/argoapps/values.yaml | 2 + 6 files changed, 36 insertions(+), 35 deletions(-) diff --git a/k8s/apps/ingresses/templates/_helpers/ingress.yaml b/k8s/apps/ingresses/templates/_helpers/ingress.yaml index c403224..71201b8 100644 --- a/k8s/apps/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/apps/ingresses/templates/_helpers/ingress.yaml @@ -11,6 +11,17 @@ # useWildCard: bool = False # middleware: str = "https-redirect" # +{{ if .useSecondaryDomain }} +{{ $domin := {{ .global.secondaryDomain }} }} +{{ else }} +{{ $domin := {{ .global.domain }} }} +{{ end }} + +{{ if .useDirectPrefix }} +{{ $domin := printf "%s.%s" .prefix $domain }} +{{ else }} +{{ $domin := printf "%s.%s.%s" .prefix .rootSubDomain $domain }} +{{ end }} {{ if .global.tls.enabled }} {{ if (.useWildCard | default .global.tls.useWildCard) }} @@ -18,7 +29,7 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: "tls-{{.prefix}}.{{.global.domain}}" + name: "tls-{{ $domin }}" namespace: {{ .namespace }} spec: refreshInterval: 1h @@ -26,45 +37,33 @@ spec: kind: ClusterSecretStore name: apps-ingresses target: - name: tls-{{.prefix}}.{{.global.domain}} + name: tls-{{ $domin }} creationPolicy: Owner deletionPolicy: Delete data: - secretKey: tls.crt remoteRef: - {{ if hasSuffix ".core" .prefix }} - key: cloudflare-wildcard.core.{{ .global.domain }} - {{ else if hasSuffix ".vh" .prefix }} - key: cloudflare-wildcard.vh.{{ .global.domain }} - {{ else }} - key: cloudflare-wildcard.{{ .global.domain }} - {{ end }} + key: cloudflare-wildcard.{{ $domin }} property: tls.crt - secretKey: tls.key remoteRef: - {{ if hasSuffix ".core" .prefix }} - key: cloudflare-wildcard.core.{{ .global.domain }} - {{ else if hasSuffix ".vh" .prefix }} - key: cloudflare-wildcard.vh.{{ .global.domain }} - {{ else }} - key: cloudflare-wildcard.{{ .global.domain }} - {{ end }} + key: cloudflare-wildcard.{{ $domin }} property: tls.key {{ else }} --- apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: "tls-{{.prefix}}.{{.global.domain}}" + name: "tls-{{ $domin }}" namespace: {{ .namespace }} spec: - secretName: "tls-{{.prefix}}.{{.global.domain}}" + secretName: "tls-{{ $domin }}" issuerRef: kind: ClusterIssuer name: "{{ .global.tls.issuer }}" - commonName: "{{.prefix}}.{{.global.domain}}" + commonName: "{{ $domin }}" dnsNames: - - "{{.prefix}}.{{.global.domain}}" + - "{{ $domin }}" {{ end }} {{ end }} @@ -72,7 +71,7 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: "{{.prefix}}.{{.global.domain}}" + name: "{{ $domin }}" namespace: {{ .namespace }} annotations: homelab-ingress/managing-app-namespace: "apps-ingresses" @@ -93,7 +92,7 @@ metadata: {{ end }} spec: rules: - - host: "{{.prefix}}.{{.global.domain}}" + - host: "{{ $domin }}" http: paths: - backend: @@ -105,10 +104,13 @@ spec: pathType: Prefix {{ if .global.tls.enabled }} tls: - - secretName: "tls-{{.prefix}}.{{.global.domain}}" + - secretName: "tls-{{ $domin }}" hosts: - - "{{.prefix}}.{{.global.domain}}" + - "{{ $domin }}" {{ end }} +{{ else }} + +{{ end }} {{- end -}} \ No newline at end of file diff --git a/k8s/apps/ingresses/templates/clusterissuer.yaml b/k8s/apps/ingresses/templates/clusterissuer.yaml index c97e213..145d305 100644 --- a/k8s/apps/ingresses/templates/clusterissuer.yaml +++ b/k8s/apps/ingresses/templates/clusterissuer.yaml @@ -40,15 +40,15 @@ spec: apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: cloudflare-wildcard{{$prefix}}.{{ $.Values.global.domain }} + name: cloudflare-wildcard{{$prefix}}.{{ $.Values.global.rootSubDomain }}.{{ $.Values.global.domain }} spec: - secretName: cloudflare-wildcard{{$prefix}}.{{ $.Values.global.domain }} + secretName: cloudflare-wildcard{{$prefix}}.{{ $.Values.global.rootSubDomain }}.{{ $.Values.global.domain }} issuerRef: name: cloudflare kind: Issuer - commonName: '*{{$prefix}}.{{ $.Values.global.domain }}' + commonName: '*{{$prefix}}.{{ $.Values.global.rootSubDomain }}.{{ $.Values.global.domain }}' dnsNames: - - "*{{$prefix}}.{{ $.Values.global.domain }}" + - "*{{$prefix}}.{{ $.Values.global.rootSubDomain }}.{{ $.Values.global.domain }}" {{ end }} {{ end }} {{ end }} \ No newline at end of file diff --git a/k8s/apps/ingresses/values.yaml b/k8s/apps/ingresses/values.yaml index 74f98c1..588344d 100644 --- a/k8s/apps/ingresses/values.yaml +++ b/k8s/apps/ingresses/values.yaml @@ -1,5 +1,7 @@ global: domain: "me.local" + secondaryDomain: "me.internal" + rootSubDomain: "home" tls: enabled: false reverseProxy: {} diff --git a/k8s/argoapps/apps-values/ingresses.yaml b/k8s/argoapps/apps-values/ingresses.yaml index c532c7e..731e0f8 100644 --- a/k8s/argoapps/apps-values/ingresses.yaml +++ b/k8s/argoapps/apps-values/ingresses.yaml @@ -91,11 +91,6 @@ services: namespace: "apps-videohosting" middleware: "apps-ingresses-chain-authentik" group: "Video Hosting" - # - prefix: "immich" - # service: "immich-server" - # namespace: "apps-photos" - # middleware: "apps-ingresses-chain-authentik" - # group: "Apps" # webapp services {{- $webapps := .Files.Get (printf "apps-values/%s" .Values.apps.webapps.valuesFile) }} {{- $webapps := tpl $webapps . | fromYaml }} @@ -110,6 +105,6 @@ services: {{ else }} middleware: "apps-ingresses-chain-authentik" {{ end -}} - group: "Basic Webapps" + group: {{ .ingress.group | default "Basic Webapps" }} {{ end }} {{- end }} \ No newline at end of file diff --git a/k8s/argoapps/values-prod.yaml b/k8s/argoapps/values-prod.yaml index e9c6fff..3391e10 100644 --- a/k8s/argoapps/values-prod.yaml +++ b/k8s/argoapps/values-prod.yaml @@ -1,6 +1,6 @@ global: deployment: prod - domain: "home.sosnovsky.ca" + domain: "sosnovsky.ca" secondaryDomain: "skyg.ca" tls: useWildCard: true diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index a2f139a..f86361a 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -6,6 +6,8 @@ global: email: "ariel@sosnovsky.ca" timezone: America/Toronto domain: "changeme" + rootSubDomain: "home" + secondaryDomain: "changeme" tls: enabled: false issuer: ""