Skip to content

Commit 6167390

Browse files
Merge pull request #3290 from Monokaix/1.8.2-release
Bump image to v1.8.2
2 parents 71e072b + 77701a1 commit 6167390

12 files changed

+21
-471
lines changed

.github/workflows/code_verify.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: |
3636
make lint
3737
make verify
38-
make TAG=v1.8.1 generate-yaml
38+
make TAG=v1.8.2 generate-yaml
3939
make verify-generated-yaml
4040
make unit-test
4141
working-directory: ./src/github.com/${{ github.repository }}

.github/workflows/e2e_spark.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
- name: Build lastest volcano images
6262
run: |
6363
eval $(minikube docker-env)
64-
make TAG=v1.8.1 update-development-yaml
65-
make TAG=v1.8.1 images
64+
make TAG=v1.8.2 update-development-yaml
65+
make TAG=v1.8.2 images
6666
docker images | grep volcano
6767
cat ./installer/volcano-development.yaml | grep image:
6868
minikube kubectl -- replace --force -f ./installer/volcano-development.yaml

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,5 +200,5 @@ CONTROLLER_GEN=$(shell which controller-gen)
200200
endif
201201

202202
update-development-yaml:
203-
make generate-yaml TAG=v1.8.1 RELEASE_DIR=installer
204-
mv installer/volcano-v1.8.1.yaml installer/volcano-development.yaml
203+
make generate-yaml TAG=v1.8.2 RELEASE_DIR=installer
204+
mv installer/volcano-v1.8.2.yaml installer/volcano-development.yaml

Makefile.def

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
# If tag not explicitly set in users default to the git sha.
3-
TAG ?= v1.8.1
3+
TAG ?= v1.8.2
44
GitSHA=`git rev-parse HEAD`
55
Date=`date "+%Y-%m-%d %H:%M:%S"`
6-
RELEASE_VER=v1.8.1
6+
RELEASE_VER=v1.8.2
77
LD_FLAGS=" \
88
-X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
99
-X '${REPO_PATH}/pkg/version.Built=${Date}' \

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Note:
7676
Install Volcano on an existing Kubernetes cluster. This way is both available for x86_64 and arm64 architecture.
7777

7878
```
79-
kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/release-1.8.1/installer/volcano-development.yaml
79+
kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/release-1.8/installer/volcano-development.yaml
8080
```
8181

8282
Enjoy! Volcano will create the following resources in `volcano-system` namespace.
@@ -122,8 +122,8 @@ This way is only available for x86_64 temporarily.
122122
If you want to get prometheus and grafana volcano dashboard after volcano installed, try following commands:
123123

124124
```bash
125-
make TAG=v1.8.1 generate-yaml
126-
kubectl create -f _output/release/volcano-monitoring-v1.8.1.yaml
125+
make TAG=v1.8.2 generate-yaml
126+
kubectl create -f _output/release/volcano-monitoring-v1.8.2.yaml
127127
```
128128

129129
## Kubernetes compatibility

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
sigs.k8s.io/controller-runtime v0.13.0
4040
sigs.k8s.io/yaml v1.3.0
4141
stathat.com/c/consistent v1.0.0
42-
volcano.sh/apis v1.8.0-alpha.0.0.20231028020234-1a5aa81107d7
42+
volcano.sh/apis v1.8.2
4343
)
4444

4545
require (

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1870,5 +1870,5 @@ sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
18701870
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
18711871
stathat.com/c/consistent v1.0.0 h1:ezyc51EGcRPJUxfHGSgJjWzJdj3NiMU9pNfLNGiXV0c=
18721872
stathat.com/c/consistent v1.0.0/go.mod h1:QkzMWzcbB+yQBL2AttO6sgsQS/JSTapcDISJalmCDS0=
1873-
volcano.sh/apis v1.8.0-alpha.0.0.20231028020234-1a5aa81107d7 h1:Meq/5hsE1nK9XFZrU5tLM29RjC2SfXpsfLWaKcRyGbE=
1874-
volcano.sh/apis v1.8.0-alpha.0.0.20231028020234-1a5aa81107d7/go.mod h1:h+xbUpkjfRaHjktAi8h+7JNnNahjwhRSgpN9FUUwNXQ=
1873+
volcano.sh/apis v1.8.2 h1:MJ1EXpdQeKG+XEhb/I3liWgMFzkgW3qCcj6qdhTuvfA=
1874+
volcano.sh/apis v1.8.2/go.mod h1:h+xbUpkjfRaHjktAi8h+7JNnNahjwhRSgpN9FUUwNXQ=

hack/check-generated-yaml.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ set -o pipefail
2121
VK_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/..
2222
export RELEASE_FOLDER=${VK_ROOT}/${RELEASE_DIR}
2323

24-
if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-v1.8.1.yaml ; then
24+
if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-v1.8.2.yaml ; then
2525
{
2626
echo
2727
echo "The Generated yaml is different from the one in installer/volcano-development.yaml"
28-
echo "please run 'make generate-yaml TAG=v1.8.1 RELEASE_DIR=installer \
29-
&& mv ${VK_ROOT}/installer/volcano-v1.8.1.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update"
28+
echo "please run 'make generate-yaml TAG=v1.8.2 RELEASE_DIR=installer \
29+
&& mv ${VK_ROOT}/installer/volcano-v1.8.2.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update"
3030
echo
3131
} >&2
3232
false

installer/helm/chart/volcano/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ basic:
77
scheduler_config_file: "config/volcano-scheduler.conf"
88
image_pull_secret: ""
99
image_pull_policy: "IfNotPresent"
10-
image_tag_version: "v1.8.1"
10+
image_tag_version: "v1.8.2"
1111
admission_port: 8443
1212
custom:
1313
metrics_enable: false

installer/volcano-development.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ spec:
150150
- --port=8443
151151
- -v=4
152152
- 2>&1
153-
image: volcanosh/vc-webhook-manager:v1.8.1
153+
image: volcanosh/vc-webhook-manager:v1.8.2
154154
imagePullPolicy: IfNotPresent
155155
name: admission
156156
volumeMounts:
@@ -185,7 +185,7 @@ spec:
185185
restartPolicy: Never
186186
containers:
187187
- name: main
188-
image: volcanosh/vc-webhook-manager:v1.8.1
188+
image: volcanosh/vc-webhook-manager:v1.8.2
189189
imagePullPolicy: IfNotPresent
190190
command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace",
191191
"volcano-system", "--secret", "volcano-admission-secret"]
@@ -3923,7 +3923,7 @@ spec:
39233923
priorityClassName: system-cluster-critical
39243924
containers:
39253925
- name: volcano-controllers
3926-
image: volcanosh/vc-controller-manager:v1.8.1
3926+
image: volcanosh/vc-controller-manager:v1.8.2
39273927
args:
39283928
- --logtostderr
39293929
- --enable-healthz=true
@@ -4091,7 +4091,7 @@ spec:
40914091
priorityClassName: system-cluster-critical
40924092
containers:
40934093
- name: volcano-scheduler
4094-
image: volcanosh/vc-scheduler:v1.8.1
4094+
image: volcanosh/vc-scheduler:v1.8.2
40954095
args:
40964096
- --logtostderr
40974097
- --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf

0 commit comments

Comments
 (0)