volcano-sh
/
volcano
mirror of https://github.com/volcano-sh/volcano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Bump image to v1.12.0" 

This reverts commit 284eaed827.

Signed-off-by: JesseStutler <chenzicong4@huawei.com>
This commit is contained in:
JesseStutler 2025-06-03 09:58:53 +08:00
parent adab22d06a
commit b505c1b310
13 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/code_verify.yaml vendored
View File

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

4
.github/workflows/e2e_spark.yaml vendored
View File

@ -76,9 +76,9 @@ jobs:
- name: Build lastest volcano images
run: |
eval $(minikube docker-env)
make TAG=v1.12.0 update-development-yaml
make TAG=latest update-development-yaml
sed -i 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' installer/volcano-development.yaml
make TAG=v1.12.0 images
make TAG=latest images
docker images | grep volcano
cat ./installer/volcano-development.yaml | grep image:
minikube kubectl -- replace --force -f ./installer/volcano-development.yaml

6
Makefile
View File

@ -203,9 +203,9 @@ CONTROLLER_GEN=$(shell which controller-gen)
endif
update-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
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
mod-download-go:
@-GOFLAGS="-mod=readonly" find -name go.mod -execdir go mod download \;

4
Makefile.def
View File

@ -1,9 +1,9 @@
# If tag not explicitly set in users default to the git sha.
TAG ?= v1.12.0
TAG ?= $(shell git rev-parse --verify HEAD)
GitSHA=`git rev-parse HEAD`
Date=`date "+%Y-%m-%d %H:%M:%S"`
RELEASE_VER=v1.12.0
RELEASE_VER=latest
OPEN_EULER_IMAGE_TAG ?= 22.03-lts-sp2
LD_FLAGS="\
-X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \

4
README.md
View File

@ -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=v1.12.0 generate-yaml
kubectl create -f _output/release/volcano-monitoring-v1.12.0.yaml
make TAG=latest generate-yaml
kubectl create -f _output/release/volcano-monitoring-latest.yaml
```
### Install dashboard

2
go.mod
View File

@ -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.12.0
volcano.sh/apis v1.11.1-0.20250526091449-59e96f6abe4f
)
require (

4
go.sum
View File

@ -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.12.0 h1:Z6f8+0r9Zf5vPkLHaJzsk1PppopYusArH3L7CANSADQ=
volcano.sh/apis v1.12.0/go.mod h1:0XNNnIOevJSYNiXRmwhXUrYCcCcWcBeTY0nxrlkk03A=
volcano.sh/apis v1.11.1-0.20250526091449-59e96f6abe4f h1:3CLus5h9cv42O6VgbJxA2bFskauMQJKMxJhKTKSdGNc=
volcano.sh/apis v1.11.1-0.20250526091449-59e96f6abe4f/go.mod h1:0XNNnIOevJSYNiXRmwhXUrYCcCcWcBeTY0nxrlkk03A=

2
hack/check-generated-yaml.sh
View File

@ -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:-"v1.12.0"}
export RELEASE_TAG=${RELEASE_TAG:-"latest"}
if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-${RELEASE_TAG}.yaml ; then
{

2
installer/helm/chart/volcano/Chart.yaml
View File

@ -1,7 +1,7 @@
apiVersion: v1
description: A Helm chart for Volcano
name: volcano
version: "1.12.0"
version: "1.5"
appVersion: "0.1"
icon: https://raw.githubusercontent.com/volcano-sh/charts/master/docs/images/volcano-logo.png
home: https://volcano.sh

2
installer/helm/chart/volcano/values.yaml
View File

@ -8,7 +8,7 @@ basic:
scheduler_config_file: "config/volcano-scheduler.conf"
image_pull_secret: ""
image_pull_policy: "Always"
image_tag_version: "v1.12.0"
image_tag_version: "latest"
admission_port: 8443
image_registry: "docker.io"
custom:

4
installer/volcano-agent-development.yaml
View File

@ -131,7 +131,7 @@ spec:
type: File
initContainers:
- name: volcano-agent-init
image: docker.io/volcanosh/vc-agent:v1.12.0
image: docker.io/volcanosh/vc-agent:latest
securityContext:
allowPrivilegeEscalation: false
capabilities:
@ -162,7 +162,7 @@ spec:
imagePullPolicy: Always
containers:
- name: volcano-agent
image: docker.io/volcanosh/vc-agent:v1.12.0
image: docker.io/volcanosh/vc-agent:latest
securityContext:
capabilities:
add:

8
installer/volcano-development.yaml
View File

@ -152,7 +152,7 @@ spec:
- --port=8443
- -v=4
- 2>&1
image: docker.io/volcanosh/vc-webhook-manager:v1.12.0
image: docker.io/volcanosh/vc-webhook-manager:latest
imagePullPolicy: Always
name: admission
volumeMounts:
@ -250,7 +250,7 @@ spec:
restartPolicy: Never
containers:
- name: main
image: docker.io/volcanosh/vc-webhook-manager:v1.12.0
image: docker.io/volcanosh/vc-webhook-manager:latest
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:v1.12.0
image: docker.io/volcanosh/vc-controller-manager:latest
args:
- --logtostderr
- --enable-healthz=true
@ -4757,7 +4757,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: volcano-scheduler
image: docker.io/volcanosh/vc-scheduler:v1.12.0
image: docker.io/volcanosh/vc-scheduler:latest
args:
- --logtostderr
- --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf

0
installer/volcano-monitoring-v1.12.0.yaml → installer/volcano-monitoring-latest.yaml
View File