From 06a4b042edded142b311479766212cf85213b806 Mon Sep 17 00:00:00 2001 From: alxtkr77 <3098237+alxtkr77@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:19:00 +0300 Subject: [PATCH] Revert image pulling http/s to base solely on /etc/containerd/certs.d (#66) --- pkg/cri/containerd.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/cri/containerd.go b/pkg/cri/containerd.go index 7e0e052..6f427d1 100644 --- 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 {