Use original pause image but proxy it (#911)

* Use original pause image but proxy it
replicatedhq · Aug 1, 2024 · 52b8846 · 52b8846
1 parent ce25152
commit 52b8846
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 32 deletions.
diff --git a/cmd/buildtools/k0s.go b/cmd/buildtools/k0s.go
@@ -21,7 +21,6 @@ var k0sImageComponents = map[string]string{
 	"registry.k8s.io/metrics-server/metrics-server": "metrics-server",
 	"quay.io/k0sproject/kube-proxy":                 "kube-proxy",
 	"quay.io/k0sproject/envoy-distroless":           "envoy-distroless",
-	"registry.k8s.io/pause":                         "pause",
 }
 
 var k0sComponents = map[string]addonComponent{
@@ -60,14 +59,6 @@ var k0sComponents = map[string]addonComponent{
 			return fmt.Sprintf("envoy-%d.%d", opts.upstreamVersion.Major(), opts.upstreamVersion.Minor())
 		},
 	},
-	"pause": {
-		getWolfiPackageName: func(opts addonComponentOptions) string {
-			return fmt.Sprintf("kubernetes-pause-%d.%d", opts.upstreamVersion.Major(), opts.upstreamVersion.Minor())
-		},
-		getWolfiPackageVersionComparison: func(opts addonComponentOptions) string {
-			return latestPatchComparison(opts.k0sVersion) // pause package version follows the k8s version
-		},
-	},
 }
 
 var updateK0sImagesCommand = &cli.Command{

diff --git a/deploy/images/pause/apko.tmpl.yaml b/deploy/images/pause/apko.tmpl.yaml
diff --git a/pkg/config/images.go b/pkg/config/images.go
@@ -71,8 +71,7 @@ func overrideK0sImages(cfg *k0sv1beta1.ClusterConfig) {
 	cfg.Spec.Images.KubeProxy.Image = helpers.AddonImageFromComponentName("kube-proxy")
 	cfg.Spec.Images.KubeProxy.Version = Metadata.Images["kube-proxy"]
 
-	cfg.Spec.Images.Pause.Image = helpers.AddonImageFromComponentName("pause")
-	cfg.Spec.Images.Pause.Version = Metadata.Images["pause"]
+	cfg.Spec.Images.Pause.Image = fmt.Sprintf("proxy.replicated.com/anonymous/%s", cfg.Spec.Images.Pause.Image)
 
 	// TODO (salah): remove the following and uncomment when upstream PR for digest support is released: https://github.com/k0sproject/k0s/pull/4792
 	if cfg.Spec.Network != nil &&

diff --git a/pkg/config/images_test.go b/pkg/config/images_test.go
@@ -39,6 +39,7 @@ func TestListK0sImages(t *testing.T) {
 	if len(filtered) == 0 {
 		t.Errorf("ListK0sImages() = %v, want not empty", filtered)
 	}
+	var foundPause bool
 	var foundEnvoyProxy bool
 	for _, image := range filtered {
 		if strings.Contains(image, "kube-router") {
@@ -51,7 +52,10 @@ func TestListK0sImages(t *testing.T) {
 			t.Errorf("ListK0sImages() = %v, want not to contain apiserver-network-proxy-agent", filtered)
 		}
 		if strings.Contains(image, constant.KubePauseContainerImage) {
-			t.Errorf("ListK0sImages() = %v, want the ec pause image", filtered)
+			foundPause = true
+			if !strings.HasPrefix(image, "proxy.replicated.com/anonymous/") {
+				t.Errorf("ListK0sImages() = %v, want pause to be proxied", filtered)
+			}
 		}
 		if strings.Contains(image, "envoy-distroless") {
 			foundEnvoyProxy = true
@@ -60,6 +64,9 @@ func TestListK0sImages(t *testing.T) {
 			}
 		}
 	}
+	if !foundPause {
+		t.Errorf("ListK0sImages() = %v, want to contain pause", filtered)
+	}
 	if !foundEnvoyProxy {
 		t.Errorf("ListK0sImages() = %v, want to contain envoy-distroless", filtered)
 	}