chore: yaml anchor paintenance

Signed-off-by: Devin Buhl <[email protected]>
onedr0p · Jun 4, 2023 · d6b1218 · d6b1218
1 parent ff60aea
commit d6b1218
Show file tree

Hide file tree

Showing 28 changed files with 118 additions and 142 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -36,15 +36,15 @@ 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
       tag: v1.60.0
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: