test

.github/workflows/services-pr-check.yml

@@ -70,6 +70,10 @@
           with:
             kubelogin-version: 'v0.1.3'
 
+        - name: 'Install helm diff'
+          run: |
+            helm plugin install https://github.com/databus23/helm-diff
+
         - name: 'Deploy Frontend'
           env: 
             PRINCIPAL_ID: ${{ secrets.GHA_PRINCIPAL_ID }}

frontend/Makefile

@@ -1,4 +1,5 @@
 -include ../setup-env.mk
+-include ../helm-cmd.mk
 
 ifndef COMMIT
 COMMIT := $(shell git rev-parse --short=7 HEAD)
@@ -52,7 +53,7 @@ deploy:
 	TENANT_ID=$(shell az account show --query tenantId --output tsv) && \
 	kubectl create namespace aro-hcp --dry-run=client -o json | kubectl apply -f - && \
 	kubectl label namespace aro-hcp "istio.io/rev=$${ISTO_VERSION}" --overwrite=true && \
-	helm diff --install ${HELM_DRY_RUN} aro-hcp-frontend-dev \
+	${HELM_CMD} aro-hcp-frontend-dev \
 		deploy/helm/frontend/ \
 		--set azure.clientId=$${SECRET_STORE_MI_CLIENT_ID} \
 		--set azure.tenantId=$${TENANT_ID} \

frontend/pipeline.yaml

@@ -11,8 +11,8 @@ resourceGroups:
     command: make deploy
     dryRun:
       variables:
-        - name: HELM_DRY_RUN
-          value: "--suppress-secrets"
+        - name: DRY_RUN
+          value: "true"
     variables:
     - name: ARO_HCP_IMAGE_ACR
       configRef: svcAcrName

helm-cmd.mk

@@ -0,0 +1,5 @@
+ifdef DRY_RUN
+HELM_CMD ?= helm diff --install --suppress-secrets
+else
+HELM_CMD ?= helm upgrade --install
+endif

run_pipeline.sh

@@ -111,7 +111,6 @@ fi
 
 make -s -C ${PROJECT_ROOT_DIR}/tooling/templatize templatize
 TEMPLATIZE="${PROJECT_ROOT_DIR}/tooling/templatize/templatize"
-helm plugin install https://github.com/databus23/helm-diff
 
 CONFIG_FILE=${CONFIG_FILE:-${PROJECT_ROOT_DIR}/config/config.yaml}
 $TEMPLATIZE pipeline run \