Skip to content

Commit

Permalink
Merge pull request #3475 from Monokaix/v1.9.0
Browse files Browse the repository at this point in the history
Bump image to v1.9.0
  • Loading branch information
volcano-sh-bot authored May 20, 2024
2 parents 74ccc8c + 0129e51 commit 7f73c6e
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 27 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.9.0 generate-yaml
make verify-generated-yaml
make unit-test
working-directory: ./src/github.com/${{ github.repository }}
8 changes: 4 additions & 4 deletions .github/workflows/e2e_spark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0 update-development-yaml
make TAG=v1.9.0 images
docker images | grep volcano
cat ./installer/volcano-development.yaml | grep image:
minikube kubectl -- replace --force -f ./installer/volcano-development.yaml
cat ./installer/volcano-development.yaml | grep "image: "
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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,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.9.0 RELEASE_DIR=installer
mv installer/volcano-v1.9.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.9.0
GitSHA=`git rev-parse HEAD`
Date=`date "+%Y-%m-%d %H:%M:%S"`
RELEASE_VER=latest
RELEASE_VER=v1.9.0
LD_FLAGS=" \
-X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
-X '${REPO_PATH}/pkg/version.Built=${Date}' \
Expand Down
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,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.9/installer/volcano-development.yaml
```

Enjoy! Volcano will create the following resources in `volcano-system` namespace.
Expand Down Expand Up @@ -140,18 +140,19 @@ 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.9.0 generate-yaml
kubectl create -f _output/release/volcano-monitoring-v1.9.0.yaml
```

## 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 |
|------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
| Volcano v1.6 |||||||| - | - | - | - | - | - |
| Volcano v1.7 | - | - ||||||||||| - |
| Volcano v1.8 | - | - ||||||||||| - |
| Volcano HEAD (master) | - | - | - | - ||||||||||
| | 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 |
|-----------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
| Volcano v1.6 |||||||| - | - | - | - | - | - |
| Volcano v1.7 | - | - ||||||||||| - |
| Volcano v1.8 | - | - ||||||||||| - |
| Volcano v1.9 | - | - | - |||||||||||
| Volcano HEAD (master) | - | - | - | - ||||||||||

Key:
* `` Volcano and the Kubernetes version are exactly compatible.
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.9.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.9.0 RELEASE_DIR=installer \
&& mv ${VK_ROOT}/installer/volcano-v1.9.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.9.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.9.0"
admission_port: 8443
custom:
metrics_enable: false
Expand Down
8 changes: 4 additions & 4 deletions installer/volcano-development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ spec:
- --port=8443
- -v=4
- 2>&1
image: volcanosh/vc-webhook-manager:latest
image: volcanosh/vc-webhook-manager:v1.9.0
imagePullPolicy: Always
name: admission
volumeMounts:
Expand Down Expand Up @@ -185,7 +185,7 @@ spec:
restartPolicy: Never
containers:
- name: main
image: volcanosh/vc-webhook-manager:latest
image: volcanosh/vc-webhook-manager:v1.9.0
imagePullPolicy: Always
command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace",
"volcano-system", "--secret", "volcano-admission-secret"]
Expand Down Expand Up @@ -4033,7 +4033,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: volcano-controllers
image: volcanosh/vc-controller-manager:latest
image: volcanosh/vc-controller-manager:v1.9.0
args:
- --logtostderr
- --enable-healthz=true
Expand Down Expand Up @@ -4201,7 +4201,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: volcano-scheduler
image: volcanosh/vc-scheduler:latest
image: volcanosh/vc-scheduler:v1.9.0
args:
- --logtostderr
- --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf
Expand Down
File renamed without changes.

0 comments on commit 7f73c6e

Please sign in to comment.