From bffe99c39d4ceeb48d6abd97b75f0f6ed76101e0 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 27 Oct 2021 11:51:26 -0600 Subject: [PATCH] helm: add appversion property to the charts The appVersion should be set to the version of the application. Since the helm charts are built by Rook in the same release version as Rook itself, the version and appVersion values will be the same. Signed-off-by: Travis Nielsen --- Documentation/helm-operator.md | 3 +-- build/makelib/helm.mk | 2 +- cluster/charts/rook-ceph-cluster/Chart.yaml | 1 + cluster/charts/rook-ceph/Chart.yaml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md index 4629f35ed..9ae2a5879 100644 --- a/Documentation/helm-operator.md +++ b/Documentation/helm-operator.md @@ -50,8 +50,7 @@ To deploy from a local build from your development environment: ```console cd cluster/charts/rook-ceph -kubectl create namespace rook-ceph -helm install --namespace rook-ceph rook-ceph . +helm install --create-namespace --namespace rook-ceph rook-ceph . ``` ## Uninstalling the Chart diff --git a/build/makelib/helm.mk b/build/makelib/helm.mk index e11c9e2d4..1163410f1 100644 --- a/build/makelib/helm.mk +++ b/build/makelib/helm.mk @@ -42,7 +42,7 @@ $(HELM_OUTPUT_DIR)/$(1)-$(VERSION).tgz: $(HELM) $(HELM_OUTPUT_DIR) $(shell find @cp -aL $(HELM_CHARTS_DIR)/$(1) $(OUTPUT_DIR) @$(SED_IN_PLACE) 's|VERSION|$(VERSION)|g' $(OUTPUT_DIR)/$(1)/values.yaml @$(HELM) lint $(abspath $(OUTPUT_DIR)/$(1)) --set image.tag=$(VERSION) - @$(HELM) package --version $(VERSION) -d $(HELM_OUTPUT_DIR) $(abspath $(OUTPUT_DIR)/$(1)) + @$(HELM) package --version $(VERSION) --app-version $(VERSION) -d $(HELM_OUTPUT_DIR) $(abspath $(OUTPUT_DIR)/$(1)) $(HELM_INDEX): $(HELM_OUTPUT_DIR)/$(1)-$(VERSION).tgz endef $(foreach p,$(HELM_CHARTS),$(eval $(call helm.chart,$(p)))) diff --git a/cluster/charts/rook-ceph-cluster/Chart.yaml b/cluster/charts/rook-ceph-cluster/Chart.yaml index eafcd6b47..4f142d013 100644 --- a/cluster/charts/rook-ceph-cluster/Chart.yaml +++ b/cluster/charts/rook-ceph-cluster/Chart.yaml @@ -2,6 +2,7 @@ apiVersion: v2 description: Manages a single Ceph cluster namespace for Rook name: rook-ceph-cluster version: 0.0.1 +appVersion: 0.0.1 icon: https://rook.io/images/rook-logo.svg sources: - https://github.com/rook/rook diff --git a/cluster/charts/rook-ceph/Chart.yaml b/cluster/charts/rook-ceph/Chart.yaml index 340176a3d..9479b8674 100644 --- a/cluster/charts/rook-ceph/Chart.yaml +++ b/cluster/charts/rook-ceph/Chart.yaml @@ -2,6 +2,7 @@ apiVersion: v2 description: File, Block, and Object Storage Services for your Cloud-Native Environment name: rook-ceph version: 0.0.1 +appVersion: 0.0.1 icon: https://rook.io/images/rook-logo.svg sources: - https://github.com/rook/rook