From 27436dc90297ff16a6b8111617df813c4b25e873 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Mon, 2 Dec 2024 14:32:37 +0100
Subject: [PATCH] some fixes
---
apps/todos/deployment.yaml | 24 +++------
apps/todos/kustomization.yaml | 2 +-
apps/todos/todos-config.sealedsecret.yaml | 16 ++++++
apps/todos/todos-oidc.sealedsecret.yaml | 20 --------
apps/todos/values.yaml | 54 --------------------
kluster-deployments/todos/kustomization.yaml | 1 -
kluster-deployments/todos/repo.yaml | 12 -----
7 files changed, 24 insertions(+), 105 deletions(-)
create mode 100644 apps/todos/todos-config.sealedsecret.yaml
delete mode 100644 apps/todos/todos-oidc.sealedsecret.yaml
delete mode 100644 apps/todos/values.yaml
delete mode 100644 kluster-deployments/todos/repo.yaml
diff --git a/apps/todos/deployment.yaml b/apps/todos/deployment.yaml
index 4d3c1b9..db30f76 100644
--- a/apps/todos/deployment.yaml
+++ b/apps/todos/deployment.yaml
@@ -24,30 +24,20 @@ spec:
limits:
cpu: 200m
memory: 200Mi
- env:
- - name: VIKUNJA_SERVICE_PUBLICURL
- value: https://todos.kluster.moll.re
- - name: VIKUNJA_DATABASE_TYPE
- value: sqlite
- - name: VIKUNJA_DATABASE_PATH
- value: /app/vikunja/files/vikunja.db
- - name: VIKUNJA_SERVICE_ENABLEREGISTRATION
- value: false
- - name: VIKUNJA_AUTH_LOCAL_ENABLED
- value: false
- - name: VIKUNJA_AUTH_OPENID_ENABLED
- value: true
- envFrom:
- - secretRef:
- name: todos-oidc
ports:
- containerPort: 3456
name: web
volumeMounts:
- name: data
- mountPath: /app/vikunja/files
+ mountPath: /db
+ - name: config
+ mountPath: /app/vikunja/config.yml
+ subPath: config.yml
volumes:
- name: data
persistentVolumeClaim:
claimName: data
+ - name: config
+ secret:
+ secretName: todos-config
diff --git a/apps/todos/kustomization.yaml b/apps/todos/kustomization.yaml
index c24a21e..215b830 100644
--- a/apps/todos/kustomization.yaml
+++ b/apps/todos/kustomization.yaml
@@ -6,7 +6,7 @@ namespace: todos
resources:
- namespace.yaml
- pvc.yaml
- - todos-oidc.sealedsecret.yaml
+ - todos-config.sealedsecret.yaml
- deployment.yaml
- service.yaml
- ingress.yaml
diff --git a/apps/todos/todos-config.sealedsecret.yaml b/apps/todos/todos-config.sealedsecret.yaml
new file mode 100644
index 0000000..249f42d
--- /dev/null
+++ b/apps/todos/todos-config.sealedsecret.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+ creationTimestamp: null
+ name: todos-config
+ namespace: todos
+spec:
+ encryptedData:
+ config.yml: AgBRKmf5GSn6EcCH4r+I/lJkNiwZp0Pa/TFloYlPzqJ1aQWrTRDCLiljHYs1n/PTBWWv5SdWj+3Uvx4M+tzTXpRTp1dWomJ1C8pUDpf4N7SSZeAMoJxz5/mSUpA1YsYwiy/jhOzSsaeC80JX9WTXhCE5cnox/OUjcDf62vVg/7kgy8tHYpCSRmTGMah82642gP0/rlLpp+ctb29oYttmL0fWafHMRHgZYwkO1Ol7tmfbVOfr/bQljTQD3h/f0+ef2s3kDNtAkXSBAwHo6TfukB5bZi+pj3q3TLHAWU/belC38RZtIYW7trJf20WzbxxWKcS7rnQ8GHJqpbNgoWdnBQgP5OGHzySnQrdIAWLvOxw3JdJ8S1ZMbZfWASGpeIdfTI1p99Bhu1MGE3nnAzUCM93sLySE/mjjGDPdA9+Q7orgLGX3ct+w4deu1ABLR/HWxFYvPah11xs+MyzBFVh2rRj+MMzSWwQmbo+widmHWnzx6fjTiLd8eyGmvz1M9hBwFjqUTjbAR70S4xx2ALlYqAtbmJUk07PmTdTMhvokvaY5NX7Ylahx2oFE2q/FxMBwvPZVyI9tSbrZHEK9a67QaXnnwyfSqj3nErNkpdAa/zSJ9M6SG5cJrJvZCBn5cFg6pxtY65wZoj0GWMZ5kF2oqxDuekdjitWGMTp5q6ROJYSs/o3Lc/Abga9pSZYEtNrHr68tJuSeO61s9TjUftbkxkJ97/dwTfVQOd7aJui2EDp8NVcZg0CkEOgI7tt0nOEsll30RWS46QJwUbJM34FD646bpEk50K/GsIvFovKjZjtoCjeKczGdMpYS2XFwEMb8UjgSATxcVYjSWwvx+7prEChvoyVcg8Bi8ZEGcBVxSAD9fJu8PtyPBeijs7ZVwVyGGxiSafd3gAPU8spSuvbEDl/VZAKy9k2vrI2c/gtTqwaIasnBHudIbbNqDHlTlH8dk0z+kuNg/AzqheZWireMvBvgQ3TlHan0RN6+vVpZCY5XbzWkj/DEmoor8UfeuYt3GD7/JHniAorMPj61n2od7TLXmLunPG/B/zNpJCgJ8LgtUriDDZno99IDCXaZ/MO2+jppMaKizl83axxrv9HUTYDDgtX4RqLLdutd4i/AsOe0GgayFrOjUtDVOL6MKhX7dRJfbNsL5IcGEVZ1cdzcjjazoDpSlDdMC6E1XNS1NWprqUpmfjFPtFk1FWW3oRF3iEYUimngYvy6oTx3d70EZ+eOdEvp6A+aHbmG6fyEQb3AKYhMIOsn4AbKpDLjTsHiqWNGwT9ummS5kOLhnWBBB4ohDpCl4UMCtP61+1lhtx//Jne8QFAoq31MMFcCO2X3b2JfD6egLDc8Vwju6NHNy7jrmkponKqKxQPSs0w9Aj2biUBuFkMCiAik0Cf1fPk59bjJqs2ypwURDPAs1ShPoSU=
+ template:
+ metadata:
+ creationTimestamp: null
+ name: todos-config
+ namespace: todos
+ type: Opaque
diff --git a/apps/todos/todos-oidc.sealedsecret.yaml b/apps/todos/todos-oidc.sealedsecret.yaml
deleted file mode 100644
index 71cdd19..0000000
--- a/apps/todos/todos-oidc.sealedsecret.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
- creationTimestamp: null
- name: todos-oidc
- namespace: todos
-spec:
- encryptedData:
- VIKUNJA_AUTH_OPENID_PROVIDERS_AUTHELIA_AUTHURL: AgAVa6YuhpAr6EFubgEusTAWkTY+AH6ScQMlfqJXPWx9oIf7KWkJ5FW4QMWSkCB8KjTvtAeQ5NeEU4a5R6J8BVddGN9K7Etlr5N4I/lyCUm/D3CMi6AThb+4KO1k7UYFpOnQ8HO8nYprawieV2xkhExBEqaxguQ4PplF9G68Cs+kp36rmEyg5YC3th3KacPF1tC0GJ+g+mgNFHTQmCgDl9CVSJ87pgRocQ9JYePuYOLHkYsVxXd03kDlAa/+ZIz/NgoLImnAIeHq2oZYNnTQaa4fp4Eve9xnIyK2RkGt2IlnDjZZqmF8x++fYhVgowcBajVUsra0GhY4jA8b2yqkK1s5IaJWwxkEmmYPt83dOcgOQyZMgo2pWceG/yIjScawzIr4YwzRe9mQVfaphJ7CyaeJSy8mGCCpQ6v2QHrPfbINWY45yM6TNbiy5NsfYMn9ak+cP7DuQ2oxU0rAblDei6uJ19VHVujGITm4F7hwI1JyJcSAAGUl/QH+8zS/Xr3Mwwfbm564iSlE41P1/s6FcI4ozPzTcH30fyiHLqAcYBOVKM5k+6phM4BA4VKctD8NY074fiyEMu5/gX2sCwPSNnCO/+aijs+358vAEF1cebjp2MrKk9htUOhGPp36n4Q/x0j+eZCguafcfrXUdRmatJbC4aITR3sLR7c5wxe1qpkFLrybh3KyRs3OaEAKKwHGVRE5LxxKmvFk8Vmry3UA3H8NKY5cqo+sbqKSJpKr+Q==
- VIKUNJA_AUTH_OPENID_PROVIDERS_AUTHELIA_CLIENTID: AgDAuyaOWrnlZaKLfa0m5Q2E5hsHNYlonChlzy6kELkZlwXtWXFr2sN5M6qnzSyRiXUXcNK1jKukg9o+F4pOKmYgIMGXSFtTMgEpVoItr8QQKVQML4ms48+F+PDUcPmMz+VnrdoTheWq0GasMVOAt1n/PWoUn96F0N2e6LtfIXxlBaOspPBPzm7mWvQfEhlsLEWXgqLmV/x4jpZkuJc1ySOqQB1/0TW4LBoZwHHEN8Wlht+2VX+RXpZyNNizbPztxTk1PJBBvRY1hxW057JJp28Uaarw4I33qyc1SctItWrSaUX7KSv4VmG4qACn/uopABdXhvgHLCfNHcFD6KBZl7/3CaBq8dA+AdyD4O85V8D/FOFQAcTkIBeQG7spKyduJRUJUIXDsZ60GfgJX92uRoW6vcQcPRLXleQ/w+Bhn0NgYI/sEJAnawUUPvt0v5xsyrxXmweDi2p+a8JzTyh7FSul6IQJXNiY1RehiKc1R8eXGFnxAbvEvxhrBe+85QhAZhnfwGESzABnzywAc+arRpd3ECslpKkAh9rT3Dv4WNuPVviDhl3/vHWisPH/sfuZwO1oprUPMZFaKRlipeDXqTiG0VC9mB61U4kLCXSTHHYTYsp/W74OlzpPPzrfGgN5yrUbTtBqQqqRuviWky3a3lwecYO0iLWUaQRzi31lSCxC6BVz2VGajmGImxCReUPRu3JGDyOSpw==
- VIKUNJA_AUTH_OPENID_PROVIDERS_AUTHELIA_CLIENTSECRET: AgAgAXiXnAj22mUWmSWmibKSGscWLy/lM/5ZPGvED4v3X4gJ31gl7cPHME5XzL5hghMpW9T7DbpBoti5HqCth5ytZK1DC5/uC4I/EYtCq5QMU8d1bh6wpearJK2yfyLxUilNSBKd+AmMLXwZD3Mrp5H7//TXip4tjgZcDtVZGycoDcsgmBD946VTb+2mN7u91B+HxA9KdERCZrfIrFy+/DY247BbWq5JF0cw4miQfOtTGeDdeqpYu/j7XU0wWDdzOiEFsKNQo3PWrDV0tc4fY9VLWLO3JppanKuEVoHPJmMMYHukRRHjaz/ECDJ19f61cr7/ZVndpbmlDMkj6mVxaTpd5AYY/oNLpIxOGEn6j/GFY4+eR7HrIpeizP+SCequ4nHotZ9D/m/IdNXrXskm0uXp5uP0acOLiV6MHoU65ZfrsGTOzte6l9gt8uPVHG+wWOmUzlM8ZyUU9MX8sGf0AhKAG+qQWSXVjAUq3F9SwiT3V+bdP2PLGVcjghK/We4CQCyH3ZqtYk+iHdMFC13X6hMlYF/5CoC4UvnPD92JHIFq3rMQSbtVMaHAuH1dalokm1DTlA0F+R3MmS8gMAYXn0c+ych4cja8eJGCRsby/slY26ZIoXZ7Vdw4QFqWogiw2/41sclLd56NyKsLC+YURrVJU/JiEXQgod10ZTux4yowABxYl4FYr4KqktMLUJ/OxffIBLZu2OtKzLe5qP/1UKJWdH9Rzau2z0Vbor0FyKz25JXFbjMZaDmz6D7DGc6c13xXLA==
- VIKUNJA_AUTH_OPENID_PROVIDERS_AUTHELIA_LOGOUTURL: AgDIhxAmY2SgQKF1owGIlaHMYL0ZUATHCoemcXwrKQcR/x9R8XT739l6WXlqoHk/4BOvSfxq/UCNsfDzzVyqNqpqq75tBiuesb5Y9DMO0D2Q4pOermEZ2KBQy5V24hF0DBqAyhBAdpP6hDhTkNOfs6PZcjS/gAZPSSgI7FL2hibccvPLxGgXEeCYQ1rSOdOJd23IQEX55cR8Vr0kUwyRnGtSibKdvqQYNY8rILrK8gkxQ5tGwCPgbaWjX87dJftBZmreXxdebFS3BslayuBRqtYGNsuE/1D18go3pKr2PnSiVZrZ+Mw0xYWqQFQ7aY2HmbiMKrDrGmcTeFMJh5nJUTXu7TVQqth7Ve5nDmylCJxxAeoBTaXOKx39B/poetqkQuDFnzQkRDNf3YYXOrJtfE41+Zdl1Q4dCkzA/q6IaN3KXNyoodAnuELEIScmlLUDHAweDiRlM9jCIPBeBOkwx1dCZGrcLrOzU6LI836Ts/DNpiU/fzHjGwby8n4ZBI6yWuIChRn2nms2WWcY24VEuxbEqlb7NaRVWE4N98t6V3tOTdZMjWE9cDkDEJIS1uaqZIwKccZBrjO434qki0xsqqfHZmbGGsLHUWAhjqNRU2TEsXh5ySMQItcwhxBSfqmuf/3CnIBD6KIJ/ABYNOx5wGUIQJ9PXKFdv41gt+L5VhKJ6GY8OH3BjmlxukIpMw5vnL0OfeZuJnlgLsyvM3U9I87rorRBsGjXfY6MCM4WL04ErAHAnQ==
- VIKUNJA_AUTH_OPENID_PROVIDERS_AUTHELIA_NAME: AgB8xVXbklEzqfTdHydc2fcw34asROYnUJ4iqHgFWX3CVU9oeaOBp2jk/2NFHGl2fYCmqcoj8u58Vi1bLp4AcDZPe5RBVN3A1oOqrvE4ufWiYUyvaWwuaveeJMPlbqqJ6dXh96dkAlmP8hBsNH09kEb4OdVSRFiCIbQEqS2oBLz0ur1d3xGY7+Ue98pVCbYjbIblG5tsRPxnKEfmLIb3ppnE8FjrZUUDhFrpkpAwJQuM11DQcl9qmuY+ECQz9h6WG/LyexqJmz6qjgGcllHWs0x6Bmqn3XkJqUjj7SQVPy8t8654YbDe5850c0Z5tUnZR1hw5vqzigtmDuwgGTyMTMMo1BodDamtrODAJo8C7EhaQ/NRbwQo1WZ/2MIYjqFDiYGxcLmTXHfVHISCzYF9wlhZ1uDCyzrAogphgbIC9KwHI1ODl4yWKT9igVYb90RM1kREcLHea9qY42mcrVAH7Khw3ovwke1VXD5bfG7TSnyQ5JJr8WcwLzFX8T71rYgeLIGcxGnG9duPoedJ8s3ViPgBYhV8kucSt39++GZrAibznllQ4/s2HjMMWCYAKISIl9RxWwBcjI6/o5F2midQ1+DXrWvOw90Li+AigWnoo89At38RvAqxYeKyKPkwrN90wMn5OSG2XiJjBKEAf+6ATvycY8sgNpKcUHZa144eaNiE9tfxos7IjqLVMv2xG+YfhOMQ5OFwHvfJdQ==
- template:
- metadata:
- creationTimestamp: null
- name: todos-oidc
- namespace: todos
- type: Opaque
diff --git a/apps/todos/values.yaml b/apps/todos/values.yaml
deleted file mode 100644
index c857e53..0000000
--- a/apps/todos/values.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-######################
-# VIKUNJA COMPONENTS #
-######################
-
-image:
- tag: 0.22.1
-# You can find the default values that this `values.yaml` overrides, in the comment at the top of this file.
-api:
- enabled: true
- image:
- tag: 0.22.1
- persistence:
- # This is your Vikunja data will live, you can either let
- # the chart create a new PVC for you or provide an existing one.
- data:
- enabled: true
- existingClaim: data
- accessMode: ReadWriteOnce
- size: 10Gi
- mountPath: /app/vikunja/files
-
- ingress:
- main:
- enabled: false
-
- configMaps:
- # The configuration for Vikunja's api.
- # https://vikunja.io/docs/config-options/
- config:
- enabled: true
- data:
- config.yml: |
- service:
- frontendUrl: https://todos.kluster.moll.re
- database:
- type: sqlite
- path: /app/vikunja/files/vikunja.db
- registration: false
-
-
-frontend:
- enabled: true
- image:
- tag: 0.22.1
- ingress:
- main:
- enabled: false
-
-postgresql:
- enabled: false
-redis:
- enabled: false
-typesense:
- enabled: false
diff --git a/kluster-deployments/todos/kustomization.yaml b/kluster-deployments/todos/kustomization.yaml
index 36563a8..977dcfe 100644
--- a/kluster-deployments/todos/kustomization.yaml
+++ b/kluster-deployments/todos/kustomization.yaml
@@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- application.yaml
- # - repo.yaml
\ No newline at end of file
diff --git a/kluster-deployments/todos/repo.yaml b/kluster-deployments/todos/repo.yaml
deleted file mode 100644
index 3d8c381..0000000
--- a/kluster-deployments/todos/repo.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- labels:
- argocd.argoproj.io/secret-type: repository
- name: kolaente-helm-oci
-
-stringData:
- url: kolaente.dev/vikunja
- name: vikunja
- type: helm
- enableOCI: "true"