Merge pull request #2636 from wangyang0616/1.7.0-image-tag

update image to v1.7.0

.github/workflows/code_verify.yaml

@@ -35,7 +35,7 @@ jobs:
         run: |
           make lint
           make verify
-          make TAG=v1.7.0-beta.0 generate-yaml
+          make TAG=v1.7.0 generate-yaml
           make verify-generated-yaml
           make unit-test
         working-directory: ./src/github.com/${{ github.repository }}

.github/workflows/e2e_spark.yaml

@@ -61,8 +61,8 @@ jobs:
     - name: Build lastest volcano images
       run: |
         eval $(minikube docker-env)
-        make TAG=v1.7.0-beta.0 update-development-yaml
-        make TAG=v1.7.0-beta.0 images
+        make TAG=v1.7.0 update-development-yaml
+        make TAG=v1.7.0 images
         docker images | grep volcano
         cat ./installer/volcano-development.yaml  | grep image:
         minikube kubectl -- apply -f ./installer/volcano-development.yaml

.github/workflows/release.yaml

@@ -36,7 +36,7 @@ jobs:
       - name: Run verify test
         run: |
           make verify
-          make TAG=v1.7.0-beta.0 generate-yaml
+          make TAG=v1.7.0 generate-yaml
           make verify-generated-yaml
           make unit-test
         working-directory: ./src/github.com/${{ github.repository }}
@@ -48,7 +48,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Daily Release
-        run: docker buildx create --use && make TAG=v1.7.0-beta.0 RELEASE_VER=v1.7.0-beta.0 DOCKER_USERNAME=${{ secrets.DOCKERHUB_USERNAME }} DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }} CC=/usr/local/musl/bin/musl-gcc DOCKER_PLATFORMS="linux/amd64,linux/arm64" BUILDX_OUTPUT_TYPE=registry release
+        run: docker buildx create --use && make TAG=v1.7.0 RELEASE_VER=v1.7.0 DOCKER_USERNAME=${{ secrets.DOCKERHUB_USERNAME }} DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }} CC=/usr/local/musl/bin/musl-gcc DOCKER_PLATFORMS="linux/amd64,linux/arm64" BUILDX_OUTPUT_TYPE=registry release
         working-directory: ./src/github.com/${{ github.repository }}
 
       - name: Loginout DockerHub

Makefile

@@ -191,5 +191,5 @@ CONTROLLER_GEN=$(shell which controller-gen)
 endif
 
 update-development-yaml:
-	make generate-yaml TAG=v1.7.0-beta.0 RELEASE_DIR=installer
-	mv installer/volcano-v1.7.0-beta.0.yaml installer/volcano-development.yaml
+	make generate-yaml TAG=v1.7.0 RELEASE_DIR=installer
+	mv installer/volcano-v1.7.0.yaml installer/volcano-development.yaml

Makefile.def

@@ -1,9 +1,9 @@
 
 # If tag not explicitly set in users default to the git sha.
-TAG ?=v1.7.0-beta.0
+TAG ?=v1.7.0
 GitSHA=`git rev-parse HEAD`
 Date=`date "+%Y-%m-%d %H:%M:%S"`
-RELEASE_VER=v1.7.0-beta.0
+RELEASE_VER=v1.7.0
 LD_FLAGS=" \
     -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
     -X '${REPO_PATH}/pkg/version.Built=${Date}'   \

README.md

@@ -122,8 +122,8 @@ This way is only available for x86_64 temporarily.
 If you want to get prometheus and grafana volcano dashboard after volcano installed, try following commands:
 
 ```bash
-make TAG=v1.7.0-beta.0 generate-yaml
-kubectl create -f _output/release/volcano-monitoring-v1.7.0-beta.0.yaml
+make TAG=v1.7.0 generate-yaml
+kubectl create -f _output/release/volcano-monitoring-v1.7.0.yaml
 ```
 
 ## Meeting

hack/check-generated-yaml.sh

@@ -21,12 +21,12 @@ set -o pipefail
 VK_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/..
 export RELEASE_FOLDER=${VK_ROOT}/${RELEASE_DIR}
 
-if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-v1.7.0-beta.0.yaml ; then
+if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-v1.7.0.yaml ; then
 	{
 		echo
 		echo "The Generated yaml is different from the one in installer/volcano-development.yaml"
-		echo "please run 'make generate-yaml TAG=v1.7.0-beta.0 RELEASE_DIR=installer \
-		&& mv ${VK_ROOT}/installer/volcano-v1.7.0-beta.0.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update"
+		echo "please run 'make generate-yaml TAG=v1.7.0 RELEASE_DIR=installer \
+		&& mv ${VK_ROOT}/installer/volcano-v1.7.0.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update"
 		echo
 	} >&2
 	false

installer/helm/chart/volcano/values.yaml

@@ -1,5 +1,5 @@
 basic:
-  image_tag_version: "v1.7.0-beta.0"
+  image_tag_version: "v1.7.0"
   controller_image_name: "volcanosh/vc-controller-manager"
   scheduler_image_name: "volcanosh/vc-scheduler"
   admission_image_name: "volcanosh/vc-webhook-manager"

installer/volcano-development.yaml

@@ -145,7 +145,7 @@ spec:
             - --port=8443
             - -v=4
             - 2>&1
-          image: volcanosh/vc-webhook-manager:v1.7.0-beta.0
+          image: volcanosh/vc-webhook-manager:v1.7.0
           imagePullPolicy: IfNotPresent
           name: admission
           volumeMounts:
@@ -180,7 +180,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: main
-          image: volcanosh/vc-webhook-manager:v1.7.0-beta.0
+          image: volcanosh/vc-webhook-manager:v1.7.0
           imagePullPolicy: IfNotPresent
           command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace",
                     "volcano-system", "--secret", "volcano-admission-secret"]
@@ -8602,7 +8602,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
           - name: volcano-controllers
-            image: volcanosh/vc-controller-manager:v1.7.0-beta.0
+            image: volcanosh/vc-controller-manager:v1.7.0
             args:
               - --logtostderr
               - --enable-healthz=true
@@ -8763,7 +8763,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: volcano-scheduler
-          image: volcanosh/vc-scheduler:v1.7.0-beta.0
+          image: volcanosh/vc-scheduler:v1.7.0
           args:
             - --logtostderr
             - --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf