From c9cb0d574ed018dc3a9d00722de744762272bf7a Mon Sep 17 00:00:00 2001 From: Monokaix Date: Tue, 21 Jan 2025 21:14:45 +0800 Subject: [PATCH] Bump image to v1.11.0-network-topology-preview.0 Signed-off-by: Monokaix --- .github/workflows/code_verify.yaml | 2 +- .github/workflows/e2e_spark.yaml | 7 +++---- Makefile | 5 +++-- Makefile.def | 4 ++-- README.md | 6 +++--- docs/design/colocation/Overview.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/check-generated-yaml.sh | 12 ++++++------ installer/helm/chart/volcano/Chart.yaml | 2 +- installer/helm/chart/volcano/values.yaml | 2 +- installer/volcano-agent-development.yaml | 4 ++-- installer/volcano-development.yaml | 8 ++++---- ...nitoring-v1.11.0-network-topology-preview.0.yaml} | 0 14 files changed, 30 insertions(+), 30 deletions(-) rename installer/{volcano-monitoring-latest.yaml => volcano-monitoring-v1.11.0-network-topology-preview.0.yaml} (100%) diff --git a/.github/workflows/code_verify.yaml b/.github/workflows/code_verify.yaml index eb9baf4bdd..1359c65b0d 100644 --- a/.github/workflows/code_verify.yaml +++ b/.github/workflows/code_verify.yaml @@ -35,7 +35,7 @@ jobs: run: | make lint make verify - make TAG=latest generate-yaml + make TAG=v1.11.0-network-topology-preview.0 generate-yaml make verify-generated-yaml sudo make unit-test working-directory: ./src/github.com/${{ github.repository }} diff --git a/.github/workflows/e2e_spark.yaml b/.github/workflows/e2e_spark.yaml index 347b070113..0e888e36a5 100644 --- a/.github/workflows/e2e_spark.yaml +++ b/.github/workflows/e2e_spark.yaml @@ -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-network-topology-preview.0 update-development-yaml + make TAG=v1.11.0-network-topology-preview.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 diff --git a/Makefile b/Makefile index 302d52e2c7..9175e95756 100644 --- a/Makefile +++ b/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-network-topology-preview.0 RELEASE_DIR=installer + mv installer/volcano-v1.11.0-network-topology-preview.0.yaml installer/volcano-development.yaml + mv installer/volcano-agent-v1.11.0-network-topology-preview.0.yaml installer/volcano-agent-development.yaml mod-download-go: @-GOFLAGS="-mod=readonly" find -name go.mod -execdir go mod download \; diff --git a/Makefile.def b/Makefile.def index 884bf17480..4f67c529b8 100644 --- a/Makefile.def +++ b/Makefile.def @@ -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-network-topology-preview.0 GitSHA=`git rev-parse HEAD` Date=`date "+%Y-%m-%d %H:%M:%S"` -RELEASE_VER=latest +RELEASE_VER=v1.11.0-network-topology-preview.0 OPEN_EULER_IMAGE_TAG ?= 22.03-lts-sp2 LD_FLAGS=" \ -X '${REPO_PATH}/pkg/version.GitSHA=${GitSHA}' \ diff --git a/README.md b/README.md index 4befc27381..f1aa1446fd 100644 --- a/README.md +++ b/README.md @@ -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/network-topology/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-network-topology-preview.0 generate-yaml +kubectl create -f _output/release/volcano-monitoring-v1.11.0-network-topology-preview.0.yaml ``` ### Install dashboard diff --git a/docs/design/colocation/Overview.md b/docs/design/colocation/Overview.md index 97a9bb675d..992e54b4b0 100644 --- a/docs/design/colocation/Overview.md +++ b/docs/design/colocation/Overview.md @@ -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/network-topology/installer/volcano-agent-development.yaml ``` Check volcano components including agent runs successfully. diff --git a/go.mod b/go.mod index 4f85360b30..1097e565b1 100644 --- a/go.mod +++ b/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.20250120073353-a77979cbcfa0 + volcano.sh/apis v1.11.0-network-topology-preview.0 ) require ( diff --git a/go.sum b/go.sum index 5561866462..e187036900 100644 --- a/go.sum +++ b/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.20250120073353-a77979cbcfa0 h1:ywjTCYnOZOuzlRnD3vFObNS4kBjf/kExm4xRaIXYQQM= -volcano.sh/apis v1.10.0-alpha.0.0.20250120073353-a77979cbcfa0/go.mod h1:FOdmG++9+8lgENJ9XXDh+O3Jcb9YVRnlMSpgIh3NSVI= +volcano.sh/apis v1.11.0-network-topology-preview.0 h1:lUdLoNxgXks/yD5Q5xAkKF4dojSPuuyg2YwxpiXRIVU= +volcano.sh/apis v1.11.0-network-topology-preview.0/go.mod h1:FOdmG++9+8lgENJ9XXDh+O3Jcb9YVRnlMSpgIh3NSVI= diff --git a/hack/check-generated-yaml.sh b/hack/check-generated-yaml.sh index a1a30587fe..42c88d0d18 100755 --- a/hack/check-generated-yaml.sh +++ b/hack/check-generated-yaml.sh @@ -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-network-topology-preview.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-network-topology-preview.0 RELEASE_DIR=installer \ + && mv ${VK_ROOT}/installer/volcano-v1.11.0-network-topology-preview.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-network-topology-preview.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-network-topology-preview.0 RELEASE_DIR=installer \ + && mv ${VK_ROOT}/installer/volcano-agent-v1.11.0-network-topology-preview.0.yaml ${VK_ROOT}/installer/volcano-agent-development.yaml' to update" echo } >&2 false diff --git a/installer/helm/chart/volcano/Chart.yaml b/installer/helm/chart/volcano/Chart.yaml index 93188b2dfa..abed762605 100644 --- a/installer/helm/chart/volcano/Chart.yaml +++ b/installer/helm/chart/volcano/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Volcano name: volcano -version: "1.5" +version: "1.11.0-network-topology-preview.0" appVersion: "0.1" icon: https://raw.githubusercontent.com/volcano-sh/charts/master/docs/images/volcano-logo.png home: https://volcano.sh diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml index b9769907fc..c1a126bbe2 100644 --- a/installer/helm/chart/volcano/values.yaml +++ b/installer/helm/chart/volcano/values.yaml @@ -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-network-topology-preview.0" admission_port: 8443 image_registry: "docker.io" custom: diff --git a/installer/volcano-agent-development.yaml b/installer/volcano-agent-development.yaml index 7b8818510a..26003c3c6c 100644 --- a/installer/volcano-agent-development.yaml +++ b/installer/volcano-agent-development.yaml @@ -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-network-topology-preview.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-network-topology-preview.0 command: - /bin/sh - '-c' diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml index cbfa212de8..bdb12776e6 100644 --- a/installer/volcano-development.yaml +++ b/installer/volcano-development.yaml @@ -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-network-topology-preview.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-network-topology-preview.0 imagePullPolicy: Always command: ["./gen-admission-secret.sh", "--service", "volcano-admission-service", "--namespace", "volcano-system", "--secret", "volcano-admission-secret"] @@ -4469,7 +4469,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-network-topology-preview.0 args: - --logtostderr - --enable-healthz=true @@ -4649,7 +4649,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-network-topology-preview.0 args: - --logtostderr - --scheduler-conf=/volcano.scheduler/volcano-scheduler.conf diff --git a/installer/volcano-monitoring-latest.yaml b/installer/volcano-monitoring-v1.11.0-network-topology-preview.0.yaml similarity index 100% rename from installer/volcano-monitoring-latest.yaml rename to installer/volcano-monitoring-v1.11.0-network-topology-preview.0.yaml