Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump image to v1.10.0 #3721

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,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.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
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 @@ -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
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,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.10/installer/volcano-development.yaml
```

Enjoy! Volcano will create the following resources in `volcano-system` namespace.
Expand Down 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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ require (
sigs.k8s.io/controller-runtime v0.13.0
sigs.k8s.io/yaml v1.3.0
stathat.com/c/consistent v1.0.0
volcano.sh/apis v1.10.0-alpha.0.0.20240904072435-17826d64a144
volcano.sh/apis v1.10.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -406,5 +406,5 @@ sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
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.10.0-alpha.0.0.20240904072435-17826d64a144 h1:X+HAVl9WcV+hXkmXnkfs4ikaBeAEoH6V+2Wxrb3j4Vs=
volcano.sh/apis v1.10.0-alpha.0.0.20240904072435-17826d64a144/go.mod h1:z8hhFZ2qcUMR1JIjVYmBqL98CVaXNzsQAcqKiytQW9s=
volcano.sh/apis v1.10.0 h1:Z9eLwibQmhpFmYGLWxjsTWwsYeTEKvvjFcLptmP2qxE=
volcano.sh/apis v1.10.0/go.mod h1:z8hhFZ2qcUMR1JIjVYmBqL98CVaXNzsQAcqKiytQW9s=
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/config/volcano-scheduler.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ tiers:
- name: drf
enablePreemptable: false
- name: predicates
- name: proportion
- name: capacity
- name: nodeorder
- name: binpack
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
10 changes: 5 additions & 5 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 @@ -4388,7 +4388,7 @@ data:
- name: drf
enablePreemptable: false
- name: predicates
- name: proportion
- name: capacity
- name: nodeorder
- name: binpack
---
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
Loading