diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index c3d588cd73647..0607b78492d44 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -489,7 +489,7 @@ jobs: run: | docker pull ghcr.io/dexidp/dex:v2.41.1 docker pull argoproj/argo-cd-ci-builder:v1.0.0 - docker pull redis:7.2.7-alpine + docker pull redis:8.2.1-alpine - name: Create target directory for binaries in the build-process run: | mkdir -p dist diff --git a/go.mod b/go.mod index 9cc37a470a478..ea618a1163a27 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/prometheus/client_golang v1.21.1 github.com/prometheus/client_model v0.6.1 github.com/r3labs/diff/v3 v3.0.1 - github.com/redis/go-redis/v9 v9.7.1 + github.com/redis/go-redis/v9 v9.8.0 github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.9.3 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 diff --git a/go.sum b/go.sum index 233ae5bbcc3f4..d3587fd01878f 100644 --- a/go.sum +++ b/go.sum @@ -717,8 +717,8 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG github.com/r3labs/diff/v3 v3.0.1 h1:CBKqf3XmNRHXKmdU7mZP1w7TV0pDyVCis1AUHtA4Xtg= github.com/r3labs/diff/v3 v3.0.1/go.mod h1:f1S9bourRbiM66NskseyUdo0fTmEE0qKrikYJX63dgo= github.com/redis/go-redis/v9 v9.0.0-rc.4/go.mod h1:Vo3EsyWnicKnSKCA7HhgnvnyA74wOA69Cd2Meli5mmA= -github.com/redis/go-redis/v9 v9.7.1 h1:4LhKRCIduqXqtvCUlaq9c8bdHOkICjDMrr1+Zb3osAc= -github.com/redis/go-redis/v9 v9.7.1/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= +github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI= +github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= diff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml index 9dd65610d7280..59396108f18fa 100644 --- a/manifests/base/redis/argocd-redis-deployment.yaml +++ b/manifests/base/redis/argocd-redis-deployment.yaml @@ -40,7 +40,7 @@ spec: serviceAccountName: argocd-redis containers: - name: redis - image: redis:7.2.7-alpine + image: redis:8.2.1-alpine imagePullPolicy: Always args: - "--save" diff --git a/manifests/core-install-with-hydrator.yaml b/manifests/core-install-with-hydrator.yaml index b5281f1f5caf5..bfa938bfbc6f5 100644 --- a/manifests/core-install-with-hydrator.yaml +++ b/manifests/core-install-with-hydrator.yaml @@ -24893,7 +24893,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: redis:7.2.7-alpine + image: redis:8.2.1-alpine imagePullPolicy: Always name: redis ports: diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml index df65a6da2bf34..d649db9fb4299 100644 --- a/manifests/core-install.yaml +++ b/manifests/core-install.yaml @@ -24705,7 +24705,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: redis:7.2.7-alpine + image: redis:8.2.1-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 ba87e074d794e..e2d8d99223dc7 100644 --- a/manifests/ha/base/redis-ha/chart/upstream.yaml +++ b/manifests/ha/base/redis-ha/chart/upstream.yaml @@ -1250,7 +1250,7 @@ spec: automountServiceAccountToken: false initContainers: - name: config-init - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent resources: {} @@ -1290,7 +1290,7 @@ spec: containers: - name: redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent command: - redis-server @@ -1364,7 +1364,7 @@ spec: - /bin/sh - /readonly-config/trigger-failover-if-master.sh - name: sentinel - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent command: - redis-sentinel @@ -1437,7 +1437,7 @@ spec: - sleep 30; redis-cli -p 26379 sentinel reset argocd - name: split-brain-fix - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent command: - sh diff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml index 22ba8c241c678..b6abd4924ce38 100644 --- a/manifests/ha/base/redis-ha/chart/values.yaml +++ b/manifests/ha/base/redis-ha/chart/values.yaml @@ -27,7 +27,7 @@ redis-ha: serviceAccount: automountToken: true image: - tag: 7.2.7-alpine + tag: 8.2.1-alpine sentinel: bind: '0.0.0.0' lifecycle: diff --git a/manifests/ha/install-with-hydrator.yaml b/manifests/ha/install-with-hydrator.yaml index c7e1a06378337..6b6c091515e27 100644 --- a/manifests/ha/install-with-hydrator.yaml +++ b/manifests/ha/install-with-hydrator.yaml @@ -27713,7 +27713,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -27784,7 +27784,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -27859,7 +27859,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent name: split-brain-fix resources: {} @@ -27894,7 +27894,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent name: config-init securityContext: diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 0e1fb5448b58a..7e403cec437d7 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -27527,7 +27527,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -27598,7 +27598,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -27673,7 +27673,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent name: split-brain-fix resources: {} @@ -27708,7 +27708,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent name: config-init securityContext: diff --git a/manifests/ha/namespace-install-with-hydrator.yaml b/manifests/ha/namespace-install-with-hydrator.yaml index cdaa05c5231cf..02038f7832e90 100644 --- a/manifests/ha/namespace-install-with-hydrator.yaml +++ b/manifests/ha/namespace-install-with-hydrator.yaml @@ -3582,7 +3582,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -3653,7 +3653,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -3728,7 +3728,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent name: split-brain-fix resources: {} @@ -3763,7 +3763,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent name: config-init securityContext: diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml index 783da34818734..baccb131d2eeb 100644 --- a/manifests/ha/namespace-install.yaml +++ b/manifests/ha/namespace-install.yaml @@ -3396,7 +3396,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -3467,7 +3467,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -3542,7 +3542,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent name: split-brain-fix resources: {} @@ -3577,7 +3577,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: public.ecr.aws/docker/library/redis:7.2.7-alpine + image: public.ecr.aws/docker/library/redis:8.2.1-alpine imagePullPolicy: IfNotPresent name: config-init securityContext: diff --git a/manifests/install-with-hydrator.yaml b/manifests/install-with-hydrator.yaml index ff0a2c2448f34..ccfb7531ad790 100644 --- a/manifests/install-with-hydrator.yaml +++ b/manifests/install-with-hydrator.yaml @@ -25574,7 +25574,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: redis:7.2.7-alpine + image: redis:8.2.1-alpine imagePullPolicy: Always name: redis ports: diff --git a/manifests/install.yaml b/manifests/install.yaml index 9bdb0c658b918..069b9ecefe80e 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -25386,7 +25386,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: redis:7.2.7-alpine + image: redis:8.2.1-alpine imagePullPolicy: Always name: redis ports: diff --git a/manifests/namespace-install-with-hydrator.yaml b/manifests/namespace-install-with-hydrator.yaml index d55af2fcaf4c6..e112e75af4807 100644 --- a/manifests/namespace-install-with-hydrator.yaml +++ b/manifests/namespace-install-with-hydrator.yaml @@ -1443,7 +1443,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: redis:7.2.7-alpine + image: redis:8.2.1-alpine imagePullPolicy: Always name: redis ports: diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index 3cf5fd692f07c..3dec2f5e912d8 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -1255,7 +1255,7 @@ spec: secretKeyRef: key: auth name: argocd-redis - image: redis:7.2.7-alpine + image: redis:8.2.1-alpine imagePullPolicy: Always name: redis ports: diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 1ca2d21e52183..21e8936428622 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/redis:7.4.2@sha256:ca65ea36ae16e709b0f1c7534bc7e5b5ac2e5bb3c97236e4fec00e3625eb678d AS redis +FROM docker.io/library/redis:8.2.1@sha256:cc2dfb8f5151da2684b4a09bd04b567f92d07591d91980eb3eca21df07e12760 AS redis # There are libraries we will want to copy from here in the final stage of the # build, but the COPY directive does not have a way to determine system