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

update image to v1.7.0 #2636

Merged
merged 1 commit into from
Dec 30, 2022
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=v1.7.0-beta.0 generate-yaml
make TAG=v1.7.0 generate-yaml
make verify-generated-yaml
make unit-test
working-directory: ./src/github.com/${{ github.repository }}
4 changes: 2 additions & 2 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=v1.7.0-beta.0 update-development-yaml
make TAG=v1.7.0-beta.0 images
make TAG=v1.7.0 update-development-yaml
make TAG=v1.7.0 images
docker images | grep volcano
cat ./installer/volcano-development.yaml | grep image:
minikube kubectl -- apply -f ./installer/volcano-development.yaml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Run verify test
run: |
make verify
make TAG=v1.7.0-beta.0 generate-yaml
make TAG=v1.7.0 generate-yaml
make verify-generated-yaml
make unit-test
working-directory: ./src/github.com/${{ github.repository }}
Expand All @@ -48,7 +48,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Daily Release
run: docker buildx create --use && make TAG=v1.7.0-beta.0 RELEASE_VER=v1.7.0-beta.0 DOCKER_USERNAME=${{ secrets.DOCKERHUB_USERNAME }} DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }} CC=/usr/local/musl/bin/musl-gcc DOCKER_PLATFORMS="linux/amd64,linux/arm64" BUILDX_OUTPUT_TYPE=registry release
run: docker buildx create --use && make TAG=v1.7.0 RELEASE_VER=v1.7.0 DOCKER_USERNAME=${{ secrets.DOCKERHUB_USERNAME }} DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }} CC=/usr/local/musl/bin/musl-gcc DOCKER_PLATFORMS="linux/amd64,linux/arm64" BUILDX_OUTPUT_TYPE=registry release
working-directory: ./src/github.com/${{ github.repository }}

- name: Loginout DockerHub
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -191,5 +191,5 @@ CONTROLLER_GEN=$(shell which controller-gen)
endif

update-development-yaml:
make generate-yaml TAG=v1.7.0-beta.0 RELEASE_DIR=installer
mv installer/volcano-v1.7.0-beta.0.yaml installer/volcano-development.yaml
make generate-yaml TAG=v1.7.0 RELEASE_DIR=installer
mv installer/volcano-v1.7.0.yaml installer/volcano-development.yaml
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 ?=v1.7.0-beta.0
TAG ?=v1.7.0
GitSHA=`git rev-parse HEAD`
Date=`date "+%Y-%m-%d %H:%M:%S"`
RELEASE_VER=v1.7.0-beta.0
RELEASE_VER=v1.7.0
LD_FLAGS=" \
-X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \
-X '${REPO_PATH}/pkg/version.Built=${Date}' \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,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=v1.7.0-beta.0 generate-yaml
kubectl create -f _output/release/volcano-monitoring-v1.7.0-beta.0.yaml
make TAG=v1.7.0 generate-yaml
kubectl create -f _output/release/volcano-monitoring-v1.7.0.yaml
```

## Meeting
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-v1.7.0-beta.0.yaml ; then
if ! diff ${VK_ROOT}/installer/volcano-development.yaml ${RELEASE_FOLDER}/volcano-v1.7.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=v1.7.0-beta.0 RELEASE_DIR=installer \
&& mv ${VK_ROOT}/installer/volcano-v1.7.0-beta.0.yaml ${VK_ROOT}/installer/volcano-development.yaml' to update"
echo "please run 'make generate-yaml TAG=v1.7.0 RELEASE_DIR=installer \
&& mv ${VK_ROOT}/installer/volcano-v1.7.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/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
basic:
image_tag_version: "v1.7.0-beta.0"
image_tag_version: "v1.7.0"
controller_image_name: "volcanosh/vc-controller-manager"
scheduler_image_name: "volcanosh/vc-scheduler"
admission_image_name: "volcanosh/vc-webhook-manager"
Expand Down
8 changes: 4 additions & 4 deletions installer/volcano-development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ spec:
- --port=8443
- -v=4
- 2>&1
image: volcanosh/vc-webhook-manager:v1.7.0-beta.0
image: volcanosh/vc-webhook-manager:v1.7.0
imagePullPolicy: IfNotPresent
name: admission
volumeMounts:
Expand Down Expand Up @@ -180,7 +180,7 @@ spec:
restartPolicy: Never
containers:
- name: main
image: volcanosh/vc-webhook-manager:v1.7.0-beta.0
image: volcanosh/vc-webhook-manager:v1.7.0
imagePullPolicy: IfNotPresent
command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace",
"volcano-system", "--secret", "volcano-admission-secret"]
Expand Down Expand Up @@ -8602,7 +8602,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: volcano-controllers
image: volcanosh/vc-controller-manager:v1.7.0-beta.0
image: volcanosh/vc-controller-manager:v1.7.0
args:
- --logtostderr
- --enable-healthz=true
Expand Down Expand Up @@ -8763,7 +8763,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: volcano-scheduler
image: volcanosh/vc-scheduler:v1.7.0-beta.0
image: volcanosh/vc-scheduler:v1.7.0
args:
- --logtostderr
- --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf
Expand Down