From d1c560382bda35323fd04a1aebbdd635f45c6d01 Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 17 Nov 2025 13:49:41 +0200 Subject: [PATCH 1/2] Refactor Redis client initialization to support both Sentinel and standalone connections. Introduced REDIS_URL for fallback and improved error handling and logging for both client types. --- backend/services/redis.ts | 88 +++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 27 deletions(-) diff --git a/backend/services/redis.ts b/backend/services/redis.ts index 8914b98d5..e91a32aba 100644 --- a/backend/services/redis.ts +++ b/backend/services/redis.ts @@ -1,5 +1,5 @@ import parseJSON from "json-parse-even-better-errors" -import { createSentinel } from "redis" +import { createClient, createSentinel } from "redis" import * as winston from "winston" import { @@ -9,6 +9,7 @@ import { REDIS_PASSWORD, REDIS_SENTINEL_MASTER_NAME, REDIS_SENTINELS, + REDIS_URL, } from "../config" import { BaseContext } from "../context" import { isDefined, isPromise } from "../util" @@ -23,7 +24,10 @@ const _logger = winston.createLogger({ transports: [new winston.transports.Console()], }) -let redisClient: ReturnType | undefined +type RedisClient = + | ReturnType + | ReturnType +let redisClient: RedisClient | undefined export const redisReconnectStrategy = (redisName = "Redis", logger: winston.Logger = _logger) => @@ -40,44 +44,74 @@ export const redisReconnectStrategy = return nextDelay } -const getRedisClient = (): ReturnType | undefined => { +const getRedisClient = (): RedisClient | undefined => { if (redisClient) { return redisClient } - if (NEXUS_REFLECTION || isTest) { + if (NEXUS_REFLECTION ?? isTest) { return } - const sentinels = REDIS_SENTINELS?.split(",").map((sentinel: string) => { - const [host, port] = sentinel.trim().split(":") - return { host, port: parseInt(port) ?? 26379 } - }) + const useSentinel = REDIS_SENTINELS && REDIS_SENTINEL_MASTER_NAME - const client = createSentinel({ - name: REDIS_SENTINEL_MASTER_NAME!, - sentinelRootNodes: sentinels ?? [], - nodeClientOptions: { + let client: RedisClient + + if (useSentinel && REDIS_SENTINELS && REDIS_SENTINEL_MASTER_NAME) { + const sentinels = REDIS_SENTINELS.split(",").map((sentinel: string) => { + const [host, port] = sentinel.trim().split(":") + return { host, port: parseInt(port) ?? 26379 } + }) + + const sentinelClient = createSentinel({ + name: REDIS_SENTINEL_MASTER_NAME, + sentinelRootNodes: sentinels, + nodeClientOptions: { + password: REDIS_PASSWORD, + database: REDIS_DB, + socket: { + reconnectStrategy: redisReconnectStrategy(), + }, + }, + }) + + sentinelClient.on("error", (err: any) => { + _logger.error(`Redis Sentinel error`, err) + }) + sentinelClient.on("ready", () => { + _logger.info( + `Redis Sentinel connected to master: ${REDIS_SENTINEL_MASTER_NAME}`, + ) + }) + + sentinelClient.connect().catch((err: any) => { + _logger.error(`Redis Sentinel connection failed`, err) + }) + + client = sentinelClient as RedisClient + } else { + const url = REDIS_URL ?? "redis://127.0.0.1:6379" + const regularClient = createClient({ + url, password: REDIS_PASSWORD, database: REDIS_DB, socket: { reconnectStrategy: redisReconnectStrategy(), }, - }, - }) - - client.on("error", (err: any) => { - _logger.error(`Redis Sentinel error`, err) - }) - client.on("ready", () => { - _logger.info( - `Redis Sentinel connected to master: ${REDIS_SENTINEL_MASTER_NAME}`, - ) - }) + }) + + regularClient.on("error", (err: any) => { + _logger.error(`Redis error`, err) + }) + regularClient.on("ready", () => { + _logger.info(`Redis connected to: ${url}`) + }) - // Connect the Sentinel client - client.connect().catch((err: any) => { - _logger.error(`Redis Sentinel connection failed`, err) - }) + regularClient.connect().catch((err: any) => { + _logger.error(`Redis connection failed`, err) + }) + + client = regularClient as RedisClient + } redisClient = client return client From 36d2c6323437bc5cd6b2f11a0680b4604d763c2f Mon Sep 17 00:00:00 2001 From: Henrik Nygren Date: Mon, 17 Nov 2025 14:55:11 +0200 Subject: [PATCH 2/2] Remove redis sentinels --- helm/templates/backend-deployment.yml | 10 ---------- helm/templates/background-emailer-deployment.yml | 10 ---------- helm/templates/course-stats-emailer-cronjob.yml | 10 ---------- .../elements-consented-users-mailer-cronjob.yml | 10 ---------- ...user-organization-join-confirmations-deployment.yml | 10 ---------- helm/templates/fetch-avoin-links-cronjob.yml | 10 ---------- helm/templates/fetch-user-app-datum-cronjob.yml | 10 ---------- helm/templates/fetch-user-field-values-cronjob.yml | 10 ---------- helm/templates/import-organizations-cronjob.yml | 10 ---------- .../kafka-consumer-exercises.yml | 10 ---------- .../kafka-consumer-user-course-progress-batch.yml | 10 ---------- .../kafka-consumer-user-course-progress-realtime.yml | 10 ---------- .../kafka-consumer-user-points-batch.yml | 10 ---------- .../kafka-consumer-user-points-realtime.yml | 10 ---------- .../kafka-consumer-exercises.yml | 10 ---------- .../kafka-consumer-user-course-progress-batch.yml | 10 ---------- .../kafka-consumer-user-course-progress-realtime.yml | 10 ---------- .../kafka-consumer-user-points-batch.yml | 10 ---------- .../kafka-consumer-user-points-realtime.yml | 10 ---------- helm/templates/kafka/kafka-bridge-deployment.yml | 10 ---------- helm/templates/kafka/kafka-consumer-exercises.yml | 10 ---------- .../kafka/kafka-consumer-user-course-points-batch.yml | 10 ---------- .../kafka-consumer-user-course-points-realtime.yml | 10 ---------- .../kafka-consumer-user-course-progress-batch.yml | 10 ---------- .../kafka-consumer-user-course-progress-realtime.yml | 10 ---------- .../kafka/kafka-consumer-user-points-batch.yml | 10 ---------- .../kafka/kafka-consumer-user-points-realtime.yml | 10 ---------- helm/templates/kafka/kafka-status-deployment.yml | 10 ---------- helm/templates/linkoping-stats-mailer-cronjob.yml | 10 ---------- helm/templates/masaryk-stats-mailer-cronjob.yml | 10 ---------- helm/templates/opava-stats-mailer-cronjob.yml | 10 ---------- helm/templates/prague-stats-mailer-cronjob.yml | 10 ---------- helm/templates/pre-upgrade.yml | 10 ---------- helm/templates/prune-old-stored-data-cronjob.yml | 10 ---------- helm/templates/purkyne-stats-mailer-cronjob.yml | 10 ---------- helm/templates/resync-user-app-datum-cronjob.yml | 10 ---------- helm/templates/send-ai-statistics-cronjob.yml | 10 ---------- helm/templates/sync-tmc-users-cronjob.yml | 10 ---------- helm/templates/update-course-statuses-cronjob.yml | 10 ---------- 39 files changed, 390 deletions(-) diff --git a/helm/templates/backend-deployment.yml b/helm/templates/backend-deployment.yml index 5d51e5ccd..903fdd68a 100644 --- a/helm/templates/backend-deployment.yml +++ b/helm/templates/backend-deployment.yml @@ -41,16 +41,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: NEW_RELIC_NO_CONFIG_FILE value: "true" - name: CONNECTION_LIMIT diff --git a/helm/templates/background-emailer-deployment.yml b/helm/templates/background-emailer-deployment.yml index fbf15ef94..b23295f3e 100644 --- a/helm/templates/background-emailer-deployment.yml +++ b/helm/templates/background-emailer-deployment.yml @@ -39,16 +39,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONNECTION_LIMIT value: "1" - name: APPLICATION_NAME diff --git a/helm/templates/course-stats-emailer-cronjob.yml b/helm/templates/course-stats-emailer-cronjob.yml index bc2c29164..bdc8259c1 100644 --- a/helm/templates/course-stats-emailer-cronjob.yml +++ b/helm/templates/course-stats-emailer-cronjob.yml @@ -33,13 +33,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/elements-consented-users-mailer-cronjob.yml b/helm/templates/elements-consented-users-mailer-cronjob.yml index b12ea2bab..311874f7b 100644 --- a/helm/templates/elements-consented-users-mailer-cronjob.yml +++ b/helm/templates/elements-consented-users-mailer-cronjob.yml @@ -34,13 +34,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/expire-user-organization-join-confirmations-deployment.yml b/helm/templates/expire-user-organization-join-confirmations-deployment.yml index 497eb8837..17104b48e 100644 --- a/helm/templates/expire-user-organization-join-confirmations-deployment.yml +++ b/helm/templates/expire-user-organization-join-confirmations-deployment.yml @@ -38,16 +38,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name volumeMounts: - name: google-cloud-storage-serviceaccount mountPath: "/etc/gcs" diff --git a/helm/templates/fetch-avoin-links-cronjob.yml b/helm/templates/fetch-avoin-links-cronjob.yml index 4f257979d..77a4d943a 100644 --- a/helm/templates/fetch-avoin-links-cronjob.yml +++ b/helm/templates/fetch-avoin-links-cronjob.yml @@ -32,13 +32,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/fetch-user-app-datum-cronjob.yml b/helm/templates/fetch-user-app-datum-cronjob.yml index c376273fb..907c408d1 100644 --- a/helm/templates/fetch-user-app-datum-cronjob.yml +++ b/helm/templates/fetch-user-app-datum-cronjob.yml @@ -32,15 +32,5 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONFIG_NAME value: "userAppDatum" diff --git a/helm/templates/fetch-user-field-values-cronjob.yml b/helm/templates/fetch-user-field-values-cronjob.yml index 1483405d6..e72c604f4 100644 --- a/helm/templates/fetch-user-field-values-cronjob.yml +++ b/helm/templates/fetch-user-field-values-cronjob.yml @@ -32,16 +32,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONFIG_NAME value: "userFieldValues" diff --git a/helm/templates/import-organizations-cronjob.yml b/helm/templates/import-organizations-cronjob.yml index bd00fb92f..3fcbb5887 100644 --- a/helm/templates/import-organizations-cronjob.yml +++ b/helm/templates/import-organizations-cronjob.yml @@ -32,13 +32,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-exercises.yml b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-exercises.yml index 015a3abe9..a59f25181 100644 --- a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-exercises.yml +++ b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-exercises.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_TOP_OF_THE_QUEUE value: "1" volumeMounts: diff --git a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-course-progress-batch.yml b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-course-progress-batch.yml index 515155c88..3087e7726 100644 --- a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-course-progress-batch.yml +++ b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-course-progress-batch.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_TOP_OF_THE_QUEUE value: "1" volumeMounts: diff --git a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-course-progress-realtime.yml b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-course-progress-realtime.yml index 2171112e2..d34953e87 100644 --- a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-course-progress-realtime.yml +++ b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-course-progress-realtime.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_TOP_OF_THE_QUEUE value: "1" volumeMounts: diff --git a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-points-batch.yml b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-points-batch.yml index 3ebbf9ed7..64e11e8a7 100644 --- a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-points-batch.yml +++ b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-points-batch.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_TOP_OF_THE_QUEUE value: "1" volumeMounts: diff --git a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-points-realtime.yml b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-points-realtime.yml index 7b5eabf26..74b7a5c67 100644 --- a/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-points-realtime.yml +++ b/helm/templates/kafka/consumers-for-top-of-the-queue/kafka-consumer-user-points-realtime.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_TOP_OF_THE_QUEUE value: "1" volumeMounts: diff --git a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-exercises.yml b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-exercises.yml index 66324ac02..0dd502451 100644 --- a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-exercises.yml +++ b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-exercises.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_CONSUMER_GROUP value: try-again volumeMounts: diff --git a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-course-progress-batch.yml b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-course-progress-batch.yml index da11f73cf..30936e136 100644 --- a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-course-progress-batch.yml +++ b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-course-progress-batch.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_CONSUMER_GROUP value: try-again volumeMounts: diff --git a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-course-progress-realtime.yml b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-course-progress-realtime.yml index 2a394b1fc..135c416ec 100644 --- a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-course-progress-realtime.yml +++ b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-course-progress-realtime.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_CONSUMER_GROUP value: try-again volumeMounts: diff --git a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-points-batch.yml b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-points-batch.yml index 28e72a736..42eb7b7c4 100644 --- a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-points-batch.yml +++ b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-points-batch.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_CONSUMER_GROUP value: try-again volumeMounts: diff --git a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-points-realtime.yml b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-points-realtime.yml index 9079a6ec8..facb6fb66 100644 --- a/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-points-realtime.yml +++ b/helm/templates/kafka/consumers-for-trying-again/kafka-consumer-user-points-realtime.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: KAFKA_CONSUMER_GROUP value: try-again volumeMounts: diff --git a/helm/templates/kafka/kafka-bridge-deployment.yml b/helm/templates/kafka/kafka-bridge-deployment.yml index 52d92296e..8d7793524 100644 --- a/helm/templates/kafka/kafka-bridge-deployment.yml +++ b/helm/templates/kafka/kafka-bridge-deployment.yml @@ -53,16 +53,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: UV_THREADPOOL_SIZE value: "8" - name: CONNECTION_LIMIT diff --git a/helm/templates/kafka/kafka-consumer-exercises.yml b/helm/templates/kafka/kafka-consumer-exercises.yml index 1202e3966..876d3494c 100644 --- a/helm/templates/kafka/kafka-consumer-exercises.yml +++ b/helm/templates/kafka/kafka-consumer-exercises.yml @@ -41,16 +41,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONNECTION_LIMIT value: "{{ default .Values.kafkaConsumer.connectionLimit .Values.kafkaConsumer.topic.exercises.connectionLimit }}" - name: APPLICATION_NAME diff --git a/helm/templates/kafka/kafka-consumer-user-course-points-batch.yml b/helm/templates/kafka/kafka-consumer-user-course-points-batch.yml index e3920d82d..4b35a2625 100644 --- a/helm/templates/kafka/kafka-consumer-user-course-points-batch.yml +++ b/helm/templates/kafka/kafka-consumer-user-course-points-batch.yml @@ -41,16 +41,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONNECTION_LIMIT value: "{{ default .Values.kafkaConsumer.connectionLimit .Values.kafkaConsumer.topic.userCoursePoints.connectionLimit }}" - name: APPLICATION_NAME diff --git a/helm/templates/kafka/kafka-consumer-user-course-points-realtime.yml b/helm/templates/kafka/kafka-consumer-user-course-points-realtime.yml index 731daab5e..c697841f7 100644 --- a/helm/templates/kafka/kafka-consumer-user-course-points-realtime.yml +++ b/helm/templates/kafka/kafka-consumer-user-course-points-realtime.yml @@ -41,16 +41,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONNECTION_LIMIT value: "{{ default .Values.kafkaConsumer.connectionLimit .Values.kafkaConsumer.topic.userCoursePointsRealtime.connectionLimit }}" - name: APPLICATION_NAME diff --git a/helm/templates/kafka/kafka-consumer-user-course-progress-batch.yml b/helm/templates/kafka/kafka-consumer-user-course-progress-batch.yml index 2fe178c72..f21a687e2 100644 --- a/helm/templates/kafka/kafka-consumer-user-course-progress-batch.yml +++ b/helm/templates/kafka/kafka-consumer-user-course-progress-batch.yml @@ -41,16 +41,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONNECTION_LIMIT value: "{{ default .Values.kafkaConsumer.connectionLimit .Values.kafkaConsumer.topic.userCourseProgress.connectionLimit }}" - name: APPLICATION_NAME diff --git a/helm/templates/kafka/kafka-consumer-user-course-progress-realtime.yml b/helm/templates/kafka/kafka-consumer-user-course-progress-realtime.yml index 33da8b688..889d8e52d 100644 --- a/helm/templates/kafka/kafka-consumer-user-course-progress-realtime.yml +++ b/helm/templates/kafka/kafka-consumer-user-course-progress-realtime.yml @@ -41,16 +41,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONNECTION_LIMIT value: "{{ default .Values.kafkaConsumer.connectionLimit .Values.kafkaConsumer.topic.userCourseProgressRealtime.connectionLimit }}" - name: APPLICATION_NAME diff --git a/helm/templates/kafka/kafka-consumer-user-points-batch.yml b/helm/templates/kafka/kafka-consumer-user-points-batch.yml index 22eed516d..f07eaa190 100644 --- a/helm/templates/kafka/kafka-consumer-user-points-batch.yml +++ b/helm/templates/kafka/kafka-consumer-user-points-batch.yml @@ -41,16 +41,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONNECTION_LIMIT value: "{{ default .Values.kafkaConsumer.connectionLimit .Values.kafkaConsumer.topic.userPoints.connectionLimit }}" - name: APPLICATION_NAME diff --git a/helm/templates/kafka/kafka-consumer-user-points-realtime.yml b/helm/templates/kafka/kafka-consumer-user-points-realtime.yml index c77f377bf..d60560d2d 100644 --- a/helm/templates/kafka/kafka-consumer-user-points-realtime.yml +++ b/helm/templates/kafka/kafka-consumer-user-points-realtime.yml @@ -41,16 +41,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONNECTION_LIMIT value: "{{ default .Values.kafkaConsumer.connectionLimit .Values.kafkaConsumer.topic.userPointsRealtime.connectionLimit }}" - name: APPLICATION_NAME diff --git a/helm/templates/kafka/kafka-status-deployment.yml b/helm/templates/kafka/kafka-status-deployment.yml index c855bf6d1..3c1ac085c 100644 --- a/helm/templates/kafka/kafka-status-deployment.yml +++ b/helm/templates/kafka/kafka-status-deployment.yml @@ -40,16 +40,6 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name volumeMounts: - name: google-cloud-storage-serviceaccount mountPath: "/etc/gcs" diff --git a/helm/templates/linkoping-stats-mailer-cronjob.yml b/helm/templates/linkoping-stats-mailer-cronjob.yml index affc4be26..26a9b1c24 100644 --- a/helm/templates/linkoping-stats-mailer-cronjob.yml +++ b/helm/templates/linkoping-stats-mailer-cronjob.yml @@ -33,13 +33,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/masaryk-stats-mailer-cronjob.yml b/helm/templates/masaryk-stats-mailer-cronjob.yml index fcb8f53e4..ca6d320a1 100644 --- a/helm/templates/masaryk-stats-mailer-cronjob.yml +++ b/helm/templates/masaryk-stats-mailer-cronjob.yml @@ -34,14 +34,4 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name {{- end }} diff --git a/helm/templates/opava-stats-mailer-cronjob.yml b/helm/templates/opava-stats-mailer-cronjob.yml index 6e788bd7b..f00149505 100644 --- a/helm/templates/opava-stats-mailer-cronjob.yml +++ b/helm/templates/opava-stats-mailer-cronjob.yml @@ -34,14 +34,4 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name {{- end }} diff --git a/helm/templates/prague-stats-mailer-cronjob.yml b/helm/templates/prague-stats-mailer-cronjob.yml index 97ff09b51..2f2dcec10 100644 --- a/helm/templates/prague-stats-mailer-cronjob.yml +++ b/helm/templates/prague-stats-mailer-cronjob.yml @@ -34,14 +34,4 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name {{- end }} diff --git a/helm/templates/pre-upgrade.yml b/helm/templates/pre-upgrade.yml index 4f6a6625f..75066e99d 100644 --- a/helm/templates/pre-upgrade.yml +++ b/helm/templates/pre-upgrade.yml @@ -32,13 +32,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/prune-old-stored-data-cronjob.yml b/helm/templates/prune-old-stored-data-cronjob.yml index 785d133c4..c43d88bd2 100644 --- a/helm/templates/prune-old-stored-data-cronjob.yml +++ b/helm/templates/prune-old-stored-data-cronjob.yml @@ -32,13 +32,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/purkyne-stats-mailer-cronjob.yml b/helm/templates/purkyne-stats-mailer-cronjob.yml index 8b7bc1f8f..ceb4fe3d1 100644 --- a/helm/templates/purkyne-stats-mailer-cronjob.yml +++ b/helm/templates/purkyne-stats-mailer-cronjob.yml @@ -34,14 +34,4 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name {{- end }} diff --git a/helm/templates/resync-user-app-datum-cronjob.yml b/helm/templates/resync-user-app-datum-cronjob.yml index d53b91573..dd3679afd 100644 --- a/helm/templates/resync-user-app-datum-cronjob.yml +++ b/helm/templates/resync-user-app-datum-cronjob.yml @@ -33,15 +33,5 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name - name: CONFIG_NAME value: "resyncUserAppDatum" diff --git a/helm/templates/send-ai-statistics-cronjob.yml b/helm/templates/send-ai-statistics-cronjob.yml index ca4a828ec..bc2b9f92f 100644 --- a/helm/templates/send-ai-statistics-cronjob.yml +++ b/helm/templates/send-ai-statistics-cronjob.yml @@ -32,13 +32,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/sync-tmc-users-cronjob.yml b/helm/templates/sync-tmc-users-cronjob.yml index 106738645..ef2cd016f 100644 --- a/helm/templates/sync-tmc-users-cronjob.yml +++ b/helm/templates/sync-tmc-users-cronjob.yml @@ -32,13 +32,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name diff --git a/helm/templates/update-course-statuses-cronjob.yml b/helm/templates/update-course-statuses-cronjob.yml index 34dd91e1d..41aa6187f 100644 --- a/helm/templates/update-course-statuses-cronjob.yml +++ b/helm/templates/update-course-statuses-cronjob.yml @@ -32,13 +32,3 @@ spec: secretKeyRef: name: new-redis key: redis-password - - name: REDIS_SENTINELS - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinels - - name: REDIS_SENTINEL_MASTER_NAME - valueFrom: - secretKeyRef: - name: new-redis - key: redis-sentinel-master-name