From 33547f149b24b7237bcc17a75f11bb0dcd45d283 Mon Sep 17 00:00:00 2001 From: jannfis Date: Wed, 12 Jan 2022 22:45:56 +0100 Subject: [PATCH] chore: Update to Redis 6.2.4 (#8157) (#8158) Signed-off-by: jannfis --- .github/workflows/ci-build.yaml | 2 +- Procfile | 2 +- manifests/base/redis/argocd-redis-deployment.yaml | 2 +- manifests/core-install.yaml | 2 +- manifests/ha/base/redis-ha/chart/upstream.yaml | 6 +++--- manifests/ha/base/redis-ha/chart/values.yaml | 2 +- manifests/ha/install.yaml | 6 +++--- manifests/ha/namespace-install.yaml | 6 +++--- manifests/install.yaml | 2 +- manifests/namespace-install.yaml | 2 +- test/container/Dockerfile | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 59797e391e873..c13907588af23 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -400,7 +400,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.4-alpine + docker pull redis:6.2.6-alpine - name: Create target directory for binaries in the build-process run: | mkdir -p dist diff --git a/Procfile b/Procfile index 430e3bbff0bd6..cac3e9d49a93b 100644 --- a/Procfile +++ b/Procfile @@ -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} " 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" -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" +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" 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}" ui: sh -c 'cd ui && ${ARGOCD_E2E_YARN_CMD:-yarn} start' git-server: test/fixture/testrepos/start-git.sh diff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml index 2236be257a8d1..57e3686e9b4ab 100644 --- a/manifests/base/redis/argocd-redis-deployment.yaml +++ b/manifests/base/redis/argocd-redis-deployment.yaml @@ -21,7 +21,7 @@ spec: serviceAccountName: argocd-redis containers: - name: redis - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: Always args: - "--save" diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml index 1d012c6bf1bca..8ca3a4dd06f39 100644 --- a/manifests/core-install.yaml +++ b/manifests/core-install.yaml @@ -2890,7 +2890,7 @@ spec: - "" - --appendonly - "no" - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: Always name: redis ports: diff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml index 08b386672464a..3979df3e3b03c 100644 --- a/manifests/ha/base/redis-ha/chart/upstream.yaml +++ b/manifests/ha/base/redis-ha/chart/upstream.yaml @@ -878,7 +878,7 @@ spec: automountServiceAccountToken: false initContainers: - name: config-init - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent resources: {} @@ -906,7 +906,7 @@ spec: containers: - name: redis - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent command: - redis-server @@ -947,7 +947,7 @@ spec: lifecycle: {} - name: sentinel - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent command: - redis-sentinel diff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml index bf3e60b2579df..466cd40dbe359 100644 --- a/manifests/ha/base/redis-ha/chart/values.yaml +++ b/manifests/ha/base/redis-ha/chart/values.yaml @@ -15,6 +15,6 @@ redis-ha: client: 6m checkInterval: 3s image: - tag: 6.2.4-alpine + tag: 6.2.6-alpine sentinel: bind: "0.0.0.0" diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index cedf6523d94c4..182a9a05d22ac 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -4480,7 +4480,7 @@ spec: - /data/conf/redis.conf command: - redis-server - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent lifecycle: {} livenessProbe: @@ -4518,7 +4518,7 @@ spec: - /data/conf/sentinel.conf command: - redis-sentinel - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent lifecycle: {} livenessProbe: @@ -4564,7 +4564,7 @@ spec: value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4 - name: SENTINEL_ID_2 value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent name: config-init volumeMounts: diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml index 83e7785cd4f72..e9a45352f4aae 100644 --- a/manifests/ha/namespace-install.yaml +++ b/manifests/ha/namespace-install.yaml @@ -1839,7 +1839,7 @@ spec: - /data/conf/redis.conf command: - redis-server - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent lifecycle: {} livenessProbe: @@ -1877,7 +1877,7 @@ spec: - /data/conf/sentinel.conf command: - redis-sentinel - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent lifecycle: {} livenessProbe: @@ -1923,7 +1923,7 @@ spec: value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4 - name: SENTINEL_ID_2 value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: IfNotPresent name: config-init volumeMounts: diff --git a/manifests/install.yaml b/manifests/install.yaml index e3c7fda366609..49d9573126665 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -3132,7 +3132,7 @@ spec: - "" - --appendonly - "no" - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: Always name: redis ports: diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index 7e4e33b857a07..51d684ff6e941 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -491,7 +491,7 @@ spec: - "" - --appendonly - "no" - image: redis:6.2.4-alpine + image: redis:6.2.6-alpine imagePullPolicy: Always name: redis ports: diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 6f0ca5e35f1cb..7a511b54773bc 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -1,4 +1,4 @@ -FROM redis:6.2.4 as redis +FROM redis:6.2.6-alpine as redis FROM node:12.18.4 as node