Revert image pulling http/s to base solely on /etc/containerd/certs.d (…

…#66)
v3io · Sep 16, 2024 · 06a4b04 · 06a4b04
1 parent 488c709
commit 06a4b04
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/pkg/cri/containerd.go b/pkg/cri/containerd.go
@@ -231,12 +231,7 @@ func (c *Containerd) createContainer(image string,
 
 		// pull the v3io-fuse image
 		// [IG-23016] MountVolume.SetUp failed for volume storage in k8s 1.29
-		var cmd *exec.Cmd
-		if strings.Contains(image, ":80/") {
-			cmd = exec.Command("/usr/local/bin/ctr", "-n", "k8s.io", "images", "pull", "--plain-http", image)
-		} else {
-			cmd = exec.Command("/usr/local/bin/ctr", "-n", "k8s.io", "images", "pull", "--hosts-dir", "/etc/containerd/certs.d/", image)
-		}
+		cmd := exec.Command("/usr/local/bin/ctr", "-n", "k8s.io", "images", "pull", "--hosts-dir", "/etc/containerd/certs.d/", image)
 		output, err := cmd.CombinedOutput()
 		// Handle errors
 		if err != nil {