From 7a27c79f604b98f0107500bad3969d909d0a956a Mon Sep 17 00:00:00 2001 From: 123liubao Date: Fri, 12 Nov 2021 14:09:12 +0800 Subject: [PATCH 1/2] fix : modify the version. Signed-off-by: 123liubao --- Makefile | 2 +- config/ks-core/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a76a13ea4c..8b0a73d6ed 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ container-cross-push: ; $(info $(M)...Begin to build and push.) @ ## Build and helm-package: ; $(info $(M)...Begin to helm-package.) @ ## Helm-package. ls config/crds/ | xargs -i cp -r config/crds/{} config/ks-core/crds/ - helm package config/ks-core --app-version=v3.1.0 --version=0.1.0 -d ./bin + helm package config/ks-core --app-version=v3.2.0 --version=0.1.0 -d ./bin helm-deploy: ; $(info $(M)...Begin to helm-deploy.) @ ## Helm-deploy. ls config/crds/ | xargs -i cp -r config/crds/{} config/ks-core/crds/ diff --git a/config/ks-core/Chart.yaml b/config/ks-core/Chart.yaml index 5912b54c35..2b7d265013 100644 --- a/config/ks-core/Chart.yaml +++ b/config/ks-core/Chart.yaml @@ -12,4 +12,4 @@ version: 0.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "v3.1.0" +appVersion: "v3.2.0" From 08c772ca72e1e8516fb56879828676ef866ce5f4 Mon Sep 17 00:00:00 2001 From: 123liubao Date: Mon, 15 Nov 2021 16:40:23 +0800 Subject: [PATCH 2/2] fix:Add app version parameter. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8b0a73d6ed..dfc608fb9e 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ CRD_OPTIONS ?= "crd:trivialVersions=true" GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 tenant:v1alpha2 devops:v1alpha1 iam:v1alpha2 devops:v1alpha3 cluster:v1alpha1 storage:v1alpha1 auditing:v1alpha1 types:v1beta1 quota:v1alpha2 application:v1alpha1 notification:v2beta1" +# App Version +APP_VERSION = v3.2.0 + # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) GOBIN=$(shell go env GOPATH)/bin @@ -127,7 +130,7 @@ container-cross-push: ; $(info $(M)...Begin to build and push.) @ ## Build and helm-package: ; $(info $(M)...Begin to helm-package.) @ ## Helm-package. ls config/crds/ | xargs -i cp -r config/crds/{} config/ks-core/crds/ - helm package config/ks-core --app-version=v3.2.0 --version=0.1.0 -d ./bin + helm package config/ks-core --app-version=${APP_VERSION} --version=0.1.0 -d ./bin helm-deploy: ; $(info $(M)...Begin to helm-deploy.) @ ## Helm-deploy. ls config/crds/ | xargs -i cp -r config/crds/{} config/ks-core/crds/