[orabos][metal3] Move crictl to metal3

sapcc · Jun 10, 2024 · fc87809 · fc87809
1 parent e527fca
commit fc87809
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/features/metal3/exec.config b/features/metal3/exec.config
@@ -8,3 +8,13 @@ TEMP_DEB="$(mktemp)"
 wget -O "$TEMP_DEB" 'https://repo.eu-de-1.cloud.sap/gardenlinux/ignition_2.18.0-0gardenlinux~experimental_amd64.deb'
 DEBIAN_FRONTEND=noninteractive dpkg -i "$TEMP_DEB"
 rm -f "$TEMP_DEB"
+
+# crictl
+CRI_VERSION=1.27.0
+
+wget --show-progress --progress=bar:force -4 -P /opt/bin \
+  https://github.com/kubernetes-sigs/cri-tools/releases/download/v${CRI_VERSION}/crictl-v${CRI_VERSION}-linux-amd64.tar.gz
+
+tar -C /opt/bin -xf /opt/bin/crictl-v${CRI_VERSION}-linux-amd64.tar.gz
+
+rm -f /root/.wget-hsts crictl-v${CRI_VERSION}-linux-amd64.tar.gz
diff --git a/features/orabos/exec.config b/features/orabos/exec.config
@@ -28,13 +28,3 @@ create neutron 42435 openvswitch
 create nova 42436 libvirt openvswitch
 mkdir -p /var/lib/nova/{.ssh,instances,mnt}
 chown -R nova:libvirt-qemu /var/lib/nova/{instances,mnt}
-
-# crictl
-CRI_VERSION=1.27.0
-
-wget --show-progress --progress=bar:force -4 -P /opt/bin \
-  https://github.com/kubernetes-sigs/cri-tools/releases/download/v${CRI_VERSION}/crictl-v${CRI_VERSION}-linux-amd64.tar.gz
-
-tar -C /opt/bin -xf /opt/bin/crictl-v${CRI_VERSION}-linux-amd64.tar.gz
-
-rm -f /root/.wget-hsts crictl-v${CRI_VERSION}-linux-amd64.tar.gz