From f1d8aeb7982f0d3fd91e99c66af521ef3f1708a6 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Sat, 21 Sep 2024 14:37:46 -0500 Subject: [PATCH] switch back to releasename and add dependencies --- kubernetes/apps/default/linkwarden/app/externalsecret.yaml | 1 - kubernetes/apps/default/linkwarden/app/helmrelease.yaml | 3 ++- kubernetes/apps/default/linkwarden/app/kustomization.yaml | 4 ++-- kubernetes/apps/default/linkwarden/ks.yaml | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/kubernetes/apps/default/linkwarden/app/externalsecret.yaml b/kubernetes/apps/default/linkwarden/app/externalsecret.yaml index c2159d64..8e36ed62 100644 --- a/kubernetes/apps/default/linkwarden/app/externalsecret.yaml +++ b/kubernetes/apps/default/linkwarden/app/externalsecret.yaml @@ -13,7 +13,6 @@ spec: template: engineVersion: v2 data: - NEXTAUTH_URL: "https://links.hsn.dev/api/v1/auth" NEXTAUTH_SECRET: "{{ .LINKWARDEN_NEXTAUTH_SECRET }}" LINKWARDEN_POSTGRES_REAL_HOST: "postgres-primary-real.database.svc" DATABASE_URL: |- diff --git a/kubernetes/apps/default/linkwarden/app/helmrelease.yaml b/kubernetes/apps/default/linkwarden/app/helmrelease.yaml index 4159e15d..32e287f5 100644 --- a/kubernetes/apps/default/linkwarden/app/helmrelease.yaml +++ b/kubernetes/apps/default/linkwarden/app/helmrelease.yaml @@ -34,6 +34,7 @@ spec: tag: v2.7.1@sha256:bbd22798ee726184d4571ea4f4d831d57475c86c4965c2bb1c3c2d3de88c728a env: TIMEZONE: "America/Chicago" + NEXTAUTH_URL: "https://{{ .Release.Name }}.jahanson.tech/api/v1/auth" envFrom: - secretRef: name: linkwarden-secret @@ -48,7 +49,7 @@ spec: enabled: true className: internal-nginx hosts: - - host: &host "links.jahanson.tech" + - host: &host "{{ .Release.Name }}.jahanson.tech" paths: - path: / service: diff --git a/kubernetes/apps/default/linkwarden/app/kustomization.yaml b/kubernetes/apps/default/linkwarden/app/kustomization.yaml index 82b7f826..c220664d 100644 --- a/kubernetes/apps/default/linkwarden/app/kustomization.yaml +++ b/kubernetes/apps/default/linkwarden/app/kustomization.yaml @@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ../../../../templates/gatus/internal + - ../../../../templates/volsync - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../templates/volsync - - ../../../../templates/gatus/internal diff --git a/kubernetes/apps/default/linkwarden/ks.yaml b/kubernetes/apps/default/linkwarden/ks.yaml index 0e197acd..ec61db9f 100644 --- a/kubernetes/apps/default/linkwarden/ks.yaml +++ b/kubernetes/apps/default/linkwarden/ks.yaml @@ -10,6 +10,11 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app + dependsOn: + - name: crunchy-postgres-operator + - name: external-secrets-stores + - name: volsync + - name: rook-ceph-cluster path: ./kubernetes/apps/default/linkwarden/app prune: true sourceRef: @@ -22,4 +27,3 @@ spec: postBuild: substitute: APP: *app - GATUS_SUBDOMAIN: links