Merge pull request #1670 from rancher-sandbox/load-airgap

jandubois · web-flow · commit 470f7cb1c534 · 2022-02-25T14:39:48.000-08:00
Import airgap images with --all-platforms option
diff --git a/src/assets/scripts/service-k3s.initd b/src/assets/scripts/service-k3s.initd
@@ -37,7 +37,7 @@ start_pre() {
   if [ "${ENGINE}" == "moby" ]; then
     docker load --input /var/lib/rancher/k3s/agent/images/k3s-airgap-images-${ARCH}.tar
   else
-    nerdctl --address /run/k3s/containerd/containerd.sock --namespace k8s.io load --input /var/lib/rancher/k3s/agent/images/k3s-airgap-images-${ARCH}.tar
+    nerdctl --address /run/k3s/containerd/containerd.sock --namespace k8s.io load --all-platforms --input /var/lib/rancher/k3s/agent/images/k3s-airgap-images-${ARCH}.tar
   fi
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ start_pre() {`
`37`	`37`	`if [ "${ENGINE}" == "moby" ]; then`
`38`	`38`	`docker load --input /var/lib/rancher/k3s/agent/images/k3s-airgap-images-${ARCH}.tar`
`39`	`39`	`else`
`40`		`- nerdctl --address /run/k3s/containerd/containerd.sock --namespace k8s.io load --input /var/lib/rancher/k3s/agent/images/k3s-airgap-images-${ARCH}.tar`
	`40`	`+ nerdctl --address /run/k3s/containerd/containerd.sock --namespace k8s.io load --all-platforms --input /var/lib/rancher/k3s/agent/images/k3s-airgap-images-${ARCH}.tar`
`41`	`41`	`fi`
`42`	`42`	`}`
`43`	`43`