small fixes in prepull element

Author: MaximMonin

.env-1.30

@@ -2,7 +2,7 @@
 DISTR=noble
 
 # Kubernetes with runtime
-DIB_KUBERNETES_VERSION=1.30.10
+DIB_KUBERNETES_VERSION=1.30.11
 DIB_CRI_TOOLS_VERSION=1.32.0
 
 # There are some crash issues (Cinder controller) with containerd 1.7.24+ and Calico CNI
@@ -17,5 +17,6 @@ DIB_NPD_VERSION=0.8.20
 DIB_CNI_PLUGINS_VERSION=1.5.1
 
 # Prepull cni images (comment out the lines below to avoid pulling cni images)
+DIB_CLOUD_PROVIDER_TAG=v1.30.0
 DIB_CILIUM_TAG=v1.15.3
 DIB_CALICO_TAG=v3.29.0

.env-1.31

@@ -2,7 +2,7 @@
 DISTR=noble
 
 # Kubernetes with runtime
-DIB_KUBERNETES_VERSION=1.31.6
+DIB_KUBERNETES_VERSION=1.31.7
 DIB_CRI_TOOLS_VERSION=1.32.0
 
 # There are some crash issues (Cinder controller) with containerd 1.7.24+ and Calico CNI
@@ -17,5 +17,6 @@ DIB_NPD_VERSION=0.8.20
 DIB_CNI_PLUGINS_VERSION=1.5.1
 
 # Prepull cni images (comment out the lines below to avoid pulling cni images)
+DIB_CLOUD_PROVIDER_TAG=v1.31.0
 DIB_CILIUM_TAG=v1.15.3
 DIB_CALICO_TAG=v3.29.0

build-1.30.sh

@@ -16,6 +16,7 @@ docker run --rm --privileged --network host -v $imagedir:/image magnum-kubernete
     export DIB_CRI_TOOLS_VERSION="'$DIB_CRI_TOOLS_VERSION'" && \
     export DIB_NPD_VERSION="'$DIB_NPD_VERSION'" && \
     export DIB_RUNC_VERSION="'$DIB_RUNC_VERSION'" && \
+    export DIB_CLOUD_PROVIDER_TAG="'$DIB_CLOUD_PROVIDER_TAG'" && \
     export DIB_CILIUM_TAG="'$DIB_CILIUM_TAG'" && \
     export DIB_CALICO_TAG="'$DIB_CALICO_TAG'" && \
     disk-image-create -x -t qcow2 \

build-1.31.sh

@@ -16,6 +16,7 @@ docker run --rm --privileged --network host -v $imagedir:/image magnum-kubernete
     export DIB_CRI_TOOLS_VERSION="'$DIB_CRI_TOOLS_VERSION'" && \
     export DIB_NPD_VERSION="'$DIB_NPD_VERSION'" && \
     export DIB_RUNC_VERSION="'$DIB_RUNC_VERSION'" && \
+    export DIB_CLOUD_PROVIDER_TAG="'$DIB_CLOUD_PROVIDER_TAG'" && \
     export DIB_CILIUM_TAG="'$DIB_CILIUM_TAG'" && \
     export DIB_CALICO_TAG="'$DIB_CALICO_TAG'" && \
     disk-image-create -x -t qcow2 \

patch/prepull-images/post-install.d/90-prepull-images

@@ -26,7 +26,9 @@ done
 crictl pull registry.k8s.io/provider-os/cinder-csi-plugin:v1.28.0
 crictl pull registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.3
 crictl pull registry.k8s.io/sig-storage/livenessprobe:v2.9.0
-crictl pull registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.28.0
+if [ ${DIB_CLOUD_PROVIDER_TAG:-""} ]; then
+  crictl pull registry.k8s.io/provider-os/openstack-cloud-controller-manager:$DIB_CLOUD_PROVIDER_TAG
+fi
 
 # Pre pull large cni images
 if [ ${DIB_CILIUM_TAG:-""} ]; then
@@ -39,12 +41,12 @@ if [ ${DIB_CALICO_TAG:-""} ]; then
 #  crictl pull docker.io/calico/kube-controllers:$DIB_CALICO_TAG
 fi
 
-# Optimization (trying to keep prepulled images with --no-unpack option)
+# Optimization (trying to keep some prepulled images with --no-unpack option)
 mkdir -p /tmp/pulledimages
-# exporting cni/openstack images to /tmp/pulledimages
-crictl images | grep -E -- 'cilium|calico|sig-storage|provider-os' | awk '{print "/tmp/pulledimages/"$3".tar " $1":"$2}' | xargs -L1 ctr -n k8s.io images export
-# deleting cni/openstack images
-crictl images | grep -E -- 'cilium|calico|sig-storage|provider-os' | awk '{print $3}' | xargs -n 1 crictl rmi
+# exporting cni images to /tmp/pulledimages
+crictl images | grep -E -- 'cilium|calico' | awk '{print "/tmp/pulledimages/"$3".tar " $1":"$2}' | xargs -L1 ctr -n k8s.io images export
+# deleting cni images
+crictl images | grep -E -- 'cilium|calico' | awk '{print $3}' | xargs -n 1 crictl rmi
 # reimporting images with no-unpack option
 ls -1 /tmp/pulledimages/* | xargs -L1 ctr -n k8s.io images import --no-unpack
 rm -rf /tmp/pulledimages