Skip to content

Commit a5847d2

Browse files
iQQBotroboquat
andauthored
switch redis-exporter docker image (#20504)
* switch redis-exporter docker image * add comments * using old version for test update * update index (#20506) Co-authored-by: iQQBot <[email protected]> --------- Co-authored-by: Robo Quat <[email protected]> Co-authored-by: iQQBot <[email protected]>
1 parent 804521f commit a5847d2

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.github/workflows/update-image-digest.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,14 @@ jobs:
6464
done < <(find "$(pwd)" -type f \( -name "*.yaml" -o -name "*.yml" -o -name "Dockerfile*" -o -name "leeway.Dockerfile" \) -print0)
6565
6666
# update for chainguard redis
67-
# redisImageDigest=$(crane digest cgr.dev/chainguard/redis:latest)
68-
# redisExporterDigest=$(crane digest cgr.dev/chainguard/prometheus-redis-exporter:latest)
69-
70-
71-
# sed -i -e "s/^\(\s*ImageDigest\s*=\s*\)\".*\"/\1\"$redisImageDigest\"/" install/installer/pkg/components/redis/constants.go
72-
# sed -i -e "s/^\(\s*ExporterImageDigest\s*=\s*\)\".*\"/\1\"$redisExporterDigest\"/" install/installer/pkg/components/redis/constants.go
73-
# go fmt install/installer/pkg/components/redis/constants.go
67+
redisImageDigest=$(crane digest cgr.dev/chainguard/redis:latest)
68+
# we switch to the quay.io image for the redis exporter, because cgr.dev/chainguard/prometheus-redis-exporter is not public anymore.
69+
# see detail in https://linear.app/gitpod/issue/CLC-1039/#comment-c90cb270
70+
redisExporterDigest=$(crane digest quay.io/oliver006/redis_exporter:latest)
71+
72+
sed -i -e "s/^\(\s*ImageDigest\s*=\s*\)\".*\"/\1\"$redisImageDigest\"/" install/installer/pkg/components/redis/constants.go
73+
sed -i -e "s/^\(\s*ExporterImageDigest\s*=\s*\)\".*\"/\1\"$redisExporterDigest\"/" install/installer/pkg/components/redis/constants.go
74+
go fmt install/installer/pkg/components/redis/constants.go
7475
- name: Check workspace
7576
id: create_pr
7677
shell: bash

install/installer/pkg/components/redis/constants.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ const (
1414
RegistryImage = "chainguard/redis"
1515

1616
ContainerName = "redis"
17-
ImageDigest = "sha256:85ac79734b47c59fe5fc9ca923c321991b792ef9cf759f7f5b7cddffb3eda6db"
17+
ImageDigest = "sha256:2ca5da94e19341085fda0c4bf610689ba1f0bea4e009cb9dad605a1c6195e5d3"
1818

19-
ExporterRegistryImage = "chainguard/prometheus-redis-exporter"
20-
ExporterImageDigest = "sha256:d3ddb25bf7bec9bb898aa4712413182e2699bef5ad7a6cf1dfcd02bc84cf8951"
19+
ExporterRegistryRepo = "quay.io"
20+
ExporterRegistryImage = "oliver006/redis_exporter"
21+
ExporterImageDigest = "sha256:120f7ec77293459ccfdad66bb1db75ab72e8bfeab99f58b1cc2564cadcd7a9e7"
2122

2223
ExporterContainerName = "exporter"
2324
ExporterPortName = "exporter"

install/installer/pkg/components/redis/deployment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
104104
},
105105
{
106106
Name: ExporterContainerName,
107-
Image: ctx.ImageDigest(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), ExporterRegistryImage, ExporterImageDigest),
107+
Image: ctx.ImageDigest(common.ThirdPartyContainerRepo(ctx.Config.Repository, ExporterRegistryRepo), ExporterRegistryImage, ExporterImageDigest),
108108
ImagePullPolicy: corev1.PullIfNotPresent,
109109
Env: common.CustomizeEnvvar(ctx, Component, common.MergeEnv(
110110
[]v1.EnvVar{

0 commit comments

Comments
 (0)