From ec3cdd64102b9d9613e18ea3bded5bfeded971e7 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 22 Nov 2023 20:27:05 +0100 Subject: [PATCH] refactor(vikunja): replace hcloud volume with R2 --- vikunja/.gitignore | 1 + vikunja/config/values.keydb.yaml | 31 +++++++++++++++++++++++++++ vikunja/kustomization.yaml | 10 ++++++++- vikunja/resources/api/config.enc.yaml | 6 +++--- vikunja/resources/api/deployment.yaml | 3 +-- vikunja/resources/api/pvc.yaml | 4 ++-- vikunja/resources/ui/deployment.yaml | 1 + 7 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 vikunja/.gitignore create mode 100644 vikunja/config/values.keydb.yaml diff --git a/vikunja/.gitignore b/vikunja/.gitignore new file mode 100644 index 0000000..711a39c --- /dev/null +++ b/vikunja/.gitignore @@ -0,0 +1 @@ +charts/ \ No newline at end of file diff --git a/vikunja/config/values.keydb.yaml b/vikunja/config/values.keydb.yaml new file mode 100644 index 0000000..3059dd4 --- /dev/null +++ b/vikunja/config/values.keydb.yaml @@ -0,0 +1,31 @@ +imageRepository: code.icb4dc0.de/prskr/infrastructure/keydb +imageTag: v6.3.2 + +podDisruptionBudget: + enabled: true +persistentVolume: + enabled: false + +resources: + requests: + cpu: 10m + memory: 60Mi + limits: + cpu: 100m + memory: 128Mi + +serviceMonitor: + enabled: true + labels: + prometheus: default + +exporter: + enabled: true + imageTag: v1.51.0 + resources: + requests: + cpu: 50m + memory: 50Mi + limits: + cpu: 150m + memory: 100Mi \ No newline at end of file diff --git a/vikunja/kustomization.yaml b/vikunja/kustomization.yaml index 0f1cdc9..9fb99b5 100644 --- a/vikunja/kustomization.yaml +++ b/vikunja/kustomization.yaml @@ -25,4 +25,12 @@ resources: - resources/ingress.yaml generators: - - ./secret-generator.yaml \ No newline at end of file + - ./secret-generator.yaml + +helmCharts: + - name: keydb + repo: https://enapter.github.io/charts/ + releaseName: vikunja-session-cache + namespace: nocodb + version: "0.48.0" + valuesFile: config/values.keydb.yaml \ No newline at end of file diff --git a/vikunja/resources/api/config.enc.yaml b/vikunja/resources/api/config.enc.yaml index 15ae9d2..d89dbb6 100644 --- a/vikunja/resources/api/config.enc.yaml +++ b/vikunja/resources/api/config.enc.yaml @@ -4,7 +4,7 @@ metadata: name: vikunja-config type: Opaque stringData: - config.yml: ENC[AES256_GCM,data:P7sj7n7HRrPbEPkiGdxU4AJa8eR65AJYgEuJCeEsbsVwFtJ6epf4vm1bbpJ625P9ZzgllqunJvaiGGYCcmkHfUro77eIHdUOc5uvgaIp+Cb+Cv9+RuWm76lJeh1JpteeQ6zXX/OjeuL9TOEY89fynsuV7OQv/LxzPayPJedcAMiNsUtCzfB+qV84AlcRzNlx6HtsG0q2Aj75lBn0SvAZF0YRXX+vnJW/85y6tHu1x3kbxW0GtFHo0XMETKugbV7dEM6UUCUhRab7Za4JwjNJMvgMb2u2MU3BvQHG/3maKtqKnOQfAS1Cnbaq1W4b0FDUBRbMPKyOXHrMMXfLXPKVC7ozYqYh65eQIylBHCPP2wm9zZZeSG7QJoAN3GIj0fJIKM7tnGuppJEM3ZNwx80DWjgnVBa+AuaZ07xShMdcFsZuGbqjYKp+4OHCp2OhbgpfiM8D2Kr/6efdkC8pWu3/3e2SskX4KC6aIoWnndmW4QUY6buewjYgGvqa7HQ9vOgG/z1dOKT1/Lxh/kAje8A2E6UbA1m92LgUjowcZae6cBRWaczMdrY2LOQ7DOV+WAPyBfhQzIE=,iv:4AU8HUgOW+KBNYZEPr6LnTbIF2J2CEei3hlfa8JRQv8=,tag:9uDCrBLp4Tv770VTjlZw2g==,type:str] + config.yml: ENC[AES256_GCM,data:eRgslzSRlN3e2+ZujSLwuvCq+5osN//n4p0mg7i9VGMXN0m3DJVsmlaV8ZYZrNHgnfx9hFXfMKgtQYOtsgBoiFn3Za6ZMOm9aLPx8T9oe1kRt3KtmE9YSHQAko3FF9sOQ1szvRgEGLiANUPEBzSw/+KhlHltw77hF5AVOhuM3Rd0nxxkFHxkBaBf77cjANuEeE1qDXQUuiLD8eGU3EjXY+fEyKlELwIzkai+UBbVZiQ/RpKlHFk5XtibH6pW27idScKxlrJ5WJ3HjhaGPAqv6uOvr3589xWJKcB9xLqKxo49Cb2gisTPio1vBhxtGTs7hd3xmuABreaBqUoBMMkCt/MZjAUs6Jg5KQ16cjxPOva8rOilnoJPFZW9iqiuuyo3VPWzWSdzd/9A/QWtSKlliITbntIItiHmWbScq3vZXHrHFJz1IUEqcTVRndAz6FrqS6fhsObdP/MEovvroZzFBb2KRNt7mRW/JN2d62SupaDLcShYu8JB5joqsbmDA3OKbrGH/irh+W+f0byNB89BlLH6it9MJ95KsStb6O0kyXxPIjNz8YirzMWEierdelaM7V9FHp9W/T52AbjSbpQxnbu6q1IL3N0b9yrLQgjXBuryb2lIcPD9d2XALt7pYRiqke1rjom5FmiLvsT2JyzyrJTdXwPZCVU41CLhSrdrwdUuaZMXdOrQqCIQ8NWCaBrf2Skxj1wjui5U7Gz61e0rXth8SlPGLY1s3Uy0KZaNh7pcLh34XOK7KP4mXNjyew26bnFEuxGdULnUWUGsk9+iM5fStcxTCr+VeNCRLdSTj9rqH9cepoM55wDhPyFFalvQmccz0E7jJ9TKJx3n9tLbRH/mvJO16eXLX5JDxwt5HTMS1A2vRUpOMqT8R7PAkZyfEeFdvLLW88RwF/y4b4XxdDzPsLdzWCjYjhXmnUTcpd1RGIQEYuclS/BaZtmN9DSNb3AIT4cPeVvKo+K/,iv:EzzlAkFPitzJxz2ccnIRbxGnDM99eB5AVc0OAGgQsHk=,tag:GKN7FG5Op4P0rliSaThowg==,type:str] sops: kms: [] gcp_kms: [] @@ -29,8 +29,8 @@ sops: UnE2NTVSSUp1OEVFVDd5bHJYOEZpaVkKqmw9GLZavqaPQOJjGhLqXo4ggfmFDgXz C9HNxeDVr2kY452gleVS/YFTPWo0QPevl0SjpZg2gvnz28qLDSNXYQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-11-21T19:37:33Z" - mac: ENC[AES256_GCM,data:2ObbulomnNRBy2/OjuYJhXge1SQJt7abb7PG1On8y5Tdgu+UR6oHK5Sdthr338+ZEkta2qjH58CCOh/wGFrHiihJNIbpFUMY9+yKWZ/1GJpt3MZ5U1PU1PYZjy+6RDTo4NYKqbhZvdGVh/KNGSGuCvALff/ZHXy3GhuZC6pFeF4=,iv:Pz9lTnU9zoocTFU2GVrMaJF+ANTUcJ5IYGt8ACUHLBw=,tag:KgB4fEzxrB3g62N4fAwCXA==,type:str] + lastmodified: "2023-11-22T19:23:29Z" + mac: ENC[AES256_GCM,data:o5z6T8vTpHpeFNqm/Ij+ewXlMYuLGU9Rms5Ydt9hsvbErAFCObdxHtQe0RIQl//A9FklslJWCbteGVpeG2G0ewr42iFIM7r+zI5+pXy01/42Ith8JN2bNm/BaNco6nIltIc15RwDsbDemrXG2A/aR8dBH9JC+QtMH6G6/Mjub1U=,iv:7/6Iz0ftHNMXlOyvYkGj3z2wJBQ8hGr1LUuI9u0kfF8=,tag:NNKVHWzvh40ygCte0PYFeA==,type:str] pgp: [] unencrypted_regex: ^(apiVersion|metadata|kind|type)$ version: 3.8.1 diff --git a/vikunja/resources/api/deployment.yaml b/vikunja/resources/api/deployment.yaml index f6038c5..3a70ed2 100644 --- a/vikunja/resources/api/deployment.yaml +++ b/vikunja/resources/api/deployment.yaml @@ -4,8 +4,7 @@ kind: Deployment metadata: name: vikunja-api spec: - strategy: - type: Recreate + replicas: 2 selector: matchLabels: app.kubernetes.io/name: vikunja diff --git a/vikunja/resources/api/pvc.yaml b/vikunja/resources/api/pvc.yaml index b219c88..3e4fc29 100644 --- a/vikunja/resources/api/pvc.yaml +++ b/vikunja/resources/api/pvc.yaml @@ -4,10 +4,10 @@ kind: PersistentVolumeClaim metadata: name: vikunja-content spec: - storageClassName: hcloud-volumes + storageClassName: r2 resources: requests: storage: 10Gi volumeMode: Filesystem accessModes: - - ReadWriteOnce + - ReadWriteMany diff --git a/vikunja/resources/ui/deployment.yaml b/vikunja/resources/ui/deployment.yaml index 9be7cfd..c64ee88 100644 --- a/vikunja/resources/ui/deployment.yaml +++ b/vikunja/resources/ui/deployment.yaml @@ -4,6 +4,7 @@ kind: Deployment metadata: name: vikunja-ui spec: + replicas: 2 selector: matchLabels: app.kubernetes.io/name: vikunja