fix the test cases

Signed-off-by: Jan Larwig <[email protected]>

Author: tuunit

helm/oauth2-proxy/ci/redis-sentinel-array-values.yaml

@@ -6,18 +6,29 @@ sessionStorage:
       password: "foo"
       masterName: "mymaster"
       connectionUrls:
-        - "redis://oauth2-proxy-redis:26379"
-        - "redis://oauth2-proxy-redis:26379"
+        - "redis://oauth2-proxy-redis-announce-0:26379"
+        - "redis://oauth2-proxy-redis-announce-1:26379"
 
 # provision an instance of the redis-ha sub-chart
 redis:
   enabled: true
   fullnameOverride: oauth2-proxy-redis
-  replicas: 3
+
   redisPassword: "foo"
+
   redis:
     masterGroupName: mymaster
 
+  replicas: 2
+  hardAntiAffinity: false
+
+  persistentVolume:
+    enabled: false
+  haproxy:
+    enabled: false
+  exporter:
+    enabled: false
+
 initContainers:
   waitForRedis:
     enabled: true

helm/oauth2-proxy/ci/redis-sentinel-comma-values.yaml

@@ -5,17 +5,28 @@ sessionStorage:
     sentinel:
       password: "foo"
       masterName: "mymaster"
-      connectionUrls: "redis://oauth2-proxy-redis:26379,redis://oauth2-proxy-redis:26379"
+      connectionUrls: "redis://oauth2-proxy-redis-announce-0:26379,redis://oauth2-proxy-redis-announce-1:26379"
 
 # provision an instance of the redis-ha sub-chart
 redis:
   enabled: true
   fullnameOverride: oauth2-proxy-redis
-  replicas: 3
+
   redisPassword: "foo"
+
   redis:
     masterGroupName: mymaster
 
+  replicas: 2
+  hardAntiAffinity: false
+
+  persistentVolume:
+    enabled: false
+  haproxy:
+    enabled: false
+  exporter:
+    enabled: false
+
 initContainers:
   waitForRedis:
     enabled: true

helm/oauth2-proxy/ci/redis-standalone-values.yaml

@@ -8,9 +8,59 @@ sessionStorage:
 redis:
   enabled: true
   fullnameOverride: oauth2-proxy-redis
-  replicas: 1
+
   redisPassword: "foo"
 
+  replicas: 1
+
+  # Remove sentinel overhead, speed up startup and redis itself
+  sentinel:
+    livenessProbe:
+      enabled: false
+    readinessProbe:
+      enabled: false
+    startupProbe:
+      enabled: false
+    quorum: 1
+
+  hardAntiAffinity: false
+
+  redis:
+    config:
+      min-replicas-to-write: 0
+      save: ""
+      appendonly: "no"
+
+    terminationGracePeriodSeconds: 10
+    livenessProbe:
+      initialDelaySeconds: 5
+      periodSeconds: 5
+      timeoutSeconds: 3
+      failureThreshold: 2
+    readinessProbe:
+      initialDelaySeconds: 5
+      periodSeconds: 5
+      timeoutSeconds: 3
+      failureThreshold: 2
+    startupProbe:
+      initialDelaySeconds: 5
+      periodSeconds: 2
+      timeoutSeconds: 3
+      failureThreshold: 10
+  splitBrainDetection:
+    interval: 0
+  persistentVolume:
+    enabled: false
+  emptyDir: {}
+  haproxy:
+    enabled: false
+  exporter:
+    enabled: false
+  sysctlImage:
+    enabled: false
+  hostPath:
+    chown: false
+
 initContainers:
   waitForRedis:
     enabled: true

helm/oauth2-proxy/templates/_helpers.tpl

@@ -107,7 +107,7 @@ Compute the redis url if not set explicitly.
 {{- if .Values.sessionStorage.redis.standalone.connectionUrl -}}
 {{ .Values.sessionStorage.redis.standalone.connectionUrl }}
 {{- else if .Values.redis.enabled -}}
-{{- printf "redis://%s-master:%.0f" (include "oauth2-proxy.redis.fullname" .) .Values.redis.redis.port -}}
+{{- printf "redis://%s:%.0f" (include "oauth2-proxy.redis.fullname" .) .Values.redis.redis.port -}}
 {{- else -}}
 {{ fail "please set sessionStorage.redis.standalone.connectionUrl or enable the redis subchart via redis.enabled" }}
 {{- end -}}