Remove outdated image digests

These haven't been updated since the v1.10 times and they aren't used anymore in the new Helm-based installation mode. Remove the image digests and all code infrastructure around generating them. Signed-off-by: Tobias Klauser <[email protected]>
cilium · Dec 5, 2023 · 9888ff9 · 9888ff9
1 parent cff939f
commit 9888ff9
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 366 deletions.
diff --git a/clustermesh/clustermesh.go b/clustermesh/clustermesh.go
@@ -176,8 +176,8 @@ etcdctl user grant-role remote remote;
 etcdctl auth enable;
 exit`}
 
-func (k *K8sClusterMesh) apiserverImage(imagePathMode utils.ImagePathMode) string {
-	return utils.BuildImagePath(k.params.ApiserverImage, k.params.ApiserverVersion, defaults.ClusterMeshApiserverImage, k.imageVersion, imagePathMode)
+func (k *K8sClusterMesh) apiserverImage() string {
+	return utils.BuildImagePath(k.params.ApiserverImage, k.params.ApiserverVersion, defaults.ClusterMeshApiserverImage, k.imageVersion)
 }
 
 func (k *K8sClusterMesh) etcdImage() string {
@@ -281,7 +281,7 @@ func (k *K8sClusterMesh) generateDeployment(clustermeshApiserverArgs []string) *
 								"--kvstore-opt",
 								"etcd.config=/var/lib/cilium/etcd-config.yaml",
 							),
-							Image:           k.apiserverImage(utils.ImagePathIncludeDigest),
+							Image:           k.apiserverImage(),
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							Env: []corev1.EnvVar{
 								{
@@ -624,7 +624,7 @@ func (k *K8sClusterMesh) Enable(ctx context.Context) error {
 		return err
 	}
 
-	k.Log("✨ Deploying clustermesh-apiserver from %s...", k.apiserverImage(utils.ImagePathExcludeDigest))
+	k.Log("✨ Deploying clustermesh-apiserver from %s...", k.apiserverImage())
 	if _, err := k.client.CreateServiceAccount(ctx, k.params.Namespace, k8s.NewServiceAccount(defaults.ClusterMeshServiceAccountName), metav1.CreateOptions{}); err != nil {
 		return err
 	}

diff --git a/cmd/internal/add-image-digests/main.go b/cmd/internal/add-image-digests/main.go
diff --git a/defaults/README.md b/defaults/README.md
diff --git a/defaults/imagedigests.go b/defaults/imagedigests.go
diff --git a/defaults/imagedigests.json b/defaults/imagedigests.json
diff --git a/hubble/relay_test.go b/hubble/relay_test.go
@@ -16,21 +16,18 @@ func TestK8sHubbleRelayImage(t *testing.T) {
 		ciliumVersion string
 		relayImage    string
 		relayVersion  string
-		imagePathMode utils.ImagePathMode
 		want          string
 	}{
 		{
 			ciliumVersion: "-cluster-mesh:v1.11.0-beta.1",
 			relayImage:    "",
 			relayVersion:  "",
-			imagePathMode: utils.ImagePathExcludeDigest,
 			want:          "quay.io/cilium/hubble-relay-cluster-mesh:v1.11.0-beta.1",
 		},
 		{
 			ciliumVersion: "v1.11.1",
 			relayImage:    "",
 			relayVersion:  "-cluster-mesh:v1.11.0-beta.1",
-			imagePathMode: utils.ImagePathExcludeDigest,
 			want:          "quay.io/cilium/hubble-relay-cluster-mesh:v1.11.0-beta.1",
 		},
 	}
@@ -42,13 +39,13 @@ func TestK8sHubbleRelayImage(t *testing.T) {
 					RelayVersion: tt.relayVersion,
 				},
 			}
-			if got := k.relayImage(tt.imagePathMode, tt.ciliumVersion); got != tt.want {
-				t.Errorf("k.relayImage(%d) == %q, want %q", tt.imagePathMode, got, tt.want)
+			if got := k.relayImage(tt.ciliumVersion); got != tt.want {
+				t.Errorf("k.relayImage(%s) == %q, want %q", tt.ciliumVersion, got, tt.want)
 			}
 		})
 	}
 }
 
-func (k *K8sHubble) relayImage(imagePathMode utils.ImagePathMode, ciliumVersion string) string {
-	return utils.BuildImagePath(k.params.RelayImage, k.params.RelayVersion, defaults.RelayImage, ciliumVersion, imagePathMode)
+func (k *K8sHubble) relayImage(ciliumVersion string) string {
+	return utils.BuildImagePath(k.params.RelayImage, k.params.RelayVersion, defaults.RelayImage, ciliumVersion)
 }