Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
Volcano Bot
|
f114117198 | |
Monokaix
|
b06564cb8f |
|
|
@ -35,7 +35,7 @@ jobs:
|
|||
run: |
|
||||
make lint
|
||||
make verify
|
||||
make TAG=latest generate-yaml
|
||||
make TAG=v1.11.0 generate-yaml
|
||||
make verify-generated-yaml
|
||||
sudo make unit-test
|
||||
working-directory: ./src/github.com/${{ github.repository }}
|
||||
|
|
|
|||
|
|
@ -76,12 +76,11 @@ jobs:
|
|||
- name: Build lastest volcano images
|
||||
run: |
|
||||
eval $(minikube docker-env)
|
||||
make TAG=latest update-development-yaml
|
||||
sed -i 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' installer/volcano-development.yaml
|
||||
make TAG=latest images
|
||||
make TAG=v1.11.0 update-development-yaml
|
||||
make TAG=v1.11.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
|
||||
|
|
|
|||
5
Makefile
5
Makefile
|
|
@ -199,8 +199,9 @@ 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.11.0 RELEASE_DIR=installer
|
||||
mv installer/volcano-v1.11.0.yaml installer/volcano-development.yaml
|
||||
mv installer/volcano-agent-v1.11.0.yaml installer/volcano-agent-development.yaml
|
||||
|
||||
mod-download-go:
|
||||
@-GOFLAGS="-mod=readonly" find -name go.mod -execdir go mod download \;
|
||||
|
|
|
|||
|
|
@ -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.11.0
|
||||
GitSHA=`git rev-parse HEAD`
|
||||
Date=`date "+%Y-%m-%d %H:%M:%S"`
|
||||
RELEASE_VER=latest
|
||||
RELEASE_VER=v1.11.0
|
||||
OPEN_EULER_IMAGE_TAG ?= 22.03-lts-sp2
|
||||
LD_FLAGS=" \
|
||||
-X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
|
||||
|
|
|
|||
|
|
@ -85,7 +85,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.11/installer/volcano-development.yaml
|
||||
```
|
||||
|
||||
Enjoy! Volcano will create the following resources in `volcano-system` namespace.
|
||||
|
|
@ -149,8 +149,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.11.0 generate-yaml
|
||||
kubectl create -f _output/release/volcano-monitoring-v1.11.0.yaml
|
||||
```
|
||||
|
||||
### Install dashboard
|
||||
|
|
@ -166,6 +166,7 @@ Please follow the guide [Volcano Dashboard](https://github.com/volcano-sh/dashbo
|
|||
| Volcano v1.8 | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - |- |_ |
|
||||
| Volcano v1.9 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |- |_ |
|
||||
| Volcano v1.10 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |_ |
|
||||
| Volcano v1.11 | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |✓ |
|
||||
| Volcano HEAD (master) | - | - | - | - | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ |✓ |
|
||||
|
||||
Key:
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ You can set different qos levels to identify workloads of different priorities,
|
|||
Follow the [installation guide](https://github.com/volcano-sh/volcano?tab=readme-ov-file#quick-start-guide) to install volcano first, and then install volcano agent via kubectl, this way is both available for x86_64 and arm64 architecture.
|
||||
|
||||
```shell
|
||||
kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/master/installer/volcano-agent-development.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/release-1.11/installer/volcano-agent-development.yaml
|
||||
```
|
||||
|
||||
Check volcano components including agent runs successfully.
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -46,7 +46,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.10.0-alpha.0.0.20241210014034-bf27f4e986d0
|
||||
volcano.sh/apis v1.11.0
|
||||
)
|
||||
|
||||
require (
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -510,5 +510,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.10.0-alpha.0.0.20241210014034-bf27f4e986d0 h1:qcQNg8mEsXU+7YYX6hff9JT+jDj2RJB4aEGwOoWwjBY=
|
||||
volcano.sh/apis v1.10.0-alpha.0.0.20241210014034-bf27f4e986d0/go.mod h1:FOdmG++9+8lgENJ9XXDh+O3Jcb9YVRnlMSpgIh3NSVI=
|
||||
volcano.sh/apis v1.11.0 h1:Z5ZXxxgUNfXv1OhfVXXfGPN7StoSsozQM+8CAPoNWY8=
|
||||
volcano.sh/apis v1.11.0/go.mod h1:FOdmG++9+8lgENJ9XXDh+O3Jcb9YVRnlMSpgIh3NSVI=
|
||||
|
|
|
|||
|
|
@ -21,23 +21,23 @@ 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.11.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.11.0 RELEASE_DIR=installer \
|
||||
&& mv ${VK_ROOT}/installer/volcano-v1.11.0.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update"
|
||||
echo
|
||||
} >&2
|
||||
false
|
||||
fi
|
||||
|
||||
if ! diff ${VK_ROOT}/installer/volcano-agent-development.yaml ${RELEASE_FOLDER}/volcano-agent-latest.yaml ; then
|
||||
if ! diff ${VK_ROOT}/installer/volcano-agent-development.yaml ${RELEASE_FOLDER}/volcano-agent-v1.11.0.yaml ; then
|
||||
{
|
||||
echo
|
||||
echo "The Generated yaml is different from the one in installer/volcano-agent-development.yaml"
|
||||
echo "please run 'make generate-yaml TAG=latest RELEASE_DIR=installer \
|
||||
&& mv ${VK_ROOT}/installer/volcano-agent-latest.yaml ${VK_ROOT}/installer/volcano-agent-development.yaml' to update"
|
||||
echo "please run 'make generate-yaml TAG=v1.11.0 RELEASE_DIR=installer \
|
||||
&& mv ${VK_ROOT}/installer/volcano-agent-v1.11.0.yaml ${VK_ROOT}/installer/volcano-agent-development.yaml' to update"
|
||||
echo
|
||||
} >&2
|
||||
false
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
apiVersion: v1
|
||||
description: A Helm chart for Volcano
|
||||
name: volcano
|
||||
version: "1.5"
|
||||
version: "1.11.0"
|
||||
appVersion: "0.1"
|
||||
icon: https://raw.githubusercontent.com/volcano-sh/charts/master/docs/images/volcano-logo.png
|
||||
home: https://volcano.sh
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ basic:
|
|||
scheduler_config_file: "config/volcano-scheduler.conf"
|
||||
image_pull_secret: ""
|
||||
image_pull_policy: "Always"
|
||||
image_tag_version: "latest"
|
||||
image_tag_version: "v1.11.0"
|
||||
admission_port: 8443
|
||||
image_registry: "docker.io"
|
||||
custom:
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ spec:
|
|||
type: File
|
||||
initContainers:
|
||||
- name: volcano-agent-init
|
||||
image: docker.io/volcanosh/vc-agent:latest
|
||||
image: docker.io/volcanosh/vc-agent:v1.11.0
|
||||
command:
|
||||
- /bin/sh
|
||||
- '-c'
|
||||
|
|
@ -147,7 +147,7 @@ spec:
|
|||
imagePullPolicy: Always
|
||||
containers:
|
||||
- name: volcano-agent
|
||||
image: docker.io/volcanosh/vc-agent:latest
|
||||
image: docker.io/volcanosh/vc-agent:v1.11.0
|
||||
command:
|
||||
- /bin/sh
|
||||
- '-c'
|
||||
|
|
|
|||
|
|
@ -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.11.0
|
||||
imagePullPolicy: Always
|
||||
name: admission
|
||||
volumeMounts:
|
||||
|
|
@ -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.11.0
|
||||
imagePullPolicy: Always
|
||||
command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace",
|
||||
"volcano-system", "--secret", "volcano-admission-secret"]
|
||||
|
|
@ -4457,7 +4457,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.11.0
|
||||
args:
|
||||
- --logtostderr
|
||||
- --enable-healthz=true
|
||||
|
|
@ -4634,7 +4634,7 @@ spec:
|
|||
priorityClassName: system-cluster-critical
|
||||
containers:
|
||||
- name: volcano-scheduler
|
||||
image: docker.io/volcanosh/vc-scheduler:latest
|
||||
image: docker.io/volcanosh/vc-scheduler:v1.11.0
|
||||
args:
|
||||
- --logtostderr
|
||||
- --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf
|
||||
|
|
|
|||
Loading…
Reference in New Issue