From d6b1218cddda2cbf83637d58d504a76964c25a2a Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sun, 4 Jun 2023 15:25:44 -0400 Subject: [PATCH] chore: yaml anchor paintenance Signed-off-by: Devin Buhl --- .../default/authelia/app/externalsecret.yaml | 16 ++++++++-------- .../apps/default/authelia/app/helmrelease.yaml | 6 ++---- .../apps/default/autobrr/app/externalsecret.yaml | 16 ++++++++-------- .../apps/default/bazarr/app/externalsecret.yaml | 16 ++++++++-------- .../apps/default/bazarr/app/helmrelease.yaml | 6 ++---- .../default/home-assistant/app/helmrelease.yaml | 6 ++---- .../apps/default/immich/app/externalsecret.yaml | 16 ++++++++-------- .../immich/app/machine-learning/helmrelease.yaml | 4 ++-- .../immich/app/microservices/helmrelease.yaml | 4 ++-- .../default/immich/app/server/helmrelease.yaml | 16 +++++++--------- .../immich/app/typesense/helmrelease.yaml | 4 ++-- .../apps/default/immich/app/web/helmrelease.yaml | 4 ++-- .../default/letsblockit/app/helmrelease.yaml | 6 ++---- .../apps/default/lldap/app/helmrelease.yaml | 14 ++++++-------- .../apps/default/midarr/app/externalsecret.yaml | 16 ++++++++-------- .../apps/default/midarr/app/helmrelease.yaml | 6 ++---- .../apps/default/miniflux/app/helmrelease.yaml | 6 ++---- .../default/paperless/app/externalsecret.yaml | 16 ++++++++-------- .../apps/default/paperless/app/helmrelease.yaml | 6 ++---- .../default/prowlarr/app/externalsecret.yaml | 14 +++++++------- .../apps/default/prowlarr/app/helmrelease.yaml | 6 ++---- .../default/qbittorrent/app/helmrelease.yaml | 6 +++--- .../apps/default/radarr/app/externalsecret.yaml | 14 +++++++------- .../apps/default/radarr/app/helmrelease.yaml | 6 ++---- .../apps/default/shlink/app/externalsecret.yaml | 16 ++++++++-------- .../apps/default/shlink/app/helmrelease.yaml | 6 ++---- .../monitoring/grafana/app/externalsecret.yaml | 4 ++-- .../apps/monitoring/grafana/app/helmrelease.yaml | 4 ++-- 28 files changed, 118 insertions(+), 142 deletions(-) diff --git a/kubernetes/apps/default/authelia/app/externalsecret.yaml b/kubernetes/apps/default/authelia/app/externalsecret.yaml index 4ba7b3775f1c2..7b74be92c38de 100644 --- a/kubernetes/apps/default/authelia/app/externalsecret.yaml +++ b/kubernetes/apps/default/authelia/app/externalsecret.yaml @@ -22,20 +22,20 @@ spec: AUTHELIA_JWT_SECRET: "{{ .AUTHELIA_JWT_SECRET }}" AUTHELIA_SESSION_SECRET: "{{ .AUTHELIA_SESSION_SECRET }}" AUTHELIA_STORAGE_ENCRYPTION_KEY: "{{ .AUTHELIA_STORAGE_ENCRYPTION_KEY }}" - AUTHELIA_STORAGE_POSTGRES_DATABASE: &dbname authelia - AUTHELIA_STORAGE_POSTGRES_HOST: &dbhost postgres-rw.default.svc.cluster.local - AUTHELIA_STORAGE_POSTGRES_USERNAME: "{{ .AUTHELIA_STORAGE_POSTGRES_USERNAME }}" - AUTHELIA_STORAGE_POSTGRES_PASSWORD: "{{ .AUTHELIA_STORAGE_POSTGRES_PASSWORD }}" + AUTHELIA_STORAGE_POSTGRES_DATABASE: &dbName authelia + AUTHELIA_STORAGE_POSTGRES_HOST: &dbHost postgres-rw.default.svc.cluster.local + AUTHELIA_STORAGE_POSTGRES_USERNAME: &dbUser "{{ .AUTHELIA_STORAGE_POSTGRES_USERNAME }}" + AUTHELIA_STORAGE_POSTGRES_PASSWORD: &dbPass "{{ .AUTHELIA_STORAGE_POSTGRES_PASSWORD }}" GRAFANA_OAUTH_CLIENT_SECRET: "{{ .GRAFANA_OAUTH_CLIENT_SECRET }}" IMMICH_OAUTH_CLIENT_SECRET: "{{ .IMMICH_OAUTH_CLIENT_SECRET }}" MINIFLUX_OAUTH_CLIENT_SECRET: "{{ .MINIFLUX_OAUTH_CLIENT_SECRET }}" WEAVEGITOPS_OAUTH_CLIENT_SECRET: "{{ .WEAVEGITOPS_OAUTH_CLIENT_SECRET }}" GITEA_OAUTH_CLIENT_SECRET: "{{ .GITEA_OAUTH_CLIENT_SECRET }}" # Postgres Init - INIT_POSTGRES_DBNAME: *dbname - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: "{{ .AUTHELIA_STORAGE_POSTGRES_USERNAME }}" - INIT_POSTGRES_PASS: "{{ .AUTHELIA_STORAGE_POSTGRES_PASSWORD }}" + INIT_POSTGRES_DBNAME: *dbName + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/authelia/app/helmrelease.yaml b/kubernetes/apps/default/authelia/app/helmrelease.yaml index 62cc2c1d1a954..66b5b6f018209 100644 --- a/kubernetes/apps/default/authelia/app/helmrelease.yaml +++ b/kubernetes/apps/default/authelia/app/helmrelease.yaml @@ -36,7 +36,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: authelia-secret controller: @@ -84,9 +84,7 @@ spec: AUTHELIA_THEME: dark AUTHELIA_TOTP_ISSUER: authelia.com AUTHELIA_WEBAUTHN_DISABLE: "true" - envFrom: - - secretRef: - name: authelia-secret + envFrom: *envFrom enableServiceLinks: false service: main: diff --git a/kubernetes/apps/default/autobrr/app/externalsecret.yaml b/kubernetes/apps/default/autobrr/app/externalsecret.yaml index dba3b59e46369..2ccc0906c7ce1 100644 --- a/kubernetes/apps/default/autobrr/app/externalsecret.yaml +++ b/kubernetes/apps/default/autobrr/app/externalsecret.yaml @@ -17,17 +17,17 @@ spec: data: # App AUTOBRR__DATABASETYPE: postgres - AUTOBRR__POSTGRESDATABASE: &dbname autobrr - AUTOBRR__POSTGRESHOST: &dbhost postgres-rw.default.svc.cluster.local - AUTOBRR__POSTGRESUSER: &dbuser "{{ .AUTOBRR__POSTGRESUSER }}" - AUTOBRR__POSTGRESPASS: &dbpass "{{ .AUTOBRR__POSTGRESPASS }}" + AUTOBRR__POSTGRESDATABASE: &dbName autobrr + AUTOBRR__POSTGRESHOST: &dbHost postgres-rw.default.svc.cluster.local + AUTOBRR__POSTGRESUSER: &dbUser "{{ .AUTOBRR__POSTGRESUSER }}" + AUTOBRR__POSTGRESPASS: &dbPass "{{ .AUTOBRR__POSTGRESPASS }}" AUTOBRR__POSTGRESPORT: "5432" AUTOBRR__SESSIONSECRET: "{{ .AUTOBRR__SESSIONSECRET }}" # Postgres Init - INIT_POSTGRES_DBNAME: *dbname - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: *dbuser - INIT_POSTGRES_PASS: *dbpass + INIT_POSTGRES_DBNAME: *dbName + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/bazarr/app/externalsecret.yaml b/kubernetes/apps/default/bazarr/app/externalsecret.yaml index c7239ca7090df..344edac217eaf 100644 --- a/kubernetes/apps/default/bazarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/bazarr/app/externalsecret.yaml @@ -17,16 +17,16 @@ spec: data: # App POSTGRES_ENABLED: "true" - POSTGRES_DATABASE: &dbname bazarr - POSTGRES_HOST: &dbhost postgres-rw.default.svc.cluster.local - POSTGRES_USERNAME: "{{ .POSTGRES_USERNAME }}" - POSTGRES_PASSWORD: "{{ .POSTGRES_PASSWORD }}" + POSTGRES_DATABASE: &dbName bazarr + POSTGRES_HOST: &dbHost postgres-rw.default.svc.cluster.local + POSTGRES_USERNAME: &dbUser "{{ .POSTGRES_USERNAME }}" + POSTGRES_PASSWORD: &dbPass "{{ .POSTGRES_PASSWORD }}" POSTGRES_PORT: "5432" # Postgres Init - INIT_POSTGRES_DBNAME: *dbname - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: "{{ .POSTGRES_USERNAME }}" - INIT_POSTGRES_PASS: "{{ .POSTGRES_PASSWORD }}" + INIT_POSTGRES_DBNAME: *dbName + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/bazarr/app/helmrelease.yaml b/kubernetes/apps/default/bazarr/app/helmrelease.yaml index 4539a099a7ce9..7c338074da7bd 100644 --- a/kubernetes/apps/default/bazarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/bazarr/app/helmrelease.yaml @@ -39,7 +39,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: bazarr-secret controller: @@ -51,9 +51,7 @@ spec: tag: 1.2.1@sha256:70a27cdd489f69d0ab08212482459a19214dc0d1a70428dd89083215aa4c1b95 env: TZ: America/New_York - envFrom: - - secretRef: - name: bazarr-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/home-assistant/app/helmrelease.yaml b/kubernetes/apps/default/home-assistant/app/helmrelease.yaml index 24826d309e75f..c953c3521719a 100644 --- a/kubernetes/apps/default/home-assistant/app/helmrelease.yaml +++ b/kubernetes/apps/default/home-assistant/app/helmrelease.yaml @@ -36,7 +36,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: home-assistant-secret controller: @@ -50,9 +50,7 @@ spec: TZ: America/New_York POSTGRES_HOST: postgres-rw.default.svc.cluster.local POSTGRES_DB: home_assistant - envFrom: - - secretRef: - name: home-assistant-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/immich/app/externalsecret.yaml b/kubernetes/apps/default/immich/app/externalsecret.yaml index 432a52506b5bb..b7eef6e564235 100644 --- a/kubernetes/apps/default/immich/app/externalsecret.yaml +++ b/kubernetes/apps/default/immich/app/externalsecret.yaml @@ -16,17 +16,17 @@ spec: engineVersion: v2 data: # App - DB_DATABASE_NAME: &dbname immich - DB_HOSTNAME: &dbhost postgres-rw.default.svc.cluster.local - DB_PASSWORD: "{{ .DB_PASSWORD }}" - DB_USERNAME: "{{ .DB_USERNAME }}" + DB_DATABASE_NAME: &dbName immich + DB_HOSTNAME: &dbHost postgres-rw.default.svc.cluster.local + DB_USERNAME: &dbUser "{{ .DB_USERNAME }}" + DB_PASSWORD: &dbPass "{{ .DB_PASSWORD }}" JWT_SECRET: "{{ .JWT_SECRET }}" TYPESENSE_API_KEY: "{{ .TYPESENSE_API_KEY }}" # Postgres Init - INIT_POSTGRES_DBNAME: *dbname - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: "{{ .DB_USERNAME }}" - INIT_POSTGRES_PASS: "{{ .DB_PASSWORD }}" + INIT_POSTGRES_DBNAME: *dbName + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml b/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml index db960e6f66b42..f66fcac88e2df 100644 --- a/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/machine-learning/helmrelease.yaml @@ -36,14 +36,14 @@ spec: replicas: 1 strategy: RollingUpdate annotations: - configmap.reloader.stakater.com/reload: &configmap immich-configmap + configmap.reloader.stakater.com/reload: &configMap immich-configmap secret.reloader.stakater.com/reload: &secret immich-secret image: repository: ghcr.io/immich-app/immich-machine-learning tag: v1.60.0 envFrom: - configMapRef: - name: *configmap + name: *configMap - secretRef: name: *secret service: diff --git a/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml b/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml index 04aeca4e458f9..3c60351655a5a 100644 --- a/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/microservices/helmrelease.yaml @@ -36,7 +36,7 @@ spec: replicas: 2 strategy: RollingUpdate annotations: - configmap.reloader.stakater.com/reload: &configmap immich-configmap + configmap.reloader.stakater.com/reload: &configMap immich-configmap secret.reloader.stakater.com/reload: &secret immich-secret image: repository: ghcr.io/immich-app/immich-server @@ -44,7 +44,7 @@ spec: args: ["start-microservices.sh"] envFrom: - configMapRef: - name: *configmap + name: *configMap - secretRef: name: *secret service: diff --git a/kubernetes/apps/default/immich/app/server/helmrelease.yaml b/kubernetes/apps/default/immich/app/server/helmrelease.yaml index dd2fb56eba9c8..67aa9259ab2fa 100644 --- a/kubernetes/apps/default/immich/app/server/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/server/helmrelease.yaml @@ -36,24 +36,22 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom + - configMapRef: + name: &configMap immich-configmap - secretRef: - name: immich-secret + name: &secret immich-secret controller: replicas: 2 strategy: RollingUpdate annotations: - configmap.reloader.stakater.com/reload: &configmap immich-configmap - secret.reloader.stakater.com/reload: &secret immich-secret + configmap.reloader.stakater.com/reload: *configMap + secret.reloader.stakater.com/reload: *secret image: repository: ghcr.io/immich-app/immich-server tag: v1.60.0 args: ["start-server.sh"] - envFrom: - - configMapRef: - name: *configmap - - secretRef: - name: *secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/immich/app/typesense/helmrelease.yaml b/kubernetes/apps/default/immich/app/typesense/helmrelease.yaml index 74bf4f43f4f0a..f0a37d028b97f 100644 --- a/kubernetes/apps/default/immich/app/typesense/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/typesense/helmrelease.yaml @@ -30,14 +30,14 @@ spec: controller: type: statefulset annotations: - configmap.reloader.stakater.com/reload: &configmap immich-configmap + configmap.reloader.stakater.com/reload: &configMap immich-configmap secret.reloader.stakater.com/reload: &secret immich-secret image: repository: docker.io/typesense/typesense tag: 0.24.1 envFrom: - configMapRef: - name: *configmap + name: *configMap - secretRef: name: *secret service: diff --git a/kubernetes/apps/default/immich/app/web/helmrelease.yaml b/kubernetes/apps/default/immich/app/web/helmrelease.yaml index bf855714dd843..b04dfd3811525 100644 --- a/kubernetes/apps/default/immich/app/web/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/web/helmrelease.yaml @@ -36,14 +36,14 @@ spec: replicas: 2 strategy: RollingUpdate annotations: - configmap.reloader.stakater.com/reload: &configmap immich-configmap + configmap.reloader.stakater.com/reload: &configMap immich-configmap secret.reloader.stakater.com/reload: &secret immich-secret image: repository: ghcr.io/immich-app/immich-web tag: v1.60.0 envFrom: - configMapRef: - name: *configmap + name: *configMap - secretRef: name: *secret service: diff --git a/kubernetes/apps/default/letsblockit/app/helmrelease.yaml b/kubernetes/apps/default/letsblockit/app/helmrelease.yaml index 547a03e5c9cae..329ccd9de4981 100644 --- a/kubernetes/apps/default/letsblockit/app/helmrelease.yaml +++ b/kubernetes/apps/default/letsblockit/app/helmrelease.yaml @@ -31,7 +31,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: letsblockit-secret controller: @@ -46,9 +46,7 @@ spec: TZ: America/New_York LETSBLOCKIT_AUTH_METHOD: proxy LETSBLOCKIT_AUTH_PROXY_HEADER_NAME: Remote-User - envFrom: - - secretRef: - name: letsblockit-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/lldap/app/helmrelease.yaml b/kubernetes/apps/default/lldap/app/helmrelease.yaml index 1725a044b5497..a41292f2bd012 100644 --- a/kubernetes/apps/default/lldap/app/helmrelease.yaml +++ b/kubernetes/apps/default/lldap/app/helmrelease.yaml @@ -31,7 +31,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: lldap-secret controller: @@ -45,21 +45,19 @@ spec: tag: latest-alpine@sha256:a6a8215f8bb286ae9ce6e4f6ef303a543094a954d0091da9a62aee2b391ed023 env: TZ: America/New_York - LLDAP_HTTP_PORT: &http-port 80 + LLDAP_HTTP_PORT: &port 80 LLDAP_HTTP_URL: https://lldap.devbu.io - LLDAP_LDAP_PORT: &ldap-port 389 + LLDAP_LDAP_PORT: &ldapPort 389 LLDAP_LDAP_BASE_DN: dc=home,dc=arpa - envFrom: - - secretRef: - name: lldap-secret + envFrom: *envFrom service: main: ports: http: - port: *http-port + port: *port ldap: enabled: true - port: *ldap-port + port: *ldapPort ingress: main: enabled: true diff --git a/kubernetes/apps/default/midarr/app/externalsecret.yaml b/kubernetes/apps/default/midarr/app/externalsecret.yaml index 6c0053ad5bfd4..111d87df4b726 100644 --- a/kubernetes/apps/default/midarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/midarr/app/externalsecret.yaml @@ -21,15 +21,15 @@ spec: SETUP_ADMIN_PASSWORD: "{{ .SETUP_ADMIN_PASSWORD }}" RADARR_API_KEY: "{{ .RADARR__API_KEY }}" SONARR_API_KEY: "{{ .SONARR__API_KEY }}" - DB_USERNAME: "{{ .DB_USERNAME }}" - DB_PASSWORD: "{{ .DB_PASSWORD }}" - DB_HOSTNAME: &dbhost postgres-rw.default.svc.cluster.local - DB_DATABASE: &dbname midarr + DB_HOSTNAME: &dbHost postgres-rw.default.svc.cluster.local + DB_DATABASE: &dbName midarr + DB_USERNAME: &dbUser "{{ .DB_USERNAME }}" + DB_PASSWORD: &dbPass "{{ .DB_PASSWORD }}" # Postgres Init - INIT_POSTGRES_DBNAME: *dbname - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: "{{ .DB_USERNAME }}" - INIT_POSTGRES_PASS: "{{ .DB_PASSWORD }}" + INIT_POSTGRES_DBNAME: *dbName + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/midarr/app/helmrelease.yaml b/kubernetes/apps/default/midarr/app/helmrelease.yaml index 4afe0838920ba..f7e4a72049832 100644 --- a/kubernetes/apps/default/midarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/midarr/app/helmrelease.yaml @@ -31,7 +31,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: midarr-secret controller: @@ -47,9 +47,7 @@ spec: APP_URL: http://midarr.default.svc.cluster.local:4000 RADARR_BASE_URL: radarr.default.svc.cluster.local SONARR_BASE_URL: sonarr.default.svc.cluster.local - envFrom: - - secretRef: - name: midarr-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/miniflux/app/helmrelease.yaml b/kubernetes/apps/default/miniflux/app/helmrelease.yaml index 76e0403399d06..9ae5791b405c5 100644 --- a/kubernetes/apps/default/miniflux/app/helmrelease.yaml +++ b/kubernetes/apps/default/miniflux/app/helmrelease.yaml @@ -31,7 +31,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: miniflux-secret controller: @@ -57,9 +57,7 @@ spec: POLLING_SCHEDULER: entry_frequency POLLING_FREQUENCY: "15" RUN_MIGRATIONS: "1" - envFrom: - - secretRef: - name: miniflux-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/paperless/app/externalsecret.yaml b/kubernetes/apps/default/paperless/app/externalsecret.yaml index 090b4efdf6af3..338082efdc161 100644 --- a/kubernetes/apps/default/paperless/app/externalsecret.yaml +++ b/kubernetes/apps/default/paperless/app/externalsecret.yaml @@ -18,18 +18,18 @@ spec: # App PAPERLESS_DBENGINE: postgresql PAPERLESS_DBPORT: "5432" - PAPERLESS_DBNAME: &dbname paperless - PAPERLESS_DBHOST: &dbhost postgres-rw.default.svc.cluster.local - PAPERLESS_DBUSER: "{{ .PAPERLESS_DBUSER }}" - PAPERLESS_DBPASS: "{{ .PAPERLESS_DBPASS }}" + PAPERLESS_DBNAME: &dbName paperless + PAPERLESS_DBHOST: &dbHost postgres-rw.default.svc.cluster.local + PAPERLESS_DBUSER: &dbUser "{{ .PAPERLESS_DBUSER }}" + PAPERLESS_DBPASS: &dbPass "{{ .PAPERLESS_DBPASS }}" PAPERLESS_ADMIN_USER: "{{ .PAPERLESS_ADMIN_USER }}" PAPERLESS_ADMIN_PASSWORD: "{{ .PAPERLESS_ADMIN_PASSWORD }}" PAPERLESS_SECRET_KEY: "{{ .PAPERLESS_SECRET_KEY }}" # Postgres Init - INIT_POSTGRES_DBNAME: *dbname - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: "{{ .PAPERLESS_DBUSER }}" - INIT_POSTGRES_PASS: "{{ .PAPERLESS_DBPASS }}" + INIT_POSTGRES_DBNAME: *dbName + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/paperless/app/helmrelease.yaml b/kubernetes/apps/default/paperless/app/helmrelease.yaml index 0ff5a3976d192..dfc221f8cec7f 100644 --- a/kubernetes/apps/default/paperless/app/helmrelease.yaml +++ b/kubernetes/apps/default/paperless/app/helmrelease.yaml @@ -31,7 +31,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: paperless-secret controller: @@ -62,9 +62,7 @@ spec: PAPERLESS_URL: https://paperless.devbu.io USERMAP_UID: 568 USERMAP_GID: 568 - envFrom: - - secretRef: - name: paperless-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/prowlarr/app/externalsecret.yaml b/kubernetes/apps/default/prowlarr/app/externalsecret.yaml index 8eadf14ec2e85..80d2f93201ccd 100644 --- a/kubernetes/apps/default/prowlarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/prowlarr/app/externalsecret.yaml @@ -17,17 +17,17 @@ spec: data: # App PROWLARR__API_KEY: "{{ .PROWLARR__API_KEY }}" - PROWLARR__POSTGRES_HOST: &dbhost postgres-rw.default.svc.cluster.local + PROWLARR__POSTGRES_HOST: &dbHost postgres-rw.default.svc.cluster.local PROWLARR__POSTGRES_PORT: "5432" - PROWLARR__POSTGRES_USER: "{{ .PROWLARR__POSTGRES_USER }}" - PROWLARR__POSTGRES_PASSWORD: "{{ .PROWLARR__POSTGRES_PASSWORD }}" + PROWLARR__POSTGRES_USER: &dbUser "{{ .PROWLARR__POSTGRES_USER }}" + PROWLARR__POSTGRES_PASSWORD: &dbPass "{{ .PROWLARR__POSTGRES_PASSWORD }}" PROWLARR__POSTGRES_MAIN_DB: prowlarr_main PROWLARR__POSTGRES_LOG_DB: prowlarr_log # Postgres Init - INIT_POSTGRES_DBNAME: "prowlarr_main prowlarr_log" - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: "{{ .PROWLARR__POSTGRES_USER }}" - INIT_POSTGRES_PASS: "{{ .PROWLARR__POSTGRES_PASSWORD }}" + INIT_POSTGRES_DBNAME: prowlarr_main prowlarr_log + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml index 987745fd18956..ebcda34b404cf 100644 --- a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml @@ -36,7 +36,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: prowlarr-secret controller: @@ -52,9 +52,7 @@ spec: PROWLARR__PORT: &port 80 PROWLARR__LOG_LEVEL: info PROWLARR__AUTHENTICATION_METHOD: External - envFrom: - - secretRef: - name: prowlarr-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml index 134df486fc3db..8055e9b791f33 100644 --- a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml +++ b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml @@ -42,7 +42,7 @@ spec: env: TZ: America/New_York QBITTORRENT__PORT: &port 80 - QBITTORRENT__BT_PORT: &port-bt 50413 + QBITTORRENT__BT_PORT: &bittorrentPort 50413 QBT_Preferences__WebUI__AlternativeUIEnabled: "true" QBT_Preferences__WebUI__RootFolder: /add-ons/VueTorrent service: @@ -57,9 +57,9 @@ spec: ports: bittorrent: enabled: true - port: *port-bt + port: *bittorrentPort protocol: TCP - targetPort: *port-bt + targetPort: *bittorrentPort externalTrafficPolicy: Local ingress: main: diff --git a/kubernetes/apps/default/radarr/app/externalsecret.yaml b/kubernetes/apps/default/radarr/app/externalsecret.yaml index b82e4835536b3..3c54499d4e172 100644 --- a/kubernetes/apps/default/radarr/app/externalsecret.yaml +++ b/kubernetes/apps/default/radarr/app/externalsecret.yaml @@ -17,19 +17,19 @@ spec: data: # App RADARR__API_KEY: "{{ .RADARR__API_KEY }}" - RADARR__POSTGRES_HOST: &dbhost postgres-rw.default.svc.cluster.local + RADARR__POSTGRES_HOST: &dbHost postgres-rw.default.svc.cluster.local RADARR__POSTGRES_PORT: "5432" - RADARR__POSTGRES_USER: "{{ .RADARR__POSTGRES_USER }}" - RADARR__POSTGRES_PASSWORD: "{{ .RADARR__POSTGRES_PASSWORD }}" + RADARR__POSTGRES_USER: &dbUser "{{ .RADARR__POSTGRES_USER }}" + RADARR__POSTGRES_PASSWORD: &dbPass "{{ .RADARR__POSTGRES_PASSWORD }}" RADARR__POSTGRES_MAIN_DB: radarr_main RADARR__POSTGRES_LOG_DB: radarr_log PUSHOVER_USER_KEY: "{{ .PUSHOVER_USER_KEY }}" PUSHOVER_TOKEN: "{{ .PUSHOVER_TOKEN }}" # Postgres Init - INIT_POSTGRES_DBNAME: "radarr_main radarr_log" - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: "{{ .RADARR__POSTGRES_USER }}" - INIT_POSTGRES_PASS: "{{ .RADARR__POSTGRES_PASSWORD }}" + INIT_POSTGRES_DBNAME: radarr_main radarr_log + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/radarr/app/helmrelease.yaml b/kubernetes/apps/default/radarr/app/helmrelease.yaml index 7664e8eaa68b4..6751347c64b33 100644 --- a/kubernetes/apps/default/radarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/radarr/app/helmrelease.yaml @@ -36,7 +36,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: radarr-secret controller: @@ -54,9 +54,7 @@ spec: RADARR__PORT: &port 80 RADARR__APPLICATION_URL: "https://{{ .Release.Name }}.devbu.io" RADARR__LOG_LEVEL: info - envFrom: - - secretRef: - name: radarr-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/default/shlink/app/externalsecret.yaml b/kubernetes/apps/default/shlink/app/externalsecret.yaml index 36171436f8bb0..a0e7acbd1fb49 100644 --- a/kubernetes/apps/default/shlink/app/externalsecret.yaml +++ b/kubernetes/apps/default/shlink/app/externalsecret.yaml @@ -16,17 +16,17 @@ spec: engineVersion: v2 data: # App - DB_NAME: &dbname shlink - DB_HOST: &dbhost postgres-rw.default.svc.cluster.local - DB_USER: "{{ .DB_USER }}" - DB_PASSWORD: "{{ .DB_PASSWORD }}" + DB_NAME: &dbName shlink + DB_HOST: &dbHost postgres-rw.default.svc.cluster.local + DB_USER: &dbUser "{{ .DB_USER }}" + DB_PASSWORD: &dbPass "{{ .DB_PASSWORD }}" DB_DRIVER: postgres GEOLITE_LICENSE_KEY: "{{ .GEOLITE_LICENSE_KEY }}" # Postgres Init - INIT_POSTGRES_DBNAME: *dbname - INIT_POSTGRES_HOST: *dbhost - INIT_POSTGRES_USER: "{{ .DB_USER }}" - INIT_POSTGRES_PASS: "{{ .DB_PASSWORD }}" + INIT_POSTGRES_DBNAME: *dbName + INIT_POSTGRES_HOST: *dbHost + INIT_POSTGRES_USER: *dbUser + INIT_POSTGRES_PASS: *dbPass INIT_POSTGRES_SUPER_PASS: "{{ .POSTGRES_SUPER_PASS }}" dataFrom: - extract: diff --git a/kubernetes/apps/default/shlink/app/helmrelease.yaml b/kubernetes/apps/default/shlink/app/helmrelease.yaml index 339a3e87fad90..e40b9fa411dff 100644 --- a/kubernetes/apps/default/shlink/app/helmrelease.yaml +++ b/kubernetes/apps/default/shlink/app/helmrelease.yaml @@ -34,7 +34,7 @@ spec: 01-init-db: image: ghcr.io/onedr0p/postgres-init:14.8 imagePullPolicy: IfNotPresent - envFrom: + envFrom: &envFrom - secretRef: name: shlink-secret controller: @@ -55,9 +55,7 @@ spec: REDIS_SENTINEL_SERVICE: redis-master REDIS_SERVERS: redis-node-0.redis-headless.database.svc.cluster.local:26379,redis-node-1.redis-headless.database.svc.cluster.local:26379,redis-node-2.redis-headless.database.svc.cluster.local:26379 TIMEZONE: America/New_York - envFrom: - - secretRef: - name: shlink-secret + envFrom: *envFrom service: main: ports: diff --git a/kubernetes/apps/monitoring/grafana/app/externalsecret.yaml b/kubernetes/apps/monitoring/grafana/app/externalsecret.yaml index 637ddad302b4b..d94428d99ab6e 100644 --- a/kubernetes/apps/monitoring/grafana/app/externalsecret.yaml +++ b/kubernetes/apps/monitoring/grafana/app/externalsecret.yaml @@ -16,7 +16,7 @@ spec: engineVersion: v2 data: # App - GF_DATABASE_NAME: &dbname grafana + GF_DATABASE_NAME: &dbName grafana GF_DATABASE_HOST: postgres-rw.default.svc.cluster.local:5432 GF_DATABASE_USER: "{{ .GF_DATABASE_USER }}" GF_DATABASE_PASSWORD: "{{ .GF_DATABASE_PASSWORD }}" @@ -24,7 +24,7 @@ spec: GF_DATABASE_TYPE: postgres GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET: "{{ .GRAFANA_OAUTH_CLIENT_SECRET }}" # from authelia # Postgres Init - INIT_POSTGRES_DBNAME: *dbname + INIT_POSTGRES_DBNAME: *dbName INIT_POSTGRES_HOST: postgres-rw.default.svc.cluster.local INIT_POSTGRES_USER: "{{ .GF_DATABASE_USER }}" INIT_POSTGRES_PASS: "{{ .GF_DATABASE_PASSWORD }}" diff --git a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml index d09978448b8cd..24a6c9b3e531d 100644 --- a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml @@ -33,7 +33,7 @@ spec: imagePullPolicy: IfNotPresent envFrom: - secretRef: - name: grafana-secret + name: &secret grafana-secret replicas: 3 env: GF_AUTH_GENERIC_OAUTH_API_URL: https://auth.devbu.io/api/oidc/userinfo @@ -47,7 +47,7 @@ spec: GF_SECURITY_COOKIE_SAMESITE: grafana GF_SERVER_ROOT_URL: https://grafana.devbu.io envFromSecrets: - - name: grafana-secret + - name: *secret grafana.ini: analytics: check_for_updates: false