diff --git a/kola/tests/kubeadm/templates.go b/kola/tests/kubeadm/templates.go index 7df4c5d08..abfff90ab 100644 --- a/kola/tests/kubeadm/templates.go +++ b/kola/tests/kubeadm/templates.go @@ -28,8 +28,8 @@ var ( Restart=on-failure Environment=CNI_VERSION={{ .CNIVersion }} ExecStartPre=/usr/bin/mkdir --parents /opt/cni/bin - ExecStartPre=/usr/bin/tar -v --extract --file "/opt/cni-plugins-linux-amd64-${CNI_VERSION}.tgz" --directory /opt/cni/bin --no-same-owner - ExecStart=/usr/bin/rm "/opt/cni-plugins-linux-amd64-${CNI_VERSION}.tgz" + ExecStartPre=/usr/bin/tar -v --extract --file "/opt/cni-plugins-linux-{{ .Arch }}-${CNI_VERSION}.tgz" --directory /opt/cni/bin --no-same-owner + ExecStart=/usr/bin/rm "/opt/cni-plugins-linux-{{ .Arch }}-${CNI_VERSION}.tgz" [Install] WantedBy=multi-user.target - name: prepare-critools.service @@ -45,28 +45,28 @@ var ( Environment=CRICTL_VERSION={{ .CRIctlVersion }} Environment=DOWNLOAD_DIR={{ .DownloadDir}} ExecStartPre=/usr/bin/mkdir --parents "${DOWNLOAD_DIR}" - ExecStartPre=/usr/bin/tar -v --extract --file "/opt/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" --directory "${DOWNLOAD_DIR}" --no-same-owner - ExecStart=/usr/bin/rm "/opt/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" + ExecStartPre=/usr/bin/tar -v --extract --file "/opt/crictl-${CRICTL_VERSION}-linux-{{ .Arch }}.tar.gz" --directory "${DOWNLOAD_DIR}" --no-same-owner + ExecStart=/usr/bin/rm "/opt/crictl-${CRICTL_VERSION}-linux-{{ .Arch }}.tar.gz" [Install] WantedBy=multi-user.target storage: files: - - path: /opt/cni-plugins-linux-amd64-{{ .CNIVersion }}.tgz + - path: /opt/cni-plugins-linux-{{ .Arch }}-{{ .CNIVersion }}.tgz filesystem: root mode: 0644 contents: remote: - url: https://github.com/containernetworking/plugins/releases/download/{{ .CNIVersion }}/cni-plugins-linux-amd64-{{ .CNIVersion }}.tgz + url: https://github.com/containernetworking/plugins/releases/download/{{ .CNIVersion }}/cni-plugins-linux-{{ .Arch }}-{{ .CNIVersion }}.tgz verification: hash: function: sha512 sum: {{ .CNISum }} - - path: /opt/crictl-{{ .CRIctlVersion }}-linux-amd64.tar.gz + - path: /opt/crictl-{{ .CRIctlVersion }}-linux-{{ .Arch }}.tar.gz filesystem: root mode: 0644 contents: remote: - url: https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ .CRIctlVersion }}/crictl-{{ .CRIctlVersion }}-linux-amd64.tar.gz + url: https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ .CRIctlVersion }}/crictl-{{ .CRIctlVersion }}-linux-{{ .Arch }}.tar.gz verification: hash: function: sha512 @@ -76,7 +76,7 @@ storage: mode: 0755 contents: remote: - url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/amd64/kubeadm + url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/{{ .Arch }}/kubeadm verification: hash: function: sha512 @@ -86,7 +86,7 @@ storage: mode: 0755 contents: remote: - url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/amd64/kubelet + url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/{{ .Arch }}/kubelet verification: hash: function: sha512 @@ -112,8 +112,8 @@ storage: Restart=on-failure Environment=CNI_VERSION={{ .CNIVersion }} ExecStartPre=/usr/bin/mkdir --parents /opt/cni/bin - ExecStartPre=/usr/bin/tar -v --extract --file "/opt/cni-plugins-linux-amd64-${CNI_VERSION}.tgz" --directory /opt/cni/bin --no-same-owner - ExecStart=/usr/bin/rm "/opt/cni-plugins-linux-amd64-${CNI_VERSION}.tgz" + ExecStartPre=/usr/bin/tar -v --extract --file "/opt/cni-plugins-linux-{{ .Arch }}-${CNI_VERSION}.tgz" --directory /opt/cni/bin --no-same-owner + ExecStart=/usr/bin/rm "/opt/cni-plugins-linux-{{ .Arch }}-${CNI_VERSION}.tgz" [Install] WantedBy=multi-user.target - name: prepare-critools.service @@ -129,28 +129,28 @@ storage: Environment=CRICTL_VERSION={{ .CRIctlVersion }} Environment=DOWNLOAD_DIR={{ .DownloadDir}} ExecStartPre=/usr/bin/mkdir --parents "${DOWNLOAD_DIR}" - ExecStartPre=/usr/bin/tar -v --extract --file "/opt/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" --directory "${DOWNLOAD_DIR}" --no-same-owner - ExecStart=/usr/bin/rm "/opt/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" + ExecStartPre=/usr/bin/tar -v --extract --file "/opt/crictl-${CRICTL_VERSION}-linux-{{ .Arch }}.tar.gz" --directory "${DOWNLOAD_DIR}" --no-same-owner + ExecStart=/usr/bin/rm "/opt/crictl-${CRICTL_VERSION}-linux-{{ .Arch }}.tar.gz" [Install] WantedBy=multi-user.target storage: files: - - path: /opt/cni-plugins-linux-amd64-{{ .CNIVersion }}.tgz + - path: /opt/cni-plugins-linux-{{ .Arch }}-{{ .CNIVersion }}.tgz filesystem: root mode: 0644 contents: remote: - url: https://github.com/containernetworking/plugins/releases/download/{{ .CNIVersion }}/cni-plugins-linux-amd64-{{ .CNIVersion }}.tgz + url: https://github.com/containernetworking/plugins/releases/download/{{ .CNIVersion }}/cni-plugins-linux-{{ .Arch }}-{{ .CNIVersion }}.tgz verification: hash: function: sha512 sum: {{ .CNISum }} - - path: /opt/crictl-{{ .CRIctlVersion }}-linux-amd64.tar.gz + - path: /opt/crictl-{{ .CRIctlVersion }}-linux-{{ .Arch }}.tar.gz filesystem: root mode: 0644 contents: remote: - url: https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ .CRIctlVersion }}/crictl-{{ .CRIctlVersion }}-linux-amd64.tar.gz + url: https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ .CRIctlVersion }}/crictl-{{ .CRIctlVersion }}-linux-{{ .Arch }}.tar.gz verification: hash: function: sha512 @@ -160,7 +160,7 @@ storage: mode: 0755 contents: remote: - url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/amd64/kubeadm + url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/{{ .Arch }}/kubeadm verification: hash: function: sha512 @@ -170,7 +170,7 @@ storage: mode: 0755 contents: remote: - url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/amd64/kubelet + url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/{{ .Arch }}/kubelet verification: hash: function: sha512 @@ -180,7 +180,7 @@ storage: mode: 0755 contents: remote: - url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/amd64/kubectl + url: https://storage.googleapis.com/kubernetes-release/release/{{ .Release }}/bin/linux/{{ .Arch }}/kubectl verification: hash: function: sha512