Merge pull request #4335 from Monokaix/1.12

volcano-sh-bot · web-flow · commit d24c04ca1a28 · 2025-05-31T11:09:52.000+08:00
Bump image to v1.12.0
diff --git 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.12.0 generate-yaml
           make verify-generated-yaml
           sudo make unit-test
         working-directory: ./src/github.com/${{ github.repository }}
diff --git a/.github/workflows/e2e_parallel_jobs.yaml b/.github/workflows/e2e_parallel_jobs.yaml
@@ -15,7 +15,7 @@ jobs:
   e2e_parallel_jobs:
     runs-on: ubuntu-24.04
     name: E2E about Parallel Jobs
-    timeout-minutes: 40
+    timeout-minutes: 50
     steps:
       - name: Install Go
         uses: actions/setup-go@v5
diff --git a/.github/workflows/e2e_scheduling_actions.yaml b/.github/workflows/e2e_scheduling_actions.yaml
@@ -11,7 +11,7 @@ jobs:
   e2e_scheduling_actions:
     runs-on: ubuntu-24.04
     name: E2E about Scheduling Actions
-    timeout-minutes: 40
+    timeout-minutes: 50
     steps:
       - name: Install Go
         uses: actions/setup-go@v5
diff --git a/.github/workflows/e2e_scheduling_basic.yaml b/.github/workflows/e2e_scheduling_basic.yaml
@@ -11,7 +11,7 @@ jobs:
   e2e_scheduling_basic:
     runs-on: ubuntu-24.04
     name: E2E about Basic Scheduling
-    timeout-minutes: 40
+    timeout-minutes: 50
     steps:
       - name: Install Go
         uses: actions/setup-go@v5
diff --git a/.github/workflows/e2e_sequence.yaml b/.github/workflows/e2e_sequence.yaml
@@ -11,7 +11,7 @@ jobs:
   e2e_sequence:
     runs-on: ubuntu-24.04
     name: E2E about Sequence
-    timeout-minutes: 40
+    timeout-minutes: 50
     steps:
       - name: Install Go
         uses: actions/setup-go@v5
diff --git a/.github/workflows/e2e_spark.yaml b/.github/workflows/e2e_spark.yaml
@@ -76,9 +76,9 @@ jobs:
     - name: Build lastest volcano images
       run: |
         eval $(minikube docker-env)
-        make TAG=latest update-development-yaml
+        make TAG=v1.12.0 update-development-yaml
         sed -i 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' installer/volcano-development.yaml
-        make TAG=latest images
+        make TAG=v1.12.0 images
         docker images | grep volcano
         cat ./installer/volcano-development.yaml  | grep image:
         minikube kubectl -- replace --force -f ./installer/volcano-development.yaml
diff --git a/.github/workflows/e2e_vcctl.yaml b/.github/workflows/e2e_vcctl.yaml
@@ -11,7 +11,7 @@ jobs:
   e2e_vcctl:
     runs-on: ubuntu-24.04
     name: E2E about Volcano CLI
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Install Go
         uses: actions/setup-go@v5
diff --git a/Makefile b/Makefile
@@ -203,9 +203,9 @@ 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
-	mv installer/volcano-agent-latest.yaml installer/volcano-agent-development.yaml
+	make generate-yaml TAG=v1.12.0 RELEASE_DIR=installer
+	mv installer/volcano-v1.12.0.yaml installer/volcano-development.yaml
+	mv installer/volcano-agent-v1.12.0.yaml installer/volcano-agent-development.yaml
 
 mod-download-go:
 	@-GOFLAGS="-mod=readonly" find -name go.mod -execdir go mod download \;
diff --git 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.12.0
 GitSHA=`git rev-parse HEAD`
 Date=`date "+%Y-%m-%d %H:%M:%S"`
-RELEASE_VER=latest
+RELEASE_VER=v1.12.0
 OPEN_EULER_IMAGE_TAG ?= 22.03-lts-sp2
 LD_FLAGS="\
     -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
