Skip to content

Commit

Permalink
switch to helm3 (#480)
Browse files Browse the repository at this point in the history
  • Loading branch information
zubenkoivan authored Oct 28, 2021
1 parent 83ab3b4 commit 6abad34
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
AZURE_RG_NAME: ${{ secrets.AZURE_DEV_RG_NAME }}
CLUSTER_NAME: ${{ secrets.DEV_CLUSTER_NAME }}
HELM_ENV: dev
HELM_VERSION: ${{ secrets.HELM_VERSION }}
HELM_VERSION: ${{ secrets.HELM3_VERSION }}
CLOUD_PROVIDER: ${{ secrets.CLOUD_PROVIDER_DEV }}
steps:
- name: Checkout commit
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
ARTIFACTORY_HELM_REPO: ${{ secrets.ARTIFACTORY_HELM_REPO }}
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
HELM_VERSION: ${{ secrets.HELM_VERSION }}
HELM_VERSION: ${{ secrets.HELM3_VERSION }}
steps:
- name: Checkout commit
uses: actions/checkout@v2
Expand Down
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,8 @@ azure_k8s_login:
az aks get-credentials --resource-group $(AZURE_RG_NAME) --name $(CLUSTER_NAME)

helm_install:
curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash -s -- -v $(HELM_VERSION)
helm init --client-only
helm plugin install https://github.com/belitre/helm-push-artifactory-plugin
curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash -s -- -v $(HELM_VERSION)
helm plugin install https://github.com/belitre/helm-push-artifactory-plugin --version 1.0.2

docker_push: build
docker tag $(IMAGE) $(CLOUD_IMAGE)
Expand All @@ -112,7 +111,7 @@ helm_deploy: _helm_fetch _helm_expand_vars
helm upgrade $(HELM_CHART) temp_deploy/$(HELM_CHART) \
-f deploy/$(HELM_CHART)/values-$(HELM_ENV).yaml \
--set "image.repository=$(CLOUD_IMAGE_REPO)" \
--namespace platform --install --wait --timeout 600
--namespace platform --install --wait --timeout 600s

artifactory_docker_push: build
docker tag $(IMAGE) $(ARTIFACTORY_IMAGE)
Expand Down
1 change: 1 addition & 0 deletions deploy/platformstorageapi/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
apiVersion: v2
name: platformstorageapi
description: Deploy platformstorageapi
version: 0.0.1
Expand Down

0 comments on commit 6abad34

Please sign in to comment.