Merge pull request #286 from ErikJiang/kube_version

Unified k8s version

Author: ErikJiang

.github/workflows/call-offline-build.yaml

@@ -7,6 +7,9 @@ on:
         required: true
         type: string
 
+env:
+  KUBE_VERSION: v1.24.7
+
 jobs:
   offline-build:
     runs-on: ubuntu-latest
@@ -36,6 +39,7 @@ jobs:
       env:
         KUBEAN_TAG: ${{ github.ref_name }}
         KUBESPRAY_TAG: ${{ env.SPRAY_SHA_SHORT }}
+        KUBE_VERSION: ${{ env.KUBE_VERSION }}
       run: |
         bash artifacts/manage_version_cr.sh create_manifest
         bash artifacts/manage_version_cr.sh create_localartifactset
@@ -60,6 +64,7 @@ jobs:
       env:
         KUBEAN_TAG: ${{ github.ref_name }}
         ARCH: amd64
+        KUBE_VERSION: ${{ env.KUBE_VERSION }}
       run: |
         OFFLINE_PACKAGE_DIR=${KUBEAN_TAG}/${ARCH}
         bash artifacts/generate_offline_package.sh all
@@ -75,6 +80,7 @@ jobs:
       env:
         KUBEAN_TAG: ${{ github.ref_name }}
         ARCH: arm64
+        KUBE_VERSION: ${{ env.KUBE_VERSION }}
       run: |
         OFFLINE_PACKAGE_DIR=${KUBEAN_TAG}/${ARCH}
         bash artifacts/generate_offline_package.sh all

artifacts/generate_offline_package.sh

@@ -4,7 +4,7 @@ set -eo pipefail
 
 OPTION=${1:-'all'}
 KUBEAN_TAG=${KUBEAN_TAG:-"v0.1.0"}
-KUBE_VERSION=${KUBE_VERSION:-"v1.24.7"}
+KUBE_VERSION=${KUBE_VERSION:-""}
 
 CURRENT_DIR=$(pwd)
 ARCH=${ARCH:-"amd64"}
@@ -37,7 +37,12 @@ function generate_temp_list() {
   fi
   echo "$CURRENT_DIR/kubespray"
   cd $CURRENT_DIR/kubespray
-  bash contrib/offline/generate_list.sh -e"image_arch=${ARCH}" -e"kube_version=${KUBE_VERSION}"
+
+  if [ -z "${KUBE_VERSION}" ]; then
+    bash contrib/offline/generate_list.sh -e"image_arch=${ARCH}"
+  else
+    bash contrib/offline/generate_list.sh -e"image_arch=${ARCH}" -e"kube_version=${KUBE_VERSION}"
+  fi
 
   # 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,7 +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"}
+KUBE_VERSION=${KUBE_VERSION:-""}
 
 CURRENT_DIR=$(cd $(dirname $0); pwd) ## artifacts dir
 CURRENT_DATE=$(date +%Y%m%d)
@@ -87,8 +87,13 @@ 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=${KUBE_VERSION}
+
+  if [ -z "${KUBE_VERSION}" ]; then
+    kube_version=$(extract_version "kube_version" "kubespray-defaults")
+  else
+    kube_version=${KUBE_VERSION}
+  fi
+
   calico_version=$(extract_version "calico_version")
   cilium_version=$(extract_version "cilium_version")
   etcd_version=$(extract_etcd_version "$kube_version")
@@ -147,8 +152,12 @@ 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=${kube_version}
+  if [ -z "${KUBE_VERSION}" ]; then
+    kube_version_default=$(extract_version "kube_version" "kubespray-defaults")
+  else
+    kube_version_default=${KUBE_VERSION}
+  fi
+
   kube_version_range=$(extract_version_range ".kubelet_checksums.amd64")
 
   calico_version_default=$(extract_version "calico_version")

build/images/kubean-operator/Dockerfile

@@ -2,17 +2,16 @@ FROM golang:1.17.3 as build
 
 WORKDIR /kubean
 
-# ENV GO111MODULE=on \
-#     GOPROXY=https://goproxy.cn,direct
-ENV GO111MODULE=on
+ENV GO111MODULE=on \
+    GOPROXY=https://goproxy.cn,direct
 
 COPY . .
 
 RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -o kubean-operator ./cmd/kubean-operator/main.go
 
 FROM alpine:3.15
 
-# RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
 COPY --from=build /kubean/kubean-operator /bin/