From 8c99fa50a9d7807257b360a23d27db4552143993 Mon Sep 17 00:00:00 2001
From: Deac <deac@pixelparasol.com>
Date: Fri, 29 May 2026 13:34:18 -0400
Subject: [PATCH] fix env vars

---
 helm/upgrade/action.yml | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/helm/upgrade/action.yml b/helm/upgrade/action.yml
index 35abb50..e416500 100644
--- a/helm/upgrade/action.yml
+++ b/helm/upgrade/action.yml
@@ -37,26 +37,38 @@ runs:
   steps:
     - name: Helm OCI Login
       shell: sh
+      env:
+        REGISTRY: ${{ inputs.REGISTRY }}
+        REGISTRY_USERNAME: ${{ inputs.REGISTRY_USERNAME }}
+        REGISTRY_TOKEN: ${{ inputs.REGISTRY_TOKEN }}
       run: |
-        echo "${{ inputs.REGISTRY_TOKEN }}" | helm registry login ${{ inputs.REGISTRY }} \
-          --username ${{ inputs.REGISTRY_USERNAME }} \
+        echo "$REGISTRY_TOKEN" | helm registry login "$REGISTRY" \
+          --username "$REGISTRY_USERNAME" \
           --password-stdin
 
     - name: Helm Upgrade
       shell: sh
+      env:
+        DEPLOYMENT_NAME: ${{ inputs.DEPLOYMENT_NAME }}
+        DEPLOYMENT_NAMESPACE: ${{ inputs.DEPLOYMENT_NAMESPACE }}
+        CHART_PATH: ${{ inputs.CHART_PATH }}
+        VALUES_FILE: ${{ inputs.VALUES_FILE }}
+        IMAGE_PATH: ${{ inputs.IMAGE_PATH }}
+        IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
+        TAG_KEY: ${{ inputs.TAG_KEY }}
       run: |
-        NAMESPACE="${{ inputs.DEPLOYMENT_NAMESPACE }}"
-        if [ -z "$NAMESPACE" ]; then NAMESPACE="${{ inputs.DEPLOYMENT_NAME }}"; fi
+        NAMESPACE="$DEPLOYMENT_NAMESPACE"
+        if [ -z "$NAMESPACE" ]; then NAMESPACE="$DEPLOYMENT_NAME"; fi
         SET_FLAGS=""
-        if [ -n "${{ inputs.TAG_KEY }}" ] && [ -n "${{ inputs.IMAGE_TAG }}" ]; then
-          SET_FLAGS="$SET_FLAGS --set ${{ inputs.TAG_KEY }}=${{ inputs.IMAGE_TAG }}"
+        if [ -n "$TAG_KEY" ] && [ -n "$IMAGE_TAG" ]; then
+          SET_FLAGS="$SET_FLAGS --set $TAG_KEY=$IMAGE_TAG"
         fi
-        if [ -n "${{ inputs.IMAGE_PATH }}" ]; then
-          SET_FLAGS="$SET_FLAGS --set image.repository=${{ inputs.IMAGE_PATH }}"
+        if [ -n "$IMAGE_PATH" ]; then
+          SET_FLAGS="$SET_FLAGS --set image.repository=$IMAGE_PATH"
         fi
-        helm dependency update ${{ inputs.CHART_PATH }}
-        echo "Running: helm upgrade ${{ inputs.DEPLOYMENT_NAME }} ${{ inputs.CHART_PATH }} -n ${NAMESPACE} --values ${{ inputs.VALUES_FILE }}${SET_FLAGS}"
-        helm upgrade ${{ inputs.DEPLOYMENT_NAME }} ${{ inputs.CHART_PATH }} -n ${NAMESPACE} --values ${{ inputs.VALUES_FILE }} $SET_FLAGS
+        helm dependency update "$CHART_PATH"
+        echo "Running: helm upgrade $DEPLOYMENT_NAME $CHART_PATH -n $NAMESPACE --values $VALUES_FILE$SET_FLAGS"
+        helm upgrade "$DEPLOYMENT_NAME" "$CHART_PATH" -n "$NAMESPACE" --values "$VALUES_FILE" $SET_FLAGS
 
     - name: Remove kubeconfig
       if: always()