diff --git a/helmfiles/badhouseplants-applications.yaml b/helmfiles/badhouseplants-applications.yaml index f986d7c..95efbe1 100644 --- a/helmfiles/badhouseplants-applications.yaml +++ b/helmfiles/badhouseplants-applications.yaml @@ -68,6 +68,14 @@ releases: - template: env-values - template: env-secrets + - name: app-memos + chart: allangers-charts/memos + version: 0.4.0 + namespace: org-allanger + inherit: + - template: env-values + - template: ext-database + - name: memos chart: allangers-charts/memos version: 0.4.0 diff --git a/values/badhouseplants/kube-system/namespaces/values.yaml b/values/badhouseplants/kube-system/namespaces/values.yaml index 34fb026..a205075 100644 --- a/values/badhouseplants/kube-system/namespaces/values.yaml +++ b/values/badhouseplants/kube-system/namespaces/values.yaml @@ -35,5 +35,6 @@ namespaces: - name: org-badhouseplants defaultRegcred: true - name: org-allanger + defaultRegcred: true labels: istio-injection: enabled diff --git a/values/badhouseplants/org-allanger/app-memos/values.yaml b/values/badhouseplants/org-allanger/app-memos/values.yaml new file mode 100644 index 0000000..41ea857 --- /dev/null +++ b/values/badhouseplants/org-allanger/app-memos/values.yaml @@ -0,0 +1,35 @@ +shortcuts: + hostname: notes.badhouseplants.net +ext-database: + enabled: true + name: memos-postgres17 + instance: postgres17 + credentials: + MEMOS_DRIVER: postgres + MEMOS_DSN: "{{ .Protocol }}://{{ .Username }}:{{ .Password }}@{{ .Hostname }}:{{ .Port }}/{{ .Database }}?sslmode=disable" +base: + workload: + containers: + memos: + envFrom: + main: {} + raw: + - secretRef: + name: memos-postgres17-creds + +storage: + data: + metadata: + annotations: + volume.kubernetes.io/selected-node: bordeaux + storageClassName: openebs-hostpath +ingress: + main: + metadata: + annotations: + kubernetes.io/ingress.class: traefik + kubernetes.io/tls-acme: "true" + kubernetes.io/ingress.allow-http: "false" + kubernetes.io/ingress.global-static-ip-name: "" + cert-manager.io/cluster-issuer: badhouseplants-issuer-http01 + traefik.ingress.kubernetes.io/router.entrypoints: web,websecure diff --git a/values/badhouseplants/org-onpier/app-memos/values.yaml b/values/badhouseplants/org-onpier/app-memos/values.yaml deleted file mode 100644 index 2c0d12d..0000000 --- a/values/badhouseplants/org-onpier/app-memos/values.yaml +++ /dev/null @@ -1,43 +0,0 @@ -shortcuts: - hostname: notes-onpier.badhouseplants.net - -ext-database: - enabled: true - name: memos-postgres16 - instance: postgres16 - credentials: - MEMOS_DRIVER: postgres - MEMOS_DSN: "{{ .Protocol }}://{{ .Username }}:{{ .Password }}@{{ .Hostname }}:{{ .Port }}/{{ .Database }}?sslmode=disable" - -workload: - containers: - memos: - envFrom: - - main - - secretRef: - name: memos-postgres16-creds -ingress: - main: - annotations: - kubernetes.io/ingress.class: traefik - kubernetes.io/tls-acme: "true" - kubernetes.io/ingress.allow-http: "false" - kubernetes.io/ingress.global-static-ip-name: "" - cert-manager.io/cluster-issuer: badhouseplants-issuer-http01 - traefik.ingress.kubernetes.io/router.entrypoints: web,websecure - traefik.ingress.kubernetes.io/router.middlewares: org\-onpier-memosauth@kubernetescrd - -ext-secret: - enabled: true - name: memos-basic-auth - data: - users: | - allanger:$apr1$kNwkQ0S.$9q29sib/xWEp3NDp.tquw/ - -middleware: - enabled: true - middlewares: - - name: memosauth - spec: - basicAuth: - secret: memos-basic-auth