diff --git a/.github/workflows/code_verify.yaml b/.github/workflows/code_verify.yaml index 2efc2fb0f6..a18d069570 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=latest generate-yaml + make TAG=v1.10.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 e70bf26be9..2ac577b2df 100644 --- a/.github/workflows/e2e_spark.yaml +++ b/.github/workflows/e2e_spark.yaml @@ -61,11 +61,11 @@ jobs: - name: Build lastest volcano images run: | eval $(minikube docker-env) - make TAG=latest update-development-yaml - make TAG=latest images + make TAG=v1.10.0 update-development-yaml + make TAG=v1.10.0 images docker images | grep volcano cat ./installer/volcano-development.yaml | grep image: - minikube kubectl -- replace --force -f ./installer/volcano-development.yaml + sed 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/' ./installer/volcano-development.yaml | minikube kubectl -- replace --force -f - - name: Show all K8S pods and nodes run: | # Use minikube kubectl diff --git a/Makefile b/Makefile index 5bb995f4fc..5e71650f58 100644 --- a/Makefile +++ b/Makefile @@ -195,8 +195,8 @@ CONTROLLER_GEN=$(shell which controller-gen) endif update-development-yaml: - make generate-yaml TAG=latest RELEASE_DIR=installer - mv installer/volcano-latest.yaml installer/volcano-development.yaml + make generate-yaml TAG=v1.10.0 RELEASE_DIR=installer + mv installer/volcano-v1.10.0.yaml installer/volcano-development.yaml mod-download-go: @-GOFLAGS="-mod=readonly" find -name go.mod -execdir go mod download \; diff --git a/Makefile.def b/Makefile.def index 3cc3dcb51d..dc9f12c4fa 100644 --- a/Makefile.def +++ b/Makefile.def @@ -1,9 +1,9 @@ # If tag not explicitly set in users default to the git sha. -TAG ?= $(shell git rev-parse --verify HEAD) +TAG ?= v1.10.0 GitSHA=`git rev-parse HEAD` Date=`date "+%Y-%m-%d %H:%M:%S"` -RELEASE_VER=latest +RELEASE_VER=v1.10.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 59253a7625..807aa90cde 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,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/master/installer/volcano-development.yaml +kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/release-1.10/installer/volcano-development.yaml ``` Enjoy! Volcano will create the following resources in `volcano-system` namespace. @@ -141,8 +141,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=latest generate-yaml -kubectl create -f _output/release/volcano-monitoring-latest.yaml +make TAG=v1.10.0 generate-yaml +kubectl create -f _output/release/volcano-monitoring-v1.10.0.yaml ``` ## Kubernetes compatibility @@ -153,6 +153,7 @@ kubectl create -f _output/release/volcano-monitoring-latest.yaml | Volcano v1.7 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - |_ | | Volcano v1.8 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - |- | | Volcano v1.9 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |- | +| Volcano v1.10 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | | Volcano HEAD (master) | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | Key: diff --git a/go.mod b/go.mod index f3fc4b8320..49b7d80ef4 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( sigs.k8s.io/controller-runtime v0.13.0 sigs.k8s.io/yaml v1.3.0 stathat.com/c/consistent v1.0.0 - volcano.sh/apis v1.10.0-alpha.0.0.20240904072435-17826d64a144 + volcano.sh/apis v1.10.0 ) require ( diff --git a/go.sum b/go.sum index ca663997e8..f133771a92 100644 --- a/go.sum +++ b/go.sum @@ -406,5 +406,5 @@ sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= stathat.com/c/consistent v1.0.0 h1:ezyc51EGcRPJUxfHGSgJjWzJdj3NiMU9pNfLNGiXV0c= stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0= -volcano.sh/apis v1.10.0-alpha.0.0.20240904072435-17826d64a144 h1:X+HAVl9WcV+hXkmXnkfs4ikaBeAEoH6V+2Wxrb3j4Vs= -volcano.sh/apis v1.10.0-alpha.0.0.20240904072435-17826d64a144/go.mod h1:z8hhFZ2qcUMR1JIjVYmBqL98CVaXNzsQAcqKiytQW9s= +volcano.sh/apis v1.10.0 h1:Z9eLwibQmhpFmYGLWxjsTWwsYeTEKvvjFcLptmP2qxE= +volcano.sh/apis v1.10.0/go.mod h1:z8hhFZ2qcUMR1JIjVYmBqL98CVaXNzsQAcqKiytQW9s= diff --git a/hack/check-generated-yaml.sh b/hack/check-generated-yaml.sh index f3ea3e801a..41bfe3e373 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-latest.yaml ; then +if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-v1.10.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=latest RELEASE_DIR=installer \ - && mv ${VK_ROOT}/installer/volcano-latest.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update" + echo "please run 'make generate-yaml TAG=v1.10.0 RELEASE_DIR=installer \ + && mv ${VK_ROOT}/installer/volcano-v1.10.0.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 93188b2dfa..69f6822dbb 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.5" +version: "1.10.0" 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/config/volcano-scheduler.conf b/installer/helm/chart/volcano/config/volcano-scheduler.conf index d8e26a26d8..1bf55d4142 100644 --- a/installer/helm/chart/volcano/config/volcano-scheduler.conf +++ b/installer/helm/chart/volcano/config/volcano-scheduler.conf @@ -10,6 +10,6 @@ tiers: - name: drf enablePreemptable: false - name: predicates - - name: proportion + - name: capacity - name: nodeorder - name: binpack diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml index e7050f7071..5cbccf0e7d 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: "Always" - image_tag_version: "latest" + image_tag_version: "v1.10.0" admission_port: 8443 image_registry: "docker.io" custom: diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml index 6ebe086dce..6e48e69dde 100644 --- a/installer/volcano-development.yaml +++ b/installer/volcano-development.yaml @@ -147,7 +147,7 @@ spec: - --port=8443 - -v=4 - 2>&1 - image: docker.io/volcanosh/vc-webhook-manager:latest + image: docker.io/volcanosh/vc-webhook-manager:v1.10.0 imagePullPolicy: Always name: admission volumeMounts: @@ -231,7 +231,7 @@ spec: restartPolicy: Never containers: - name: main - image: docker.io/volcanosh/vc-webhook-manager:latest + image: docker.io/volcanosh/vc-webhook-manager:v1.10.0 imagePullPolicy: Always command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace", "volcano-system", "--secret", "volcano-admission-secret"] @@ -4352,7 +4352,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: volcano-controllers - image: docker.io/volcanosh/vc-controller-manager:latest + image: docker.io/volcanosh/vc-controller-manager:v1.10.0 args: - --logtostderr - --enable-healthz=true @@ -4388,7 +4388,7 @@ data: - name: drf enablePreemptable: false - name: predicates - - name: proportion + - name: capacity - name: nodeorder - name: binpack --- @@ -4523,7 +4523,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: volcano-scheduler - image: docker.io/volcanosh/vc-scheduler:latest + image: docker.io/volcanosh/vc-scheduler:v1.10.0 args: - --logtostderr - --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf diff --git a/installer/volcano-monitoring-latest.yaml b/installer/volcano-monitoring-v1.10.0.yaml similarity index 100% rename from installer/volcano-monitoring-latest.yaml rename to installer/volcano-monitoring-v1.10.0.yaml