Skip to content

Commit 49d1906

Browse files
mikhail-klimkomikhail-klimko
committed
feat: disable runtime redis by default
1 parent 4c0eb29 commit 49d1906

File tree

12 files changed

+185
-97
lines changed

12 files changed

+185
-97
lines changed

‎charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,20 @@ LEADER_ID:
219219
valueFrom:
220220
fieldRef:
221221
fieldPath: metadata.name
222-
{{- end }}
222+
{{- if or .Values.redis.enabled (index .Values "redis-ha" "enabled") }}
223223
CACHE_HOST: {{ (splitList ":" (include "codefresh-gitops-runtime.argocd.redis.url" .) | first) }}
224224
CACHE_PORT: {{ (splitList ":" (include "codefresh-gitops-runtime.argocd.redis.url" .) | last) }}
225225
CACHE_PASSWORD:
226226
valueFrom:
227227
secretKeyRef:
228228
name: gitops-runtime-redis
229229
key: auth
230+
{{- else }}
231+
{{- fail ".Values.redis.enabled or .Values.redis-ha.enabled must be true when .Values.app-proxy.replicaCount > 1" }}
232+
{{- end }}
233+
{{- end }}
234+
235+
230236
CF_SERVICE_NAME: {{ $appProxyName }}
231237
CF_SERVICE_VERSION: {{ $appProxyVersion }}
232238
OTEL_SERVICE_NAME: {{ $appProxyName }}

‎charts/gitops-runtime/templates/_helpers.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ Determine argocd redis url
289289
{{- $port := .Values.redis.service.ports.redis.port }}
290290
{{- printf "%s:%v" $serviceName $port }}
291291
{{- else }}
292-
{{- fail "ERROR: .Values.redis or .Values.redis-ha must be enabled!" }}
292+
{{- printf "" }}
293293
{{- end }}
294294
{{- end}}
295295

‎charts/gitops-runtime/templates/argo-gateway/_env.yaml‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,37 @@ ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "
2020
CODEFRESH_SSL_CERT_PATH: {{ printf "/app/config/codefresh-tls-certs/%s" $secretKey }}
2121
{{- end }}
2222

23+
{{- if or .Values.redis.enabled (index .Values "redis-ha" "enabled") }}
24+
REDISDB:
25+
valueFrom:
26+
configMapKeyRef:
27+
name: argo-gateway-cmd-params-cm
28+
key: redis.db
29+
optional: true
30+
REDIS_COMPRESSION:
31+
valueFrom:
32+
configMapKeyRef:
33+
name: argo-gateway-cmd-params-cm
34+
key: redis.compression
35+
optional: true
36+
REDIS_PASSWORD:
37+
valueFrom:
38+
secretKeyRef:
39+
name: gitops-runtime-redis
40+
key: auth
41+
REDIS_SERVER:
42+
valueFrom:
43+
configMapKeyRef:
44+
name: argo-gateway-cmd-params-cm
45+
key: redis.server
46+
REDIS_USERNAME:
47+
valueFrom:
48+
secretKeyRef:
49+
name: argo-gateway-cmd-params-cm
50+
key: redis-username
51+
optional: true
52+
{{- end }}
53+
2354
{{- end }}
2455

2556
{{- define "argo-gateway.resources.environment-variables.defaults" -}}
@@ -60,34 +91,6 @@ LISTEN_ADDRESS:
6091
name: argo-gateway-cmd-params-cm
6192
key: server.listen.address
6293
optional: true
63-
REDISDB:
64-
valueFrom:
65-
configMapKeyRef:
66-
name: argo-gateway-cmd-params-cm
67-
key: redis.db
68-
optional: true
69-
REDIS_COMPRESSION:
70-
valueFrom:
71-
configMapKeyRef:
72-
name: argo-gateway-cmd-params-cm
73-
key: redis.compression
74-
optional: true
75-
REDIS_PASSWORD:
76-
valueFrom:
77-
secretKeyRef:
78-
name: gitops-runtime-redis
79-
key: auth
80-
REDIS_SERVER:
81-
valueFrom:
82-
configMapKeyRef:
83-
name: argo-gateway-cmd-params-cm
84-
key: redis.server
85-
REDIS_USERNAME:
86-
valueFrom:
87-
secretKeyRef:
88-
name: argo-gateway-cmd-params-cm
89-
key: redis-username
90-
optional: true
9194
REPO_SERVER:
9295
valueFrom:
9396
configMapKeyRef:

