@@ -112,6 +112,11 @@ echo "Downloading kubernetes cluster provider ${PROVIDER_URL}"
112112provider_conf_file=" ${working_dir} /provider.yaml"
113113curl -sSL ${PROVIDER_URL} -o ${provider_conf_file}
114114
115+ csi_conf_file=" ${working_dir} /manifest.yaml"
116+ echo " Including CloudStack CSI Driver manifest"
117+ wget https://github.com/cloudstack/cloudstack-csi-driver/releases/download/v3.0.0/snapshot-crds.yaml -O ${working_dir} /snapshot-crds.yaml
118+ wget https://github.com/cloudstack/cloudstack-csi-driver/releases/download/v3.0.0/manifest.yaml -O ${csi_conf_file}
119+
115120echo " Fetching k8s docker images..."
116121ctr -v
117122if [ $? -ne 0 ]; then
@@ -143,6 +148,10 @@ output=`printf "%s\n" ${output} ${autoscaler_image}`
143148provider_image=` grep " image:" ${provider_conf_file} | cut -d ' :' -f2- | tr -d ' ' `
144149output=` printf " %s\n" ${output} ${provider_image} `
145150
151+ # Extract images from manifest.yaml and add to output
152+ csi_images=` grep " image:" " ${csi_conf_file} " | cut -d ' :' -f2- | tr -d ' ' | tr -d " '" `
153+ output=` printf " %s\n%s" " ${output} " " ${csi_images} " `
154+
146155while read -r line; do
147156 echo " Downloading image $line ---"
148157 if [[ $line == kubernetesui* ]] || [[ $line == apache* ]] || [[ $line == weaveworks* ]]; then
@@ -172,10 +181,6 @@ if [ -n "${9}" ]; then
172181 wget -q --show-progress " https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION} /etcd-${ETCD_VERSION} -linux-amd64.tar.gz" -O ${etcd_dir} /etcd-linux-amd64.tar.gz
173182fi
174183
175- echo " Including CloudStack CSI Driver manifest"
176- wget https://github.com/shapeblue/cloudstack-csi-driver/releases/download/v3.0.0/snapshot-crds.yaml -O ${working_dir} /snapshot-crds.yaml
177- wget https://github.com/shapeblue/cloudstack-csi-driver/releases/download/v3.0.0/manifest.yaml -O ${working_dir} /manifest.yaml
178-
179184mkisofs -o " ${output_dir} /${build_name} " -J -R -l " ${iso_dir} "
180185
181186rm -rf " ${iso_dir} "
0 commit comments