[installer] use image digest for redis image

gitpod-io · Feb 28, 2024 · 754cd2a · 754cd2a
1 parent e80714a
commit 754cd2a
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/update-image-digest.yml b/.github/workflows/update-image-digest.yml
@@ -59,6 +59,14 @@ jobs:
  fi
  done < <(find "$(pwd)" -type f \( -name "*.yaml" -o -name "*.yml" -o -name "Dockerfile*" -o -name "leeway.Dockerfile" \) -print0)
 
+ # update for chainguard redis
+ redisImageDigest=$(crane digest cgr.dev/chainguard/redis:latest)
+ redisExporterDigest=$(crane digest cgr.dev/chainguard/prometheus-redis-exporter:latest)
+
+
+ sed -i -e "s/^\(\s*ImageDigest\s*=\s*\)\".*\"/\1\"$redisImageDigest\"/" install/installer/pkg/components/redis/constants.go
+ sed -i -e "s/^\(\s*ExporterImageDigest\s*=\s*\)\".*\"/\1\"$redisExporterDigest\"/" install/installer/pkg/components/redis/constants.go
+ go fmt install/installer/pkg/components/redis/constants.go
  - name: Check workspace
  id: create_pr
  shell: bash

diff --git a/install/installer/cmd/mirror_list.go b/install/installer/cmd/mirror_list.go
@@ -11,7 +11,7 @@ import (
  "sort"
  "strings"
 
- "github.com/docker/distribution/reference"
+ "github.com/distribution/reference"
  "github.com/gitpod-io/gitpod/installer/pkg/common"
  configv1 "github.com/gitpod-io/gitpod/installer/pkg/config/v1"
  "github.com/spf13/cobra"

diff --git a/install/installer/go.mod b/install/installer/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
  github.com/Masterminds/semver v1.5.0
  github.com/cert-manager/trust-manager v0.4.0
- github.com/docker/distribution v2.8.3+incompatible
+ github.com/distribution/reference v0.5.0
  github.com/fatih/structtag v1.2.0
  github.com/gitpod-io/gitpod/agent-smith v0.0.0-00010101000000-000000000000
  github.com/gitpod-io/gitpod/blobserve v0.0.0-00010101000000-000000000000
@@ -107,8 +107,8 @@ require (
  github.com/cyphar/filepath-securejoin v0.2.3 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
- github.com/distribution/reference v0.5.0 // indirect
  github.com/docker/cli v25.0.1+incompatible // indirect
+ github.com/docker/distribution v2.8.3+incompatible // indirect
  github.com/docker/docker v23.0.3+incompatible // indirect
  github.com/docker/docker-credential-helpers v0.8.0 // indirect
  github.com/docker/go-connections v0.4.0 // indirect

diff --git a/install/installer/pkg/common/render.go b/install/installer/pkg/common/render.go
@@ -8,7 +8,7 @@ import (
  "fmt"
  "strings"
 
- "github.com/docker/distribution/reference"
+ "github.com/distribution/reference"
  "helm.sh/helm/v3/pkg/cli/values"
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/utils/pointer"
@@ -123,6 +123,18 @@ func (r *RenderContext) ImageName(repo, name, tag string) string {
  return ref
 }
 
+func (r *RenderContext) ImageDigest(repo, name, digest string) string {
+ ref := fmt.Sprintf("%s@%s", r.RepoName(repo, name), digest)
+ pref, err := reference.ParseNamed(ref)
+ if err != nil {
+ panic(fmt.Sprintf("cannot parse image ref %s: %v", ref, err))
+ }
+ if _, ok := pref.(reference.Digested); !ok {
+ panic(fmt.Sprintf("image ref %s has no digest: %v", ref, err))
+ }
+ return ref
+}
+
 // generateValues generates the random values used throughout the context
 // todo(sje): find a way of persisting these values for updates
 func (r *RenderContext) generateValues() error {

diff --git a/install/installer/pkg/components/redis/constants.go b/install/installer/pkg/components/redis/constants.go
@@ -14,10 +14,10 @@ const (
  RegistryImage = "chainguard/redis"
 
  ContainerName = "redis"
- ImageTag  = "latest"
+ ImageDigest = "sha256:cd0eb6030e86577bbf24c18e7d6ff1f84b2bce4b9f1d74f2bd0fba170e728165"
 
  ExporterRegistryImage = "chainguard/prometheus-redis-exporter"
- ExporterImageTag  = "latest"
+ ExporterImageDigest = "sha256:68eeec479c749ffb9b9a3ac8913cedc8cb067040675570d721bc1d2f39051a02"
 
  ExporterContainerName = "exporter"
  ExporterPortName = "exporter"

diff --git a/install/installer/pkg/components/redis/deployment.go b/install/installer/pkg/components/redis/deployment.go
@@ -58,7 +58,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
  Containers: []corev1.Container{
  {
  Name: ContainerName,
- Image: ctx.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), RegistryImage, ImageTag),
+ Image: ctx.ImageDigest(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), RegistryImage, ImageDigest),
  ImagePullPolicy: corev1.PullIfNotPresent,
  Command: []string{
  "redis-server",
@@ -104,7 +104,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
  },
  {
  Name: ExporterContainerName,
- Image: ctx.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), ExporterRegistryImage, ExporterImageTag),
+ Image: ctx.ImageDigest(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), ExporterRegistryImage, ExporterImageDigest),
  ImagePullPolicy: corev1.PullIfNotPresent,
  Env: common.CustomizeEnvvar(ctx, Component, common.MergeEnv(
  []v1.EnvVar{