Merge branch 'master' into release-1.17

scripts/package-airgap

@@ -5,6 +5,8 @@ cd $(dirname $0)/..
 
 . ./scripts/version.sh
 
-images=$(cat scripts/airgap/image-list.txt)
+airgap_image_file='scripts/airgap/image-list.txt'
+images=$(cat "${airgap_image_file}")
 xargs -n1 docker pull <<< "${images}"
 docker save ${images} -o dist/artifacts/k3s-airgap-images-${ARCH}.tar 
+cp "${airgap_image_file}" dist/artifacts/k3s-images.txt