fix: exclude cni_plugins_version

Signed-off-by: redscholar <blacktiledhouse@gmail.com>

Author: redscholar

builtin/core/roles/defaults/templates/manifests.yaml

@@ -521,7 +521,11 @@ download:
     type: {{ .download.cni.type | toJson }}
     # ========== cni ==========
     # cni_plugins binary
+{{- if .download.cni.type | empty | not }}
     cni_plugins_version: {{ .download.cni.cni_plugins_version| default (list "v1.9.1") | toJson }}
+{{- else }}
+    cni_plugins_version: []
+{{- end }}
     # ========== cni: calico ==========
     # calicoctl binary
 {{- if .download.cni.type | has "calico" }}

builtin/core/roles/download/package/tasks/main.yaml

@@ -19,4 +19,4 @@
 - name: Package | Export artifact
   command: |
     # package binary directory
-    cd {{ .artifact_dir }}/kubekey && tar -czvf {{ .artifact_dir }}/kubekey-artifact.tgz . && rm -rf {{ .artifact_dir }}/kubekey
+    tar -czvf {{ .artifact_dir }}/kubekey-artifact.tgz -C {{ .artifact_dir }}/kubekey . && rm -rf {{ .artifact_dir }}/kubekey

hack/downloadKubekey.sh

@@ -114,6 +114,10 @@ fi
 
 echo "Exporting artifact with kk..."
 ./kk artifact export -c "\$CONFIG_FILE" --workdir prepare --set download.tools.kubekey=$DOWNLOAD_PREFIX/releases/download/$VERSION/kubekey-$VERSION-linux-"{{ \"{{ .arch }}\" }}".tar.gz --set artifact_dir=prepare/${ARTIFACT_DIR}
+if [ \$? -ne 0 ]; then
+  echo "Failed to export artifact with kk. Please check the command output above."
+  exit 1
+fi
 
 if [ -f "web-installer.tgz" ]; then
   echo "Extracting web-installer.tgz to ${ARTIFACT_DIR}/web-installer/ ..."