diff --git a/README.md b/README.md
@@ -171,8 +171,8 @@ Please follow the guide [Volcano Agent](https://volcano.sh/en/docs/colocation) t
 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.12.0 generate-yaml
+kubectl create -f _output/release/volcano-monitoring-v1.12.0.yaml
 ```
 
 ### Install dashboard
@@ -182,14 +182,15 @@ Please follow the guide [Volcano Dashboard](https://github.com/volcano-sh/dashbo
 ## 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 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 | Kubernetes 1.29 |Kubernetes 1.30 |Kubernetes 1.31 |Kubernetes 1.32 |
-|-----------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|---------------|--------------|---------------|
-| Volcano v1.6          | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | -               | -               | -               | -               | -               | -               |-              |-             |-              |
-| Volcano v1.7          | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | -               |_              |_             |-              |
-| Volcano v1.8          | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | -               |-              |_             |-              |
-| Volcano v1.9          | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |-              |_             |-              |
-| Volcano v1.10         | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |✓              |_             |-              |
-| Volcano v1.11         | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |✓              |✓             |-              |
-| Volcano HEAD (master) | -               | -               | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |✓              |✓             |✓              |
+|-----------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|---------------|--------------|--------------|
+| Volcano v1.6          | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | -               | -               | -               | -               | -               | -               |-              |-             |-             |
+| Volcano v1.7          | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | -               |_              |_             |-             |
+| Volcano v1.8          | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | -               |-              |_             |-             |
+| Volcano v1.9          | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |-              |_             |-             |
+| Volcano v1.10         | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |✓              |_             |-             |
+| Volcano v1.11         | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |✓              |✓             |-             |
+| Volcano v1.12         | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |✓              |✓             |✓             |
+| Volcano HEAD (master) | -               | -               | -               | -               | -               | -               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               | ✓               |✓              |✓             |✓             |
 
 Key:
 * `✓` Volcano and the Kubernetes version are exactly compatible.
diff --git a/go.mod b/go.mod
@@ -49,7 +49,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.13.0
 	sigs.k8s.io/yaml v1.4.0
 	stathat.com/c/consistent v1.0.0
-	volcano.sh/apis v1.11.1-0.20250526091449-59e96f6abe4f
+	volcano.sh/apis v1.12.0
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -528,5 +528,5 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 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.11.1-0.20250526091449-59e96f6abe4f h1:3CLus5h9cv42O6VgbJxA2bFskauMQJKMxJhKTKSdGNc=
-volcano.sh/apis v1.11.1-0.20250526091449-59e96f6abe4f/go.mod h1:0XNNnIOevJSYNiXRmwhXUrYCcCcWcBeTY0nxrlkk03A=
+volcano.sh/apis v1.12.0 h1:Z6f8+0r9Zf5vPkLHaJzsk1PppopYusArH3L7CANSADQ=
+volcano.sh/apis v1.12.0/go.mod h1:0XNNnIOevJSYNiXRmwhXUrYCcCcWcBeTY0nxrlkk03A=
diff --git a/hack/check-generated-yaml.sh b/hack/check-generated-yaml.sh
@@ -20,7 +20,7 @@ set -o pipefail
 
 VK_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/..
 export RELEASE_FOLDER=${VK_ROOT}/${RELEASE_DIR}
-export RELEASE_TAG=${RELEASE_TAG:-"latest"}
+export RELEASE_TAG=${RELEASE_TAG:-"v1.12.0"}
 
 if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-${RELEASE_TAG}.yaml ; then
 	{
diff --git 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.12.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/values.yaml b/installer/helm/chart/volcano/values.yaml
@@ -8,7 +8,7 @@ basic:
   scheduler_config_file: "config/volcano-scheduler.conf"
   image_pull_secret: ""
   image_pull_policy: "Always"
-  image_tag_version: "latest"
+  image_tag_version: "v1.12.0"
   admission_port: 8443
   image_registry: "docker.io"
 custom:
diff --git a/installer/volcano-agent-development.yaml b/installer/volcano-agent-development.yaml
@@ -131,7 +131,7 @@ spec:
             type: File
       initContainers:
         - name: volcano-agent-init
-          image: docker.io/volcanosh/vc-agent:latest
+          image: docker.io/volcanosh/vc-agent:v1.12.0
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:
@@ -162,7 +162,7 @@ spec:
           imagePullPolicy: Always
       containers:
         - name: volcano-agent
-          image: docker.io/volcanosh/vc-agent:latest
+          image: docker.io/volcanosh/vc-agent:v1.12.0
           securityContext:
             capabilities:
               add:
diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml
@@ -152,7 +152,7 @@ spec:
             - --port=8443
             - -v=4
             - 2>&1
-          image: docker.io/volcanosh/vc-webhook-manager:latest
+          image: docker.io/volcanosh/vc-webhook-manager:v1.12.0
           imagePullPolicy: Always
           name: admission
           volumeMounts:
@@ -250,7 +250,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: main
-          image: docker.io/volcanosh/vc-webhook-manager:latest
+          image: docker.io/volcanosh/vc-webhook-manager:v1.12.0
           imagePullPolicy: Always
           command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace",
                     "volcano-system", "--secret", "volcano-admission-secret"]
@@ -4549,7 +4549,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.12.0
           args:
             - --logtostderr
             - --enable-healthz=true
@@ -4757,7 +4757,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: volcano-scheduler
-          image: docker.io/volcanosh/vc-scheduler:latest
+          image: docker.io/volcanosh/vc-scheduler:v1.12.0
           args:
             - --logtostderr
             - --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf
diff --git a/installer/volcano-monitoring-v1.12.0.yaml b/installer/volcano-monitoring-v1.12.0.yaml
