marcel/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd.git synced 2026-02-20 01:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Update redis to 6.2.4 (#6475)

Browse Source 
Signed-off-by: jannfis <jann@mistrust.net>
This commit is contained in:
jannfis
2021-06-15 03:44:39 +02:00
committed by GitHub
parent c62012d526
commit a647ca960a
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-build.yaml vendored
View File

@@ -396,7 +396,7 @@ jobs:
run: |
docker pull quay.io/dexidp/dex:v2.25.0
docker pull argoproj/argo-cd-ci-builder:v1.0.0
docker pull redis:6.2.1-alpine
docker pull redis:6.2.4-alpine
- name: Create target directory for binaries in the build-process
run: |
mkdir -p dist

2
Procfile
View File

@@ -1,7 +1,7 @@
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}"
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} --staticassets ui/dist/app"
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.27.0 serve /dex.yaml"
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.1-alpine --save '' --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}; fi"
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"
repo-server: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_GNUPGHOME=${ARGOCD_GNUPGHOME:-/tmp/argocd-local/gpg/keys} 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 go run ./cmd/main.go --loglevel debug --port ${ARGOCD_E2E_REPOSERVER_PORT:-8081} --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379}"
ui: sh -c 'cd ui && ${ARGOCD_E2E_YARN_CMD:-yarn} start'
git-server: test/fixture/testrepos/start-git.sh

2
manifests/base/redis/argocd-redis-deployment.yaml
View File

@@ -21,7 +21,7 @@ spec:
serviceAccountName: argocd-redis
containers:
- name: redis
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: Always
args:
- "--save"

6
manifests/ha/base/redis-ha/chart/upstream.yaml
View File

@@ -878,7 +878,7 @@ spec:
automountServiceAccountToken: false
initContainers:
- name: config-init
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
resources:
{}
@@ -906,7 +906,7 @@ spec:
containers:
- name: redis
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
command:
- redis-server
@@ -947,7 +947,7 @@ spec:
lifecycle:
{}
- name: sentinel
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
command:
- redis-sentinel

2
manifests/ha/base/redis-ha/chart/values.yaml
View File

@@ -15,6 +15,6 @@ redis-ha:
client: 6m
checkInterval: 3s
image:
tag: 6.2.1-alpine
tag: 6.2.4-alpine
sentinel:
bind: "0.0.0.0"

6
manifests/ha/install.yaml
View File

@@ -4413,7 +4413,7 @@ spec:
- /data/conf/redis.conf
command:
- redis-server
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
lifecycle: {}
livenessProbe:
@@ -4451,7 +4451,7 @@ spec:
- /data/conf/sentinel.conf
command:
- redis-sentinel
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
lifecycle: {}
livenessProbe:
@@ -4497,7 +4497,7 @@ spec:
value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4
- name: SENTINEL_ID_2
value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
name: config-init
volumeMounts:

6
manifests/ha/namespace-install.yaml
View File

@@ -1800,7 +1800,7 @@ spec:
- /data/conf/redis.conf
command:
- redis-server
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
lifecycle: {}
livenessProbe:
@@ -1838,7 +1838,7 @@ spec:
- /data/conf/sentinel.conf
command:
- redis-sentinel
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
lifecycle: {}
livenessProbe:
@@ -1884,7 +1884,7 @@ spec:
value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4
- name: SENTINEL_ID_2
value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: IfNotPresent
name: config-init
volumeMounts:

2
manifests/install.yaml
View File

@@ -3102,7 +3102,7 @@ spec:
- ""
- --appendonly
- "no"
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: Always
name: redis
ports:

2
manifests/namespace-install.yaml
View File

@@ -489,7 +489,7 @@ spec:
- ""
- --appendonly
- "no"
image: redis:6.2.1-alpine
image: redis:6.2.4-alpine
imagePullPolicy: Always
name: redis
ports:

2
test/container/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM redis:6.2.1 as redis
FROM redis:6.2.4 as redis
FROM node:12.18.4 as node