Skip to content

Commit 33547f1

Browse files
authored
chore: Update to Redis 6.2.4 (#8157) (#8158)
Signed-off-by: jannfis <[email protected]>
1 parent 06dc9aa commit 33547f1

File tree

11 files changed

+17
-17
lines changed

11 files changed

+17
-17
lines changed

.github/workflows/ci-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ jobs:
400400
run: |
401401
docker pull quay.io/dexidp/dex:v2.25.0
402402
docker pull argoproj/argo-cd-ci-builder:v1.0.0
403-
docker pull redis:6.2.4-alpine
403+
docker pull redis:6.2.6-alpine
404404
- name: Create target directory for binaries in the build-process
405405
run: |
406406
mkdir -p dist

Procfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
controller: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-application-controller go run ./cmd/main.go --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081}"
22
api-server: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-server go run ./cmd/main.go --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --disable-auth=${ARGOCD_E2E_DISABLE_AUTH:-'true'} --insecure --dex-server http://localhost:${ARGOCD_E2E_DEX_PORT:-5556} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081} --port ${ARGOCD_E2E_APISERVER_PORT:-8080} "
33
dex: sh -c "ARGOCD_BINARY_NAME=argocd-dex go run github.com/argoproj/argo-cd/v2/cmd gendexcfg -o `pwd`/dist/dex.yaml && docker run --rm -p ${ARGOCD_E2E_DEX_PORT:-5556}:${ARGOCD_E2E_DEX_PORT:-5556} -v `pwd`/dist/dex.yaml:/dex.yaml ghcr.io/dexidp/dex:v2.30.0 serve /dex.yaml"
4-
redis: bash -c "if [ \"$ARGOCD_REDIS_LOCAL\" == 'true' ]; then redis-server --save '' --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}; else docker run --rm --name argocd-redis -i -p ${ARGOCD_E2E_REDIS_PORT:-6379}:${ARGOCD_E2E_REDIS_PORT:-6379} redis:6.2.4-alpine --save '' --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}; fi"
4+
redis: bash -c "if [ \"$ARGOCD_REDIS_LOCAL\" == 'true' ]; then redis-server --save '' --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}; else docker run --rm --name argocd-redis -i -p ${ARGOCD_E2E_REDIS_PORT:-6379}:${ARGOCD_E2E_REDIS_PORT:-6379} redis:6.2.6-alpine --save '' --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}; fi"
55
repo-server: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_GNUPGHOME=${ARGOCD_GNUPGHOME:-/tmp/argocd-local/gpg/keys} ARGOCD_PLUGINSOCKFILEPATH=${ARGOCD_PLUGINSOCKFILEPATH:-/tmp/argo-e2e/app/config/plugin} ARGOCD_GPG_DATA_PATH=${ARGOCD_GPG_DATA_PATH:-/tmp/argocd-local/gpg/source} ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-repo-server ARGOCD_GPG_ENABLED=${ARGOCD_GPG_ENABLED:-false} go run ./cmd/main.go --loglevel debug --port ${ARGOCD_E2E_REPOSERVER_PORT:-8081} --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379}"
66
ui: sh -c 'cd ui && ${ARGOCD_E2E_YARN_CMD:-yarn} start'
77
git-server: test/fixture/testrepos/start-git.sh

manifests/base/redis/argocd-redis-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
serviceAccountName: argocd-redis
2222
containers:
2323
- name: redis
24-
image: redis:6.2.4-alpine
24+
image: redis:6.2.6-alpine
2525
imagePullPolicy: Always
2626
args:
2727
- "--save"

manifests/core-install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2890,7 +2890,7 @@ spec:
28902890
- ""
28912891
- --appendonly
28922892
- "no"
2893-
image: redis:6.2.4-alpine
2893+
image: redis:6.2.6-alpine
28942894
imagePullPolicy: Always
28952895
name: redis
28962896
ports:

