From 3cc59e63c6483c86bafd24f20fb5217b362b57a9 Mon Sep 17 00:00:00 2001 From: wangyang Date: Fri, 30 Dec 2022 20:55:47 +0800 Subject: [PATCH] update image to v1.7.0 Signed-off-by: wangyang --- .github/workflows/code_verify.yaml | 2 +- .github/workflows/e2e_spark.yaml | 4 ++-- .github/workflows/release.yaml | 4 ++-- Makefile | 4 ++-- Makefile.def | 4 ++-- README.md | 4 ++-- hack/check-generated-yaml.sh | 6 +++--- installer/helm/chart/volcano/values.yaml | 2 +- installer/volcano-development.yaml | 8 ++++---- ...-v1.7.0-beta.0.yaml => volcano-monitoring-v1.7.0.yaml} | 0 10 files changed, 19 insertions(+), 19 deletions(-) rename installer/{volcano-monitoring-v1.7.0-beta.0.yaml => volcano-monitoring-v1.7.0.yaml} (100%) diff --git a/.github/workflows/code_verify.yaml b/.github/workflows/code_verify.yaml index 5db1047061..9732475253 100644 --- a/.github/workflows/code_verify.yaml +++ b/.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 }} diff --git a/.github/workflows/e2e_spark.yaml b/.github/workflows/e2e_spark.yaml index 8f13027498..073f9ccccb 100644 --- a/.github/workflows/e2e_spark.yaml +++ b/.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 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 62a8c16790..e7a035752a 100644 --- a/.github/workflows/release.yaml +++ b/.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 diff --git a/Makefile b/Makefile index ef1a036cc3..6d2f623ade 100644 --- a/Makefile +++ b/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 diff --git a/Makefile.def b/Makefile.def index 582279c6f3..844451d500 100644 --- a/Makefile.def +++ b/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}' \ diff --git a/README.md b/README.md index 4860ac8a5a..318d3fead5 100644 --- a/README.md +++ b/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 diff --git a/hack/check-generated-yaml.sh b/hack/check-generated-yaml.sh index 82303b8587..edbf0c8ca7 100755 --- a/hack/check-generated-yaml.sh +++ b/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 diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml index f244e44675..ae87eb109c 100644 --- a/installer/helm/chart/volcano/values.yaml +++ b/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" diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml index 4a735eb700..6975280214 100644 --- a/installer/volcano-development.yaml +++ b/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 diff --git a/installer/volcano-monitoring-v1.7.0-beta.0.yaml b/installer/volcano-monitoring-v1.7.0.yaml similarity index 100% rename from installer/volcano-monitoring-v1.7.0-beta.0.yaml rename to installer/volcano-monitoring-v1.7.0.yaml