Skip to content

Commit

Permalink
Bump image to v1.10.0
Browse files Browse the repository at this point in the history
Signed-off-by: Monokaix <[email protected]>
  • Loading branch information
Monokaix committed Sep 12, 2024
1 parent ecd6b1e commit d416fc3
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code_verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions .github/workflows/e2e_spark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ 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
Expand All @@ -87,7 +87,7 @@ jobs:
kubectl describe node
- name: Upload Spark on K8S integration tests log files
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: spark-on-kubernetes-it-log
path: |
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \;
Expand Down
4 changes: 2 additions & 2 deletions Makefile.def
Original file line number Diff line number Diff line change
@@ -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}' \
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions hack/check-generated-yaml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion installer/helm/chart/volcano/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion installer/helm/chart/volcano/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions installer/volcano-development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.

0 comments on commit d416fc3

Please sign in to comment.