Skip to content

Commit 73c87d6

Browse files
feat: add separate redis for cf-argocd-extras and app-proxy
1 parent b844d35 commit 73c87d6

File tree

4 files changed

+37
-15
lines changed

4 files changed

+37
-15
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,29 +63,29 @@ LISTEN_ADDRESS:
6363
REDISDB:
6464
valueFrom:
6565
configMapKeyRef:
66-
name: argocd-cmd-params-cm
66+
name: argo-gateway-cmd-params-cm
6767
key: redis.db
6868
optional: true
6969
REDIS_COMPRESSION:
7070
valueFrom:
7171
configMapKeyRef:
72-
name: argocd-cmd-params-cm
72+
name: argo-gateway-cmd-params-cm
7373
key: redis.compression
7474
optional: true
7575
REDIS_PASSWORD:
7676
valueFrom:
7777
secretKeyRef:
78-
name: argocd-redis
78+
name: gitops-runtime-redis
7979
key: auth
8080
REDIS_SERVER:
8181
valueFrom:
8282
configMapKeyRef:
83-
name: argocd-cmd-params-cm
83+
name: argo-gateway-cmd-params-cm
8484
key: redis.server
8585
REDIS_USERNAME:
8686
valueFrom:
8787
secretKeyRef:
88-
name: argocd-redis
88+
name: argo-gateway-cmd-params-cm
8989
key: redis-username
9090
optional: true
9191
REPO_SERVER:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,29 +111,29 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
111111
REDISDB:
112112
valueFrom:
113113
configMapKeyRef:
114-
name: argocd-cmd-params-cm
114+
name: cluster-event-reporter-cmd-params-cm
115115
key: redis.db
116116
optional: true
117117
REDIS_COMPRESSION:
118118
valueFrom:
119119
configMapKeyRef:
120-
name: argocd-cmd-params-cm
120+
name: cluster-event-reporter-cmd-params-cm
121121
key: redis.compression
122122
optional: true
123123
REDIS_PASSWORD:
124124
valueFrom:
125125
secretKeyRef:
126-
name: argocd-redis
126+
name: gitops-runtime-redis
127127
key: auth
128128
REDIS_SERVER:
129129
valueFrom:
130130
configMapKeyRef:
131-
name: argocd-cmd-params-cm
131+
name: cluster-event-reporter-cmd-params-cm
132132
key: redis.server
133133
REDIS_USERNAME:
134134
valueFrom:
135135
secretKeyRef:
136-
name: argocd-redis
136+
name: cluster-event-reporter-cmd-params-cm
137137
key: redis-username
138138
optional: true
139139
REPO_SERVER:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,29 +111,29 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
111111
REDISDB:
112112
valueFrom:
113113
configMapKeyRef:
114-
name: argocd-cmd-params-cm
114+
name: runtime-event-reporter-cmd-params-cm
115115
key: redis.db
116116
optional: true
117117
REDIS_COMPRESSION:
118118
valueFrom:
119119
configMapKeyRef:
120-
name: argocd-cmd-params-cm
120+
name: runtime-event-reporter-cmd-params-cm
121121
key: redis.compression
122122
optional: true
123123
REDIS_PASSWORD:
124124
valueFrom:
125125
secretKeyRef:
126-
name: argocd-redis
126+
name: gitops-runtime-redis
127127
key: auth
128128
REDIS_SERVER:
129129
valueFrom:
130130
configMapKeyRef:
131-
name: argocd-cmd-params-cm
131+
name: runtime-event-reporter-cmd-params-cm
132132
key: redis.server
133133
REDIS_USERNAME:
134134
valueFrom:
135135
secretKeyRef:
136-
name: argocd-redis
136+
name: runtime-event-reporter-cmd-params-cm
137137
key: redis-username
138138
optional: true
139139
REPO_SERVER:

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,3 +167,25 @@ tests:
167167
value:
168168
cpu: 200m
169169
memory: 256Mi
170+
171+
- it: Runtime Reporter should have correct REDIS_ environment variables
172+
template: event-reporters/runtime-event-reporter/deployment.yaml
173+
values:
174+
- ./values/mandatory-values-ingress.yaml
175+
asserts:
176+
- contains:
177+
path: spec.template.spec.containers[0].env
178+
content:
179+
name: REDIS_SERVER
180+
valueFrom:
181+
configMapKeyRef:
182+
name: runtime-event-reporter-cmd-params-cm
183+
key: redis.server
184+
- contains:
185+
path: spec.template.spec.containers[0].env
186+
content:
187+
name: REDIS_PASSWORD
188+
valueFrom:
189+
secretKeyRef:
190+
name: gitops-runtime-redis
191+
key: auth

0 commit comments

Comments
 (0)