manifests/ha/base/redis-ha/chart/upstream.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ spec:
878878
automountServiceAccountToken: false
879879
initContainers:
880880
- name: config-init
881-
image: redis:6.2.4-alpine
881+
image: redis:6.2.6-alpine
882882
imagePullPolicy: IfNotPresent
883883
resources:
884884
{}
@@ -906,7 +906,7 @@ spec:
906906

907907
containers:
908908
- name: redis
909-
image: redis:6.2.4-alpine
909+
image: redis:6.2.6-alpine
910910
imagePullPolicy: IfNotPresent
911911
command:
912912
- redis-server
@@ -947,7 +947,7 @@ spec:
947947
lifecycle:
948948
{}
949949
- name: sentinel
950-
image: redis:6.2.4-alpine
950+
image: redis:6.2.6-alpine
951951
imagePullPolicy: IfNotPresent
952952
command:
953953
- redis-sentinel

manifests/ha/base/redis-ha/chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ redis-ha:
1515
client: 6m
1616
checkInterval: 3s
1717
image:
18-
tag: 6.2.4-alpine
18+
tag: 6.2.6-alpine
1919
sentinel:
2020
bind: "0.0.0.0"

manifests/ha/install.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4480,7 +4480,7 @@ spec:
44804480
- /data/conf/redis.conf
44814481
command:
44824482
- redis-server
4483-
image: redis:6.2.4-alpine
4483+
image: redis:6.2.6-alpine
44844484
imagePullPolicy: IfNotPresent
44854485
lifecycle: {}
44864486
livenessProbe:
@@ -4518,7 +4518,7 @@ spec:
45184518
- /data/conf/sentinel.conf
45194519
command:
45204520
- redis-sentinel
4521-
image: redis:6.2.4-alpine
4521+
image: redis:6.2.6-alpine
45224522
imagePullPolicy: IfNotPresent
45234523
lifecycle: {}
45244524
livenessProbe:
@@ -4564,7 +4564,7 @@ spec:
45644564
value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4
45654565
- name: SENTINEL_ID_2
45664566
value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca
4567-
image: redis:6.2.4-alpine
4567+
image: redis:6.2.6-alpine
45684568
imagePullPolicy: IfNotPresent
45694569
name: config-init
45704570
volumeMounts:

manifests/ha/namespace-install.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,7 +1839,7 @@ spec:
18391839
- /data/conf/redis.conf
18401840
command:
18411841
- redis-server
1842-
image: redis:6.2.4-alpine
1842+
image: redis:6.2.6-alpine
18431843
imagePullPolicy: IfNotPresent
18441844
lifecycle: {}
18451845
livenessProbe:
@@ -1877,7 +1877,7 @@ spec:
18771877
- /data/conf/sentinel.conf
18781878
command:
18791879
- redis-sentinel
1880-
image: redis:6.2.4-alpine
1880+
image: redis:6.2.6-alpine
18811881
imagePullPolicy: IfNotPresent
18821882
lifecycle: {}
18831883
livenessProbe:
@@ -1923,7 +1923,7 @@ spec:
19231923
value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4
19241924
- name: SENTINEL_ID_2
19251925
value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca
1926-
image: redis:6.2.4-alpine
1926+
image: redis:6.2.6-alpine
19271927
imagePullPolicy: IfNotPresent
19281928
name: config-init
19291929
volumeMounts:

manifests/install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3132,7 +3132,7 @@ spec:
31323132
- ""
31333133
- --appendonly
31343134
- "no"
3135-
image: redis:6.2.4-alpine
3135+
image: redis:6.2.6-alpine
31363136
imagePullPolicy: Always
31373137
name: redis
31383138
ports:

manifests/namespace-install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ spec:
491491
- ""
492492
- --appendonly
493493
- "no"
494-
image: redis:6.2.4-alpine
494+
image: redis:6.2.6-alpine
495495
imagePullPolicy: Always
496496
name: redis
497497
ports:

0 commit comments

Comments
 (0)