Revert "[redis] Use chainguard image WEB-574 (#18067)" (#18079)

This reverts commit 664e19c. Co-authored-by: Milan Pavlik <[email protected]>
gitpod-io · Jun 27, 2023 · badbe67 · badbe67
1 parent 96707ad
commit badbe67
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/install/installer/pkg/common/render.go b/install/installer/pkg/common/render.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/docker/distribution/reference"
-	"github.com/opencontainers/go-digest"
 	"helm.sh/helm/v3/pkg/cli/values"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/pointer"
@@ -124,21 +123,6 @@ func (r *RenderContext) ImageName(repo, name, tag string) string {
 	return ref
 }
 
-func (r *RenderContext) ImageDigest(repo, name string, digest digest.Digest) 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))
-	}
-
-	canonical, err := reference.WithDigest(pref, digest)
-	if err != nil {
-		panic(fmt.Sprintf("image ref %s has no canonical version: %v", ref, err))
-	}
-
-	return canonical.String()
-}
-
 // 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
@@ -4,27 +4,21 @@
 
 package redis
 
-import "github.com/opencontainers/go-digest"
-
 const (
 	Component = "redis"
 
 	PortName = "api"
 	Port     = 6379
 
-	RegistryRepo  = "cgr.dev"
-	RegistryImage = "chainguard/redis"
+	RegistryRepo  = "registry.hub.docker.com"
+	RegistryImage = "library/redis"
+	ImageTag      = "7.0.8"
 
 	ContainerName = "redis"
 
-	ExporterRegistryImage = "chainguard/prometheus-redis-exporter"
-
+	ExporterRegistryImage = "oliver006/redis_exporter"
+	ExporterImageTag      = "v1.48.0"
 	ExporterContainerName = "exporter"
 	ExporterPortName      = "exporter"
 	ExporterPort          = 9500
 )
-
-var (
-	ImageDigest         = digest.Digest("sha256:d2802dec2f97b47c7fb34eee0b4d658fd0574577271e5e426e2d949cc3d47110")
-	ExporterImageDigest = digest.Digest("sha256:30948f2fe1bee4bd13d33061f0abbbd1d045b69ec4e02b6213af8709ea7bb710")
-)
diff --git a/install/installer/pkg/components/redis/deployment.go b/install/installer/pkg/components/redis/deployment.go
@@ -57,7 +57,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 						Containers: []corev1.Container{
 							{
 								Name:            ContainerName,
-								Image:           ctx.ImageDigest(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), RegistryImage, ImageDigest),
+								Image:           ctx.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), RegistryImage, ImageTag),
 								ImagePullPolicy: corev1.PullIfNotPresent,
 								Command: []string{
 									"redis-server",
@@ -103,7 +103,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 							},
 							{
 								Name:            ExporterContainerName,
-								Image:           ctx.ImageDigest(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), ExporterRegistryImage, ExporterImageDigest),
+								Image:           ctx.ImageName(common.ThirdPartyContainerRepo(ctx.Config.Repository, RegistryRepo), ExporterRegistryImage, ExporterImageTag),
 								ImagePullPolicy: corev1.PullIfNotPresent,
 								Env: common.CustomizeEnvvar(ctx, Component, common.MergeEnv(
 									[]v1.EnvVar{