From 18cbc5ad104742f78bd07595053e31919d6d5ec9 Mon Sep 17 00:00:00 2001 From: Mufengzhe <1394298614@qq.com> Date: Thu, 21 Sep 2023 17:03:44 +0800 Subject: [PATCH 1/2] update images to v1.8.1 Signed-off-by: Mufengzhe <1394298614@qq.com> --- .github/workflows/code_verify.yaml | 2 +- .github/workflows/e2e_spark.yaml | 4 ++-- Makefile | 4 ++-- Makefile.def | 4 ++-- README.md | 6 +++--- hack/check-generated-yaml.sh | 6 +++--- installer/helm/chart/volcano/Chart.yaml | 2 +- installer/helm/chart/volcano/values.yaml | 2 +- installer/volcano-development.yaml | 8 ++++---- ...itoring-v1.8.0.yaml => volcano-monitoring-v1.8.1.yaml} | 0 10 files changed, 19 insertions(+), 19 deletions(-) rename installer/{volcano-monitoring-v1.8.0.yaml => volcano-monitoring-v1.8.1.yaml} (100%) diff --git a/.github/workflows/code_verify.yaml b/.github/workflows/code_verify.yaml index 3f49a6ff8c..cde12cb978 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.8.0 generate-yaml + make TAG=v1.8.1 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 cbabef98ea..d68ef393e4 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.8.0 update-development-yaml - make TAG=v1.8.0 images + make TAG=v1.8.1 update-development-yaml + make TAG=v1.8.1 images docker images | grep volcano cat ./installer/volcano-development.yaml | grep image: minikube kubectl -- replace --force -f ./installer/volcano-development.yaml diff --git a/Makefile b/Makefile index 7532e7554a..bb086040b4 100644 --- a/Makefile +++ b/Makefile @@ -195,5 +195,5 @@ CONTROLLER_GEN=$(shell which controller-gen) endif update-development-yaml: - make generate-yaml TAG=v1.8.0 RELEASE_DIR=installer - mv installer/volcano-v1.8.0.yaml installer/volcano-development.yaml + make generate-yaml TAG=v1.8.1 RELEASE_DIR=installer + mv installer/volcano-v1.8.1.yaml installer/volcano-development.yaml diff --git a/Makefile.def b/Makefile.def index b810524f78..7364836252 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.8.0 +TAG ?= v1.8.1 GitSHA=`git rev-parse HEAD` Date=`date "+%Y-%m-%d %H:%M:%S"` -RELEASE_VER=v1.8.0 +RELEASE_VER=v1.8.1 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 caaf620a61..ab5140de1b 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Note: Install Volcano on an existing Kubernetes cluster. This way is both available for x86_64 and arm64 architecture. ``` -kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/release-1.8/installer/volcano-development.yaml +kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/release-1.8.1/installer/volcano-development.yaml ``` Enjoy! Volcano will create the following resources in `volcano-system` namespace. @@ -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.8.0 generate-yaml -kubectl create -f _output/release/volcano-monitoring-v1.8.0.yaml +make TAG=v1.8.1 generate-yaml +kubectl create -f _output/release/volcano-monitoring-v1.8.1.yaml ``` ## Kubernetes compatibility diff --git a/hack/check-generated-yaml.sh b/hack/check-generated-yaml.sh index b8f8e6935a..718049a434 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.8.0.yaml ; then +if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-v1.8.1.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.8.0 RELEASE_DIR=installer \ - && mv ${VK_ROOT}/installer/volcano-v1.8.0.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update" + echo "please run 'make generate-yaml TAG=v1.8.1 RELEASE_DIR=installer \ + && mv ${VK_ROOT}/installer/volcano-v1.8.1.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update" echo } >&2 false diff --git a/installer/helm/chart/volcano/Chart.yaml b/installer/helm/chart/volcano/Chart.yaml index 1c1d88dabe..91cd571a3b 100644 --- a/installer/helm/chart/volcano/Chart.yaml +++ b/installer/helm/chart/volcano/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Volcano name: volcano -version: "1.8.0" +version: "1.8.1" appVersion: "0.1" icon: https://raw.githubusercontent.com/volcano-sh/charts/master/docs/images/volcano-logo.png home: https://volcano.sh diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml index bceb64250d..932f41d3d6 100644 --- a/installer/helm/chart/volcano/values.yaml +++ b/installer/helm/chart/volcano/values.yaml @@ -7,7 +7,7 @@ basic: scheduler_config_file: "config/volcano-scheduler.conf" image_pull_secret: "" image_pull_policy: "IfNotPresent" - image_tag_version: "v1.8.0" + image_tag_version: "v1.8.1" admission_port: 8443 custom: metrics_enable: false diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml index c95e2b5996..e6e42e9e8c 100644 --- a/installer/volcano-development.yaml +++ b/installer/volcano-development.yaml @@ -150,7 +150,7 @@ spec: - --port=8443 - -v=4 - 2>&1 - image: volcanosh/vc-webhook-manager:v1.8.0 + image: volcanosh/vc-webhook-manager:v1.8.1 imagePullPolicy: IfNotPresent name: admission volumeMounts: @@ -185,7 +185,7 @@ spec: restartPolicy: Never containers: - name: main - image: volcanosh/vc-webhook-manager:v1.8.0 + image: volcanosh/vc-webhook-manager:v1.8.1 imagePullPolicy: IfNotPresent command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace", "volcano-system", "--secret", "volcano-admission-secret"] @@ -9000,7 +9000,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: volcano-controllers - image: volcanosh/vc-controller-manager:v1.8.0 + image: volcanosh/vc-controller-manager:v1.8.1 args: - --logtostderr - --enable-healthz=true @@ -9168,7 +9168,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: volcano-scheduler - image: volcanosh/vc-scheduler:v1.8.0 + image: volcanosh/vc-scheduler:v1.8.1 args: - --logtostderr - --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf diff --git a/installer/volcano-monitoring-v1.8.0.yaml b/installer/volcano-monitoring-v1.8.1.yaml similarity index 100% rename from installer/volcano-monitoring-v1.8.0.yaml rename to installer/volcano-monitoring-v1.8.1.yaml From 82deb6601508eaf408db9c5da9df6e706b02072d Mon Sep 17 00:00:00 2001 From: Mufengzhe <1394298614@qq.com> Date: Thu, 21 Sep 2023 11:03:37 +0800 Subject: [PATCH 2/2] update version compatibility instructions for volcano v1.8 version support for k8s v1.27 and v1.28 Signed-off-by: Mufengzhe <1394298614@qq.com> --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ab5140de1b..b1ab7e25ce 100644 --- a/README.md +++ b/README.md @@ -128,11 +128,12 @@ kubectl create -f _output/release/volcano-monitoring-v1.8.1.yaml ## Kubernetes compatibility -| | Kubernetes 1.17 | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | -|------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------| -| Volcano v1.6 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | -| Volcano v1.7 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |✓ | -| Volcano HEAD (master) | - | - | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |✓ | +| | Kubernetes 1.17 | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.27 | Kubernetes 1.28 | +|------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------| +| Volcano v1.6 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | - | - | - | +| Volcano v1.7 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| Volcano v1.8 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | ✓ | ✓ | +| Volcano HEAD (master) | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | ✓ | ✓ | Key: * `✓` Volcano and the Kubernetes version are exactly compatible.