Merge pull request #272 from ErikJiang/specify_kubespray_v1.24

update kubespray default version to v1.24.7

Author: kubean-pr-robot[bot]

artifacts/generate_offline_package.sh

@@ -4,6 +4,7 @@ set -eo pipefail
 
 OPTION=${1:-'all'}
 KUBEAN_TAG=${KUBEAN_TAG:-"v0.1.0"}
+KUBE_VERSION=${KUBE_VERSION:-"v1.24.7"}
 
 CURRENT_DIR=$(pwd)
 ARCH=${ARCH:-"amd64"}
@@ -36,7 +37,7 @@ function generate_temp_list() {
   fi
   echo "$CURRENT_DIR/kubespray"
   cd $CURRENT_DIR/kubespray
-  bash contrib/offline/generate_list.sh -e"image_arch=${ARCH}"
+  bash contrib/offline/generate_list.sh -e"image_arch=${ARCH}" -e"kube_version=${KUBE_VERSION}"
 
   # Clean up unused images
   remove_images="aws-alb|aws-ebs|cert-manager|netchecker|weave|sig-storage|external_storage|cinder-csi|kubernetesui|flannel"

artifacts/manage_version_cr.sh

@@ -6,6 +6,7 @@ OPTION=${1:-'create_localartifactset'} ## create_localartifactset  create_manife
 
 KUBESPRAY_TAG=${KUBESPRAY_TAG:-"v2.19.0"} ## env from github action
 KUBEAN_TAG=${KUBEAN_TAG:-"v0.1.0"}        ## env from github action
+KUBE_VERSION=${KUBE_VERSION:-"v1.24.7"}
 
 CURRENT_DIR=$(cd $(dirname $0); pwd) ## artifacts dir
 CURRENT_DATE=$(date +%Y%m%d)
@@ -86,7 +87,8 @@ function update_docker_offline_version() {
 function create_offline_version_cr() {
   cni_version=$(extract_version "cni_version")
   containerd_version=$(extract_version "containerd_version")
-  kube_version=$(extract_version "kube_version" "kubespray-defaults")
+  # kube_version=$(extract_version "kube_version" "kubespray-defaults")
+  kube_version=${KUBE_VERSION}
   calico_version=$(extract_version "calico_version")
   cilium_version=$(extract_version "cilium_version")
   etcd_version=$(extract_etcd_version "$kube_version")
@@ -145,7 +147,8 @@ function create_info_manifest_cr() {
   containerd_version_default=$(extract_version "containerd_version")
   containerd_version_range=$(extract_version_range ".containerd_archive_checksums.amd64")
 
-  kube_version_default=$(extract_version "kube_version" "kubespray-defaults")
+  # kube_version_default=$(extract_version "kube_version" "kubespray-defaults")
+  kube_version_default=${kube_version}
   kube_version_range=$(extract_version_range ".kubelet_checksums.amd64")
 
   calico_version_default=$(extract_version "calico_version")
@@ -154,7 +157,7 @@ function create_info_manifest_cr() {
   cilium_version_default=$(extract_version "cilium_version")
   cilium_version_range="[]" ## anything
 
-  etcd_version_default=$(extract_etcd_version "$kube_version_default")
+  etcd_version_default=$(extract_etcd_version "${kube_version_default}")
   etcd_version_range=$(extract_version_range ".etcd_binary_checksums.amd64")
 
   docker_version_default=$(extract_version "docker_version" "container-engine/docker")