Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade shipped version of Redis to 7.0.5 to fix CVE-2022-35951 #10702

Merged
merged 5 commits into from
Oct 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ jobs:
run: |
docker pull ghcr.io/dexidp/dex:v2.32.1-distroless
docker pull argoproj/argo-cd-ci-builder:v1.0.0
docker pull redis:7.0.4-alpine
docker pull redis:7.0.5-alpine
- name: Create target directory for binaries in the build-process
run: |
mkdir -p dist
Expand Down
2 changes: 1 addition & 1 deletion manifests/base/redis/argocd-redis-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: argocd-redis
containers:
- name: redis
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: Always
args:
- "--save"
Expand Down
2 changes: 1 addition & 1 deletion manifests/core-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9714,7 +9714,7 @@ spec:
- ""
- --appendonly
- "no"
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: Always
name: redis
ports:
Expand Down
8 changes: 4 additions & 4 deletions manifests/ha/base/redis-ha/chart/upstream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ spec:
automountServiceAccountToken: false
initContainers:
- name: config-init
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
resources:
{}
Expand All @@ -1205,7 +1205,7 @@ spec:

containers:
- name: redis
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
command:
- redis-server
Expand Down Expand Up @@ -1253,7 +1253,7 @@ spec:
- /bin/sh
- /readonly-config/trigger-failover-if-master.sh
- name: sentinel
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
command:
- redis-sentinel
Expand Down Expand Up @@ -1295,7 +1295,7 @@ spec:
{}

- name: split-brain-fix
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
command:
- sh
Expand Down
2 changes: 1 addition & 1 deletion manifests/ha/base/redis-ha/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ redis-ha:
client: 6m
checkInterval: 3s
image:
tag: 7.0.4-alpine
tag: 7.0.5-alpine
sentinel:
bind: "0.0.0.0"
8 changes: 4 additions & 4 deletions manifests/ha/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11977,7 +11977,7 @@ spec:
- /data/conf/redis.conf
command:
- redis-server
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -12030,7 +12030,7 @@ spec:
- /data/conf/sentinel.conf
command:
- redis-sentinel
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
lifecycle: {}
livenessProbe:
Expand Down Expand Up @@ -12082,7 +12082,7 @@ spec:
value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4
- name: SENTINEL_ID_2
value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
name: split-brain-fix
resources: {}
Expand All @@ -12104,7 +12104,7 @@ spec:
value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4
- name: SENTINEL_ID_2
value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
name: config-init
securityContext:
Expand Down
8 changes: 4 additions & 4 deletions manifests/ha/namespace-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2646,7 +2646,7 @@ spec:
- /data/conf/redis.conf
command:
- redis-server
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -2699,7 +2699,7 @@ spec:
- /data/conf/sentinel.conf
command:
- redis-sentinel
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
lifecycle: {}
livenessProbe:
Expand Down Expand Up @@ -2751,7 +2751,7 @@ spec:
value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4
- name: SENTINEL_ID_2
value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
name: split-brain-fix
resources: {}
Expand All @@ -2773,7 +2773,7 @@ spec:
value: 40000915ab58c3fa8fd888fb8b24711944e6cbb4
- name: SENTINEL_ID_2
value: 2bbec7894d954a8af3bb54d13eaec53cb024e2ca
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: IfNotPresent
name: config-init
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion manifests/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10192,7 +10192,7 @@ spec:
- ""
- --appendonly
- "no"
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: Always
name: redis
ports:
Expand Down
2 changes: 1 addition & 1 deletion manifests/namespace-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ spec:
- ""
- --appendonly
- "no"
image: redis:7.0.4-alpine
image: redis:7.0.5-alpine
imagePullPolicy: Always
name: redis
ports:
Expand Down
2 changes: 1 addition & 1 deletion test/container/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/redis:7.0.4 as redis
FROM docker.io/library/redis:7.0.5 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
Expand Down