Skip to content

Commit

Permalink
Ensure using helm v2 (#432)
Browse files Browse the repository at this point in the history
  • Loading branch information
Hedingber authored Apr 30, 2020
1 parent 24fb0c7 commit 744209f
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ CHART_NAME := $(if $(CHART_NAME),$(CHART_NAME),chart-name)

.PHONY: stable
stable: WORKDIR = stable
stable: repo-helm update-req package-all index
stable: check-helm repo-helm update-req package-all index
@echo "Done"

.PHONY: stable-specific
stable-specific: WORKDIR = stable
stable-specific: repo-helm update-req-specific package-specific index
stable-specific: check-helm repo-helm update-req-specific package-specific index
@echo "Done"

.PHONY: demo
Expand Down Expand Up @@ -51,7 +51,7 @@ cleanup-tmp-workspace:
@echo "Cleaned up /tmp/v3io-helm-charts"

.PHONY: helm-publish
helm-publish: cleanup-tmp-workspace
helm-publish: check-helm cleanup-tmp-workspace
helm-publish:
@echo "Preparing to release a new index from $(GITHUB_BRANCH)"
@git clone [email protected]:v3io/helm-charts /tmp/v3io-helm-charts
Expand Down Expand Up @@ -116,7 +116,7 @@ helm-publish-incubator-specific:
helm-publish-incubator-specific: cleanup-tmp-workspace

.PHONY: helm-publish-stable-specific
helm-publish-stable-specific: cleanup-tmp-workspace
helm-publish-stable-specific: check-helm cleanup-tmp-workspace
helm-publish-stable-specific:
@echo "Preparing to release a new stable index for $(CHART_NAME) from $(GITHUB_BRANCH)"
@git clone [email protected]:v3io/helm-charts /tmp/v3io-helm-charts
Expand Down Expand Up @@ -221,4 +221,9 @@ check-helm:
echo "Missing helm command" ; \
exit 2 ; \
fi
@HELM_VERSION=$$($(HELM) version --short --client) && \
if [[ "$$HELM_VERSION" != *"v2"* ]]; then \
echo "Helm version must be 2" ; \
exit 2 ; \
fi
@echo "Helm command exists"

0 comments on commit 744209f

Please sign in to comment.