diff --git a/charts/nmrxiv-app/Chart.yaml b/charts/nmrxiv-app/Chart.yaml index 3349c1d..72548ee 100644 --- a/charts/nmrxiv-app/Chart.yaml +++ b/charts/nmrxiv-app/Chart.yaml @@ -18,7 +18,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.7 +version: 0.2.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/nmrxiv-app/templates/configmap.yaml b/charts/nmrxiv-app/templates/configmap.yaml index 02aa1a3..2a78ba6 100644 --- a/charts/nmrxiv-app/templates/configmap.yaml +++ b/charts/nmrxiv-app/templates/configmap.yaml @@ -38,11 +38,11 @@ data: #Redis Properties {{ if .Values.redis.enabled }} - SESSION_DRIVER: "redis" - CACHE_DRIVER: "redis" - REDIS_CLIENT: "predis" - SESSION_LIFETIME: "120" - MEMCACHED_HOST: "memcached" + SESSION_DRIVER: {{ .Values.redis.sessionDriver }} + CACHE_DRIVER: {{ .Values.redis.cacheDriver }} + REDIS_CLIENT: {{ .Values.redis.redisClient }} + SESSION_LIFETIME: {{ .Values.redis.sessionLifetime }} + MEMCACHED_HOST: {{ .Values.redis.memcachedHost }} REDIS_HOST: {{ printf "%s-redis-master" .Release.Name | quote }} REDIS_PORT: {{ .Values.redis.port | default 6379 | quote }} {{ end }} diff --git a/charts/nmrxiv-app/values.yaml b/charts/nmrxiv-app/values.yaml index a285c4e..9e06bce 100644 --- a/charts/nmrxiv-app/values.yaml +++ b/charts/nmrxiv-app/values.yaml @@ -178,45 +178,30 @@ nmrium: port: 80 nmriumURL: //nmriumdev.nmrxiv.org -# redis: -# auth: -# enabled: true -# password: password -# enabled: false -# global: -# storageClass: standard -# master: -# persistence: -# enabled: true -# size: 1Gi -# replica: -# persistence: -# enabled: true -# size: 1Gi -# replica: -# replicaCount: 1 -# port: 6379 - redis: auth: + enabled: true password: password enabled: false global: storageClass: standard #host: nmrxiv-redis-master + master: + persistence: + enabled: true + size: 1Gi + replica: + persistence: + enabled: true + size: 1Gi replica: replicaCount: 1 - persistence: - enabled: false - size: 1Gi port: 6379 - resources: - limits: - cpu: 50m - memory: 30Mi - requests: - cpu: 10m - memory: 30Mi + sessionDriver: redis + cacheDriver: redis + redisClient: predis + sessionLifetime: 120 + memcachedHost: memcached rabbitmq: enabled: false