diff --git a/nocodb/config/base.env b/nocodb/config/base.env index 0d3bb01..18a3702 100644 --- a/nocodb/config/base.env +++ b/nocodb/config/base.env @@ -6,4 +6,4 @@ DB_QUERY_LIMIT_MIN=1 NC_JWT_EXPIRES_IN=1h NC_DISABLE_TELE=true NC_ADMIN_EMAIL=peter.kurfer@gmail.com -NC_REDIS_URL=redis://nocodb-keydb:6379/0 \ No newline at end of file +NC_REDIS_URL=redis://nocodb-cache:6379/0 \ No newline at end of file diff --git a/nocodb/config/values.keydb.yaml b/nocodb/config/values.keydb.yaml deleted file mode 100644 index 4bb9510..0000000 --- a/nocodb/config/values.keydb.yaml +++ /dev/null @@ -1,33 +0,0 @@ -imageRepository: code.icb4dc0.de/prskr/infrastructure/keydb -imageTag: v6.3.3 - -nodes: 3 -podDisruptionBudget: - enabled: true - -persistentVolume: - enabled: false - -resources: - requests: - cpu: 50m - memory: 100Mi - limits: - cpu: 250m - memory: 256Mi - -exporter: - enabled: true - imageTag: v1.51.0 - resources: - requests: - cpu: 50m - memory: 50Mi - limits: - cpu: 150m - memory: 100Mi - -serviceMonitor: - enabled: true - labels: - prometheus: default diff --git a/nocodb/kustomization.yaml b/nocodb/kustomization.yaml index 4829af0..798885b 100644 --- a/nocodb/kustomization.yaml +++ b/nocodb/kustomization.yaml @@ -16,6 +16,7 @@ labels: resources: - resources/namespace.yaml +- resources/dragonfly.yaml - resources/pvc.yaml - resources/deployment.yaml - resources/service.yaml @@ -28,11 +29,3 @@ secretGenerator: - envs: - config/base.env name: nocodb-base-config - -helmCharts: -- name: keydb - namespace: nocodb - releaseName: nocodb-keydb - repo: https://enapter.github.io/charts/ - valuesFile: config/values.keydb.yaml - version: 0.48.0 diff --git a/nocodb/resources/dragonfly.yaml b/nocodb/resources/dragonfly.yaml new file mode 100644 index 0000000..154f3cb --- /dev/null +++ b/nocodb/resources/dragonfly.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: dragonflydb.io/v1alpha1 +kind: Dragonfly +metadata: + name: nocodb-cache + labels: + app.kubernetes.io/name: nocodb-cache + app.kubernetes.io/instance: nocodb + app.kubernetes.io/part-of: nocodb +spec: + replicas: 2 + resources: + requests: + cpu: 100m + memory: 350Mi + limits: + cpu: 100m + memory: 350Mi \ No newline at end of file diff --git a/vikunja/config/values.keydb.yaml b/vikunja/config/values.keydb.yaml deleted file mode 100644 index 3059dd4..0000000 --- a/vikunja/config/values.keydb.yaml +++ /dev/null @@ -1,31 +0,0 @@ -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 c47f587..71716d0 100644 --- a/vikunja/kustomization.yaml +++ b/vikunja/kustomization.yaml @@ -19,6 +19,7 @@ labels: resources: - resources/namespace.yaml + - resources/api/dragonfly.yaml - resources/api/pvc.yaml - resources/api/deployment.yaml - resources/api/service.yaml @@ -28,11 +29,3 @@ resources: generators: - ./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 d89dbb6..2f046d3 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: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] + config.yml: ENC[AES256_GCM,data:2r1HqOI5/n2JqEhhKV8fdOmrO1w5ABA5IcmQKgc8d7JO/ijzhHuWKEPADKjb/COXUxhf9e0CjPRjhQUib4JddUWpmXa56pI3eFpCYXplHpf+z+eJr2lRlLQYX6ZxuXV455n7ff2lWFC5Fz5J3+v/Lr/lB5MMoIMcdwgBjN/RBxC0kU9lgDIcQmRbwEk4AFB2Z5KgX3L4Dr46aDWiIHbcj5vxrqzp5CfrVfNUNBUj3FMU/DzBHM17rRSe9up77QorieCF1GB4NfIIVFaDeHhxupHbu2DhyZmSqZqU6YGznZbxXnf2WmnXFUif0QJE2M9xIgeo7VY760JPnSbMLcPi65h6oGq66c1g9iygNQS5i5rsxMOSd4/GcixnXbdtkPuLvBNsse3uSuDBhKHWBaM4Q/a8zpc9mQErnbiSzovs8bJG23mmsLSknL6IUrWTZX5BtofAaraHB5ZTEdZ1vBeTOaFnq95MaruVR5yQ31bTikT0oDL+a1JnOpi5JspKsD4b1IjPMQEw6hdIgjDtZfIzUz9UTMReA+ysbY95tghvBhd4sTEAYGcOzRbBZGC5+vfXCh92It2owrBCZjud7bDF97KciiGKXOpxPCZd6oJUfEx+teHcyEVUkEXyPa0pyRgIvGwsZlfho0+gvSRh9AtGIt1RlEm0XJhmzheIy0MOGxv8O1M9GAiqP5nrqj2CRYO/BXScz13muIAj0a26WctgRyhgOPBuWyZe0fxv35ykzUe0fzJGOHPDCmeoaFzAjwl33cODSrJHP0di/QtNjVg9HkF/nJ4KGji12f3++iKhutZrwzKrHku9cLsMRL3iu9jxZRjlSmQxV8fBv3Hmwg50e3KxxCAphSSFhT1CWiIT6YjA4lp5SlXh8Zv9QKVObZAw/4oG+5MIrrUq7UsQbiJ2OWWN8/F+dC1AbpiwN0UlUoFHLkAgzzkmmmlsL+92cw==,iv:tT5PiheJJvzi99dYg2m5pmd0G5g6dOrfsztuIn1fXFM=,tag:1sf17XtRr8Fq9R2Djac2/A==,type:str] sops: kms: [] gcp_kms: [] @@ -29,8 +29,8 @@ sops: UnE2NTVSSUp1OEVFVDd5bHJYOEZpaVkKqmw9GLZavqaPQOJjGhLqXo4ggfmFDgXz C9HNxeDVr2kY452gleVS/YFTPWo0QPevl0SjpZg2gvnz28qLDSNXYQ== -----END AGE ENCRYPTED FILE----- - 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] + lastmodified: "2024-04-10T19:09:31Z" + mac: ENC[AES256_GCM,data:D+izZl07sm3DGP44qdCYsjIPhQ2S1eURKtB+CYULmsFnI+8FiCV0cgq3zA/af6PTeVV62lFoLiaZzSeLTRi41c1qvGL3KUwjLMm/cPLKZXygtzcDAeJun3JN+DejJmdNZkqBy6m4IWJPbEH4LcXP3RglV1KQGNXxDdL/fzLcKgc=,iv:yvpEjmldoblZyrfNUValNxEkNiTCdkSe7i/GjIE+26o=,tag:vTN2nI/o35doWvUMlLrrzw==,type:str] pgp: [] unencrypted_regex: ^(apiVersion|metadata|kind|type)$ version: 3.8.1 diff --git a/vikunja/resources/api/dragonfly.yaml b/vikunja/resources/api/dragonfly.yaml new file mode 100644 index 0000000..95af0cc --- /dev/null +++ b/vikunja/resources/api/dragonfly.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: dragonflydb.io/v1alpha1 +kind: Dragonfly +metadata: + name: vikunja-cache + labels: + app.kubernetes.io/name: vikunja-cache + app.kubernetes.io/instance: vikunja + app.kubernetes.io/part-of: vikunja +spec: + replicas: 2 + resources: + requests: + cpu: 100m + memory: 350Mi + limits: + cpu: 100m + memory: 350Mi \ No newline at end of file