‎charts/gitops-runtime/templates/argo-gateway/deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{{- $context := deepCopy . }}
22
{{- $_ := set $context "Values" (deepCopy (get .Values "argo-gateway")) }}
3+
{{- $_ := set $context.Values "redis" (deepCopy (get .Values "redis")) }}
4+
{{- $_ := set $context.Values "redis-ha" (deepCopy (get .Values "redis-ha")) }}
35
{{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
46
{{/* Merge environment variables from calculated, defaults and overwrites */}}
57
{{- $defaults := (include "argo-gateway.resources.environment-variables.defaults" $context | fromYaml) }}

‎charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_env.yaml‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,37 @@ ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "
2020
CODEFRESH_SSL_CERT_PATH: {{ printf "/app/config/codefresh-tls-certs/%s" $secretKey }}
2121
{{- end }}
2222

23+
{{- if or .Values.redis.enabled (index .Values "redis-ha" "enabled") }}
24+
REDISDB:
25+
valueFrom:
26+
configMapKeyRef:
27+
name: cluster-event-reporter-cmd-params-cm
28+
key: redis.db
29+
optional: true
30+
REDIS_COMPRESSION:
31+
valueFrom:
32+
configMapKeyRef:
33+
name: cluster-event-reporter-cmd-params-cm
34+
key: redis.compression
35+
optional: true
36+
REDIS_PASSWORD:
37+
valueFrom:
38+
secretKeyRef:
39+
name: gitops-runtime-redis
40+
key: auth
41+
REDIS_SERVER:
42+
valueFrom:
43+
configMapKeyRef:
44+
name: cluster-event-reporter-cmd-params-cm
45+
key: redis.server
46+
REDIS_USERNAME:
47+
valueFrom:
48+
secretKeyRef:
49+
name: cluster-event-reporter-cmd-params-cm
50+
key: redis-username
51+
optional: true
52+
{{- end }}
53+
2354
{{- end }}
2455

2556
{{- define "cluster-event-reporter.resources.environment-variables.defaults" -}}
@@ -114,34 +145,6 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
114145
name: cluster-event-reporter-cmd-params-cm
115146
key: otlp.address
116147
optional: true
117-
REDISDB:
118-
valueFrom:
119-
configMapKeyRef:
120-
name: cluster-event-reporter-cmd-params-cm
121-
key: redis.db
122-
optional: true
123-
REDIS_COMPRESSION:
124-
valueFrom:
125-
configMapKeyRef:
126-
name: cluster-event-reporter-cmd-params-cm
127-
key: redis.compression
128-
optional: true
129-
REDIS_PASSWORD:
130-
valueFrom:
131-
secretKeyRef:
132-
name: gitops-runtime-redis
133-
key: auth
134-
REDIS_SERVER:
135-
valueFrom:
136-
configMapKeyRef:
137-
name: cluster-event-reporter-cmd-params-cm
138-
key: redis.server
139-
REDIS_USERNAME:
140-
valueFrom:
141-
secretKeyRef:
142-
name: cluster-event-reporter-cmd-params-cm
143-
key: redis-username
144-
optional: true
145148
REPO_SERVER:
146149
valueFrom:
147150
configMapKeyRef:

‎charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{{- $context := deepCopy . }}
22
{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
3+
{{- $_ := set $context.Values "redis" (deepCopy (get .Values "redis")) }}
4+
{{- $_ := set $context.Values "redis-ha" (deepCopy (get .Values "redis-ha")) }}
35
{{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
46
{{/* Merge .Values.event-reporters.<event-reporter-name> with .Values.global.event-reporters */}}
57
{{- $valuesOverrides := index .Values "event-reporters" "cluster-event-reporter" }}

‎charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_env.yaml‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,37 @@ ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "
2020
CODEFRESH_SSL_CERT_PATH: {{ printf "/app/config/codefresh-tls-certs/%s" $secretKey }}
2121
{{- end }}
2222

23+
{{- if or .Values.redis.enabled (index .Values "redis-ha" "enabled") }}
24+
REDISDB:
25+
valueFrom:
26+
configMapKeyRef:
27+
name: runtime-event-reporter-cmd-params-cm
28+
key: redis.db
29+
optional: true
30+
REDIS_COMPRESSION:
31+
valueFrom:
32+
configMapKeyRef:
33+
name: runtime-event-reporter-cmd-params-cm
34+
key: redis.compression
35+
optional: true
36+
REDIS_PASSWORD:
37+
valueFrom:
38+
secretKeyRef:
39+
name: gitops-runtime-redis
40+
key: auth
41+
REDIS_SERVER:
42+
valueFrom:
43+
configMapKeyRef:
44+
name: runtime-event-reporter-cmd-params-cm
45+
key: redis.server
46+
REDIS_USERNAME:
47+
valueFrom:
48+
secretKeyRef:
49+
name: runtime-event-reporter-cmd-params-cm
50+
key: redis-username
51+
optional: true
52+
{{- end }}
53+
2354
{{- end }}
2455

2556
{{- define "runtime-event-reporter.resources.environment-variables.defaults" -}}
@@ -114,34 +145,6 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
114145
name: runtime-event-reporter-cmd-params-cm
115146
key: otlp.address
116147
optional: true
117-
REDISDB:
118-
valueFrom:
119-
configMapKeyRef:
120-
name: runtime-event-reporter-cmd-params-cm
121-
key: redis.db
122-
optional: true
123-
REDIS_COMPRESSION:
124-
valueFrom:
125-
configMapKeyRef:
126-
name: runtime-event-reporter-cmd-params-cm
127-
key: redis.compression
128-
optional: true
129-
REDIS_PASSWORD:
130-
valueFrom:
131-
secretKeyRef:
132-
name: gitops-runtime-redis
133-
key: auth
134-
REDIS_SERVER:
135-
valueFrom:
136-
configMapKeyRef:
137-
name: runtime-event-reporter-cmd-params-cm
138-
key: redis.server
139-
REDIS_USERNAME:
140-
valueFrom:
141-
secretKeyRef:
142-
name: runtime-event-reporter-cmd-params-cm
143-
key: redis-username
144-
optional: true
145148
REPO_SERVER:
146149
valueFrom:
147150
configMapKeyRef:

‎charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{{- $context := deepCopy . }}
22
{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
3+
{{- $_ := set $context.Values "redis" (deepCopy (get .Values "redis")) }}
4+
{{- $_ := set $context.Values "redis-ha" (deepCopy (get .Values "redis-ha")) }}
35
{{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
46
{{/* Merge .Values.event-reporters.<event-reporter-name> with .Values.global.event-reporters */}}
57
{{- $valuesOverrides := index .Values "event-reporters" "runtime-event-reporter" }}

‎charts/gitops-runtime/tests/argo-api-gateway_test.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,23 @@ tests:
1313
value: argo-cd-server:80
1414
- equal:
1515
path: data["redis.server"]
16-
value: runtime-redis:6379
16+
value: null
1717
- equal:
1818
path: data["repo.server"]
1919
value: argo-cd-repo-server:8081
2020

21+
- it: Argo Api Gateway ConfigMap should have valid redis url
22+
set:
23+
redis:
24+
enabled: true
25+
template: argo-gateway/configmap.yaml
26+
values:
27+
- ./values/mandatory-values-ingress.yaml
28+
asserts:
29+
- equal:
30+
path: data["redis.server"]
31+
value: runtime-redis:6379
32+
2133
- it: Argo Api Gateway Deployment should have valid matchLabel selectors
2234
template: argo-gateway/deployment.yaml
2335
values:

‎charts/gitops-runtime/tests/event-reporters_test.yaml‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,24 @@ tests:
4040
value: argo-cd-server:80
4141
- equal:
4242
path: data["redis.server"]
43-
value: runtime-redis:6379
43+
value: null
4444
- equal:
4545
path: data["repo.server"]
4646
value: argo-cd-repo-server:8081
4747

48+
49+
- it: Runtime Reporter ConfigMap should have valid redis url
50+
template: event-reporters/runtime-event-reporter/configmap.yaml
51+
values:
52+
- ./values/mandatory-values-ingress.yaml
53+
set:
54+
redis:
55+
enabled: true
56+
asserts:
57+
- equal:
58+
path: data["redis.server"]
59+
value: runtime-redis:6379
60+
4861
- it: Runtime Reporter ConfigMap should have valid redis-ha url
4962
template: event-reporters/runtime-event-reporter/configmap.yaml
5063
values:
@@ -168,10 +181,13 @@ tests:
168181
cpu: 200m
169182
memory: 256Mi
170183

171-
- it: Runtime Reporter should have correct REDIS_ environment variables
184+
- it: Runtime Reporter should have REDIS_ environment variables when redis is enabled
172185
template: event-reporters/runtime-event-reporter/deployment.yaml
173186
values:
174187
- ./values/mandatory-values-ingress.yaml
188+
set:
189+
redis:
190+
enabled: true
175191
asserts:
176192
- contains:
177193
path: spec.template.spec.containers[0].env
@@ -189,3 +205,17 @@ tests:
189205
secretKeyRef:
190206
name: gitops-runtime-redis
191207
key: auth
208+
209+
- it: Runtime Reporter should NOT have REDIS_ environment variables by default
210+
template: event-reporters/runtime-event-reporter/deployment.yaml
211+
values:
212+
- ./values/mandatory-values-ingress.yaml
213+
asserts:
214+
- notContains:
215+
path: spec.template.spec.containers[0].env
216+
content:
217+
name: REDIS_SERVER
218+
- notContains:
219+
path: spec.template.spec.containers[0].env
220+
content:
221+
name: REDIS_PASSWORD

0 commit comments

Comments
 (0)