Skip to content

Commit

Permalink
Merge pull request kubesphere#4443 from 123liubao/hotfix/fix-version-…
Browse files Browse the repository at this point in the history
…error

fix : modify the version of ks core components
  • Loading branch information
ks-ci-bot authored Nov 22, 2021
2 parents 8005a47 + 08c772c commit 96af77b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.1.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/
Expand Down
2 changes: 1 addition & 1 deletion config/ks-core/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 96af77b

Please sign in to comment.