From d394f24848b134a0e008087f9b381c37f7dc7b8a Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 09:41:26 -0800
Subject: [PATCH 01/36] ci: added params to dev to allow expansion when calling
 workflow; ci: added release_num to pipe

---
 .github/workflows/dev.yml     | 12 +++++++++++-
 .github/workflows/pr-open.yml |  3 +++
 .github/workflows/release.yml |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 4f50802b3..28c720f41 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -9,6 +9,11 @@ on:
         required: false
         type: string
         default: "latest"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
   workflow_call:
     inputs:
       tag:
@@ -16,6 +21,11 @@ on:
         required: false
         type: string
         default: "latest"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
 jobs:
   deploy-dev:
     name: Deploys (DEV)
@@ -32,9 +42,9 @@ jobs:
         --set-string global.zone='dev' \
         --set-string global.vault.role='nonprod' \
         --set-string global.vault.zone='dev' \
-        --set-string global.pr_num='${{ inputs.tag }}' \
         --set-json dops.containers[0].resources='{"limits": {"cpu": "1000m", "memory": "2000Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json frontend.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
+        ${{ inputs.params }} \
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 0823f5c9f..943d65b5b 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -81,3 +81,6 @@ jobs:
     secrets: inherit
     with:
       tag: ${{ needs.vars.outputs.pr }}
+      params: |
+        --set-string global.pr_num='${{ inputs.tag }}' \
+        --set-string global.release_num='${{ inputs.tag }}' \
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 94005435b..6eb4e00e8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -56,7 +56,7 @@ jobs:
     uses: ./.github/workflows/uat.yml
     secrets: inherit
     with:
-      tag: ${{ needs.vars.outputs.release-name }}
+      tag: ${{ needs.vars.outputs.pr }}
         
   promote-images-uat:
     name: Promote Images - Uat

From 51ef293f76e00eb416360df25260af6ac60fea97 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 09:47:14 -0800
Subject: [PATCH 02/36] fix: added release_num & pr_num to global.env as
 experiment

---
 .github/workflows/dev.yml     | 1 +
 .github/workflows/pr-open.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 28c720f41..f3ff2153b 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -42,6 +42,7 @@ jobs:
         --set-string global.zone='dev' \
         --set-string global.vault.role='nonprod' \
         --set-string global.vault.zone='dev' \
+        --set-string global.pr_num='${{ inputs.tag }}' \
         --set-json dops.containers[0].resources='{"limits": {"cpu": "1000m", "memory": "2000Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json frontend.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 943d65b5b..a8a6a13b4 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-string global.pr_num='${{ inputs.tag }}' \
-        --set-string global.release_num='${{ inputs.tag }}' \
+        --set-string global.env.pr_num='${{ inputs.tag }}' \
+        --set-string global.env.release_num='${{ inputs.tag }}' \

From eedf1a07720d22d71e711c586d19e045fb12614c Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 10:14:02 -0800
Subject: [PATCH 03/36] experiment: attempting to format parameters without
 needing oneline json

---
 .github/workflows/dev.yml     | 2 +-
 .github/workflows/pr-open.yml | 7 +++++--
 charts/onroutebc/values.yaml  | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index f3ff2153b..4186b45ee 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -48,4 +48,4 @@ jobs:
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
-        ${{ inputs.params }} \
+        ${{ toJson inputs.params }} \
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index a8a6a13b4..aaf2f3cf1 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,8 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-string global.env.pr_num='${{ inputs.tag }}' \
-        --set-string global.env.release_num='${{ inputs.tag }}' \
+        global.env:
+          - name: PR_NUM
+            value: ${{inputs.tag}}
+          - name: RELEASE_NUM
+            value: ${{inputs.tag}}
diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 7b71f7d7f..7baadcb09 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -69,6 +69,7 @@ frontend:
         fromValues:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+        ${{.Values.global.env}}
       ports:
         - name: http
           containerPort: 3000

From c03588f9b39c61d8289beb8e30a403b547e13dd1 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 10:20:43 -0800
Subject: [PATCH 04/36] fix: toJson needs braces aparently

---
 .github/workflows/dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 4186b45ee..4a11d0eec 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -48,4 +48,4 @@ jobs:
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
-        ${{ toJson inputs.params }} \
+        ${{ toJson (inputs.params) }} \

From 2c749001e4510242c7f4b487ffbebef8ba2e2ed1 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 10:27:19 -0800
Subject: [PATCH 05/36] fix: toJson needs braces aparently

---
 .github/workflows/dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 4a11d0eec..9ee5d61fe 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -48,4 +48,4 @@ jobs:
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
-        ${{ toJson (inputs.params) }} \
+        ${{ fromJson (inputs.params) }} \

From 76483a7205dadfec0a7ec09e0236c45e8a640336 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 10:36:54 -0800
Subject: [PATCH 06/36] fix: Removed non-single line input

---
 .github/workflows/dev.yml     | 2 +-
 .github/workflows/pr-open.yml | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 9ee5d61fe..f3ff2153b 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -48,4 +48,4 @@ jobs:
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
-        ${{ fromJson (inputs.params) }} \
+        ${{ inputs.params }} \
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index aaf2f3cf1..38ba6b094 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,8 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        global.env:
-          - name: PR_NUM
-            value: ${{inputs.tag}}
-          - name: RELEASE_NUM
-            value: ${{inputs.tag}}
+        --set-json global.env='{"name": PR_NUM, "value": ${{inputs.tag}}}' \
+        --set-json global.env='{"name": RELEASE_NUM, "value": ${{inputs.tag}}}' \

From 770a93c8688e44ec62ea186f85b81f96bc2acce9 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 10:41:44 -0800
Subject: [PATCH 07/36] fix: Using proper needs intead of inputs

---
 .github/workflows/pr-open.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 38ba6b094..7058f8c60 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='{"name": PR_NUM, "value": ${{inputs.tag}}}' \
-        --set-json global.env='{"name": RELEASE_NUM, "value": ${{inputs.tag}}}' \
+        --set-json global.env='{"name": PR_NUM, "value": ${{ needs.vars.outputs.pr }}' \
+        --set-json global.env='{"name": RELEASE_NUM, "value": ${{ needs.vars.outputs.pr }}' \

From 9c45aac065bd20b21d2f65e81fc28e74befa649f Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 10:45:11 -0800
Subject: [PATCH 08/36] fix: Using proper needs intead of inputs

---
 .github/workflows/pr-open.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 7058f8c60..8753d9371 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -83,4 +83,4 @@ jobs:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
         --set-json global.env='{"name": PR_NUM, "value": ${{ needs.vars.outputs.pr }}' \
-        --set-json global.env='{"name": RELEASE_NUM, "value": ${{ needs.vars.outputs.pr }}' \
+        --set-json global.env='{"name": RELEASE_NUM, "value": ${{ needs.vars.outputs.pr }}'

From 8e2d185a47fc6c189c329d75240dac7ccfa0d507 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 10:47:48 -0800
Subject: [PATCH 09/36] fix: Using proper needs intead of inputs

---
 .github/workflows/dev.yml     | 2 +-
 .github/workflows/pr-open.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index f3ff2153b..f24bf6824 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -48,4 +48,4 @@ jobs:
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
-        ${{ inputs.params }} \
+        ${{ inputs.params }}
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 8753d9371..7058f8c60 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -83,4 +83,4 @@ jobs:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
         --set-json global.env='{"name": PR_NUM, "value": ${{ needs.vars.outputs.pr }}' \
-        --set-json global.env='{"name": RELEASE_NUM, "value": ${{ needs.vars.outputs.pr }}'
+        --set-json global.env='{"name": RELEASE_NUM, "value": ${{ needs.vars.outputs.pr }}' \

From 1192d8362d1b10cb5f2a0b5893566afb920fd8cd Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 10:51:05 -0800
Subject: [PATCH 10/36] fix: missing closing braces

---
 .github/workflows/pr-open.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 7058f8c60..ab96582f6 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='{"name": PR_NUM, "value": ${{ needs.vars.outputs.pr }}' \
-        --set-json global.env='{"name": RELEASE_NUM, "value": ${{ needs.vars.outputs.pr }}' \
+        --set-json global.env='{"name": PR_NUM, "value": ${{ needs.vars.outputs.pr }}}' \
+        --set-json global.env='{"name": RELEASE_NUM, "value": ${{ needs.vars.outputs.pr }}}' \

From 1918baa1436338d6f89398b664609cc7160bc159 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 11:00:55 -0800
Subject: [PATCH 11/36] fix: missing quotes for json

---
 .github/workflows/pr-open.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index ab96582f6..dcaab6b54 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='{"name": PR_NUM, "value": ${{ needs.vars.outputs.pr }}}' \
-        --set-json global.env='{"name": RELEASE_NUM, "value": ${{ needs.vars.outputs.pr }}}' \
+        --set-json global.env='{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"}' \
+        --set-json global.env='{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}' \

From 33ab92007a42eaa31cbc1e14a7fa66737a69a20b Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 11:05:09 -0800
Subject: [PATCH 12/36] fix: attempting to generate json on values.yml

---
 charts/onroutebc/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 7baadcb09..cb4816c9b 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -69,7 +69,7 @@ frontend:
         fromValues:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
-        ${{.Values.global.env}}
+        ${{fromJson .Values.global.env}}
       ports:
         - name: http
           containerPort: 3000

From d3fa1dbcc2d3052ca4d804137092a593b2400625 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 11:12:01 -0800
Subject: [PATCH 13/36] fix: attempting to generate json on values.yml

---
 charts/onroutebc/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index cb4816c9b..55019fa45 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -69,7 +69,7 @@ frontend:
         fromValues:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
-        ${{fromJson .Values.global.env}}
+        {{fromJson .Values.global.env}}
       ports:
         - name: http
           containerPort: 3000

From 194451c408e7a1a150768bc785126c28ffc57da3 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 15:47:47 -0800
Subject: [PATCH 14/36] fix: attempting to generate json on values.yml

---
 charts/onroutebc/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 55019fa45..7a812a1d3 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -69,7 +69,7 @@ frontend:
         fromValues:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
-        {{fromJson .Values.global.env}}
+        {{.Values.global.env}}
       ports:
         - name: http
           containerPort: 3000

From 2c602f692eab6d6cf453d809f30c4bbfb6566e71 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 15:50:48 -0800
Subject: [PATCH 15/36] fix: attempting to generate json on values.yml

---
 .github/workflows/dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index f24bf6824..7b4d5c57f 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -48,4 +48,4 @@ jobs:
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
-        ${{ inputs.params }}
+        ${{ fromJson(inputs.params) }}

From dd5d72904fc98d87c0bc9539d45a280798bd17ea Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 15:56:24 -0800
Subject: [PATCH 16/36] fix: attempting to generate json on values.yml

---
 .github/workflows/dev.yml    | 2 +-
 charts/onroutebc/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 7b4d5c57f..f24bf6824 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -48,4 +48,4 @@ jobs:
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
-        ${{ fromJson(inputs.params) }}
+        ${{ inputs.params }}
diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 7a812a1d3..bd84a7b99 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -69,7 +69,7 @@ frontend:
         fromValues:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
-        {{.Values.global.env}}
+          {{.Values.global.env}}
       ports:
         - name: http
           containerPort: 3000

From 52399c1568caaa50d35b10f9a3ba3f67cf7da69d Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 15:59:27 -0800
Subject: [PATCH 17/36] fix: attempting to generate json on values.yml

---
 charts/onroutebc/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index bd84a7b99..438c0bfe1 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -69,7 +69,7 @@ frontend:
         fromValues:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
-          {{.Values.global.env}}
+              #{{.Values.global.env}}
       ports:
         - name: http
           containerPort: 3000

From dd414737bad2dc850e0ea4972f1232b77ff029e8 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 16:53:11 -0800
Subject: [PATCH 18/36] fix: attempting to generate json on values.yml

---
 .github/workflows/pr-open.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index dcaab6b54..e8d5f8ba5 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,6 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"}' \
-        --set-json global.env='{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}' \
+        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}",\
+                                {"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"} \
+                                ]' \

From a4ad451afb725df5c36e3ef2a077d029972e0b6a Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 16:56:59 -0800
Subject: [PATCH 19/36] fix: attempting to generate json on values.yml

---
 .github/workflows/pr-open.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index e8d5f8ba5..21f98312c 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,6 +82,6 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}",\
-                                {"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"} \
+        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},\
+                                {"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}} \
                                 ]' \

From 5562280acb1d3df90101771ab4e9cd9130194913 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 17:02:08 -0800
Subject: [PATCH 20/36] fix: attempting to generate json on values.yml

---
 .github/workflows/pr-open.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 21f98312c..b7d4630ca 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,6 +82,4 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},\
-                                {"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}} \
-                                ]' \
+        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}}]' \

From ae907d03502c6519d1f5a31dc0b55eeb32d7cd84 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 17:05:19 -0800
Subject: [PATCH 21/36] fix: attempting to generate json on values.yml

---
 .github/workflows/pr-open.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index b7d4630ca..87ed21308 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,4 +82,4 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}}]' \
+        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"]' \

From a54ae5cc70fe8db5f4c2f0a22c7849880123f3bc Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 17:08:13 -0800
Subject: [PATCH 22/36] fix: attempting to generate json on values.yml

---
 .github/workflows/pr-open.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 87ed21308..886cba5a8 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,4 +82,4 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"]' \
+        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}]' \

From 6b210914a3392e56a8e3e290267c208bf3d656ba Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Tue, 21 Jan 2025 17:28:18 -0800
Subject: [PATCH 23/36] fix: attempting to generate json on values.yml

---
 .github/workflows/dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index f24bf6824..f3ff2153b 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -48,4 +48,4 @@ jobs:
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
-        ${{ inputs.params }}
+        ${{ inputs.params }} \

From b839cae49bf6bdf32ed8fc4786d60340936ec733 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Wed, 22 Jan 2025 09:43:05 -0800
Subject: [PATCH 24/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 charts/onroutebc/values.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 438c0bfe1..1644f8488 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -66,10 +66,11 @@ frontend:
             key: DEPLOY_ENVIRONMENT
           - name: FRONTEND_PR_NUM
             key: FRONTEND_PR_NUM
-        fromValues:
-          - name: TIMESTAMP
-            value: "{{ now | toString }}"
-              #{{.Values.global.env}}
+        fromValues: {{.Values.global.env}}
+          #- name: TIMESTAMP
+          #  value: "{{ now | toString }}"
+          #- name: PR_NUM
+          #  value: 
       ports:
         - name: http
           containerPort: 3000

From a75b5d3e40fab694ab27b9883e79fc0f9cc88396 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Wed, 22 Jan 2025 10:13:54 -0800
Subject: [PATCH 25/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 .github/workflows/pr-open.yml | 2 +-
 charts/onroutebc/values.yaml  | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 886cba5a8..dd7d67d9b 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,4 +82,4 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json global.env='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}]' \
+        --set-string frontend.containers[0].env.fromValues='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}]' \
diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 1644f8488..fd57b1229 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -66,11 +66,10 @@ frontend:
             key: DEPLOY_ENVIRONMENT
           - name: FRONTEND_PR_NUM
             key: FRONTEND_PR_NUM
-        fromValues: {{.Values.global.env}}
-          #- name: TIMESTAMP
-          #  value: "{{ now | toString }}"
-          #- name: PR_NUM
-          #  value: 
+        fromValues: 
+          #"{{- toYaml .Values.global.env | nindent 12 }}"
+          - name: TIMESTAMP
+            value: "{{ now | toString }}"
       ports:
         - name: http
           containerPort: 3000

From 13abebab1a35f62879e1d33a67b7c876b459346e Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Wed, 22 Jan 2025 10:16:41 -0800
Subject: [PATCH 26/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 .github/workflows/pr-open.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index dd7d67d9b..a3f93bb0c 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,4 +82,4 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-string frontend.containers[0].env.fromValues='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}]' \
+        --set-json frontend.containers[0].env.fromValues='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}]' \

From 344edb466342e0c30b67cff3f5f862963fc3528a Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 10:20:14 -0800
Subject: [PATCH 27/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 .github/workflows/pr-open.yml |  3 ++-
 charts/onroutebc/values.yaml  | 31 ++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index a3f93bb0c..860d3b783 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,4 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-json frontend.containers[0].env.fromValues='[{"name": "PR_NUM", "value": "${{ needs.vars.outputs.pr }}"},{"name": "RELEASE_NUM", "value": "${{ needs.vars.outputs.pr }}"}]' \
+        --set-string global.env.pr_num=${{ needs.vars.outputs.pr }}
+        --set-string global.env.release_num=${{ needs.vars.outputs.pr }}
diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index fd57b1229..76fd19875 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -64,12 +64,13 @@ frontend:
             key: POLICY_URL            
           - name: DEPLOY_ENVIRONMENT
             key: DEPLOY_ENVIRONMENT
-          - name: FRONTEND_PR_NUM
-            key: FRONTEND_PR_NUM
         fromValues: 
-          #"{{- toYaml .Values.global.env | nindent 12 }}"
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+          - name: PR_NUM
+            value: {{ .Values.global.env.pr_num }}
+          - name: RELEASE_NUM
+            value: {{ .Values.global.env.release_num }}
       ports:
         - name: http
           containerPort: 3000
@@ -204,8 +205,10 @@ vehicles:
         fromValues:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
-          - name: VEHICLES_PR_NUM
-            value: '{{.Values.global.pr_num}}'
+          - name: PR_NUM
+            value: {{ .Values.global.env.pr_num }}
+          - name: RELEASE_NUM
+            value: {{ .Values.global.env.release_num }}
       ports:
         - name: vehicles-api
           containerPort: 5000
@@ -341,10 +344,12 @@ dops:
           - name: ACCESS_API_URL
             key: ACCESS_API_URL
         fromValues:
-          - name: DOPS_PR_NUM
-            value: '{{.Values.global.pr_num}}'
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+          - name: PR_NUM
+            value: {{ .Values.global.env.pr_num }}
+          - name: RELEASE_NUM
+            value: {{ .Values.global.env.release_num }}
       ports:
         - name: dops-api
           containerPort: 5001
@@ -475,10 +480,12 @@ scheduler:
           - name: ACCESS_API_URL
             key: ACCESS_API_URL
         fromValues:
-          - name: SCHEDULER_PR_NUM
-            value: '{{.Values.global.pr_num}}'
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+          - name: PR_NUM
+            value: {{ .Values.global.env.pr_num }}
+          - name: RELEASE_NUM
+            value: {{ .Values.global.env.release_num }}
       ports:
         - name: scheduler
           containerPort: 5050
@@ -582,10 +589,12 @@ policy:
           - name: FRONTEND_URL
             key: FRONTEND_URL
         fromValues:
-          - name: POLICY_PR_NUM
-            value: '{{.Values.global.pr_num}}'
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+          - name: PR_NUM
+            value: {{ .Values.global.env.pr_num }}
+          - name: RELEASE_NUM
+            value: {{ .Values.global.env.release_num }}
       ports:
         - name: policy-api
           containerPort: 5002

From c2197941029b45d90be192e1ab7296d6ac0cd54c Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 10:22:16 -0800
Subject: [PATCH 28/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 .github/workflows/pr-open.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 860d3b783..0c2d21682 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-string global.env.pr_num=${{ needs.vars.outputs.pr }}
-        --set-string global.env.release_num=${{ needs.vars.outputs.pr }}
+        --set-string global.env.pr_num=${{ needs.vars.outputs.pr }} \
+        --set-string global.env.release_num=${{ needs.vars.outputs.pr }} \

From 7c0f3072b704c66ffe04e955c85aa6da8a6fff8a Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 10:29:41 -0800
Subject: [PATCH 29/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 charts/onroutebc/values.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 76fd19875..88d2d10bf 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -68,9 +68,9 @@ frontend:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num }}
+            value: {{ .Values.global.env.pr_num | quote }}
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num }}
+            value: {{ .Values.global.env.release_num | quote }}
       ports:
         - name: http
           containerPort: 3000
@@ -206,9 +206,9 @@ vehicles:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num }}
+            value: {{ .Values.global.env.pr_num | quote }}
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num }}
+            value: {{ .Values.global.env.release_num | quote }}
       ports:
         - name: vehicles-api
           containerPort: 5000
@@ -347,9 +347,9 @@ dops:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num }}
+            value: {{ .Values.global.env.pr_num | quote }}
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num }}
+            value: {{ .Values.global.env.release_num | quote }}
       ports:
         - name: dops-api
           containerPort: 5001
@@ -483,9 +483,9 @@ scheduler:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num }}
+            value: {{ .Values.global.env.pr_num | quote }}
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num }}
+            value: {{ .Values.global.env.release_num | quote }}
       ports:
         - name: scheduler
           containerPort: 5050
@@ -592,9 +592,9 @@ policy:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num }}
+            value: {{ .Values.global.env.pr_num | quote }}
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num }}
+            value: {{ .Values.global.env.release_num | quote }}
       ports:
         - name: policy-api
           containerPort: 5002

From b0c88af8a284e84bfe34faa75c17ab4bcb5c9900 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 10:33:10 -0800
Subject: [PATCH 30/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 .github/workflows/pr-open.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 0c2d21682..c974b43bf 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-string global.env.pr_num=${{ needs.vars.outputs.pr }} \
-        --set-string global.env.release_num=${{ needs.vars.outputs.pr }} \
+        --set-string global.env.pr_num="${{ needs.vars.outputs.pr }}" \
+        --set-string global.env.release_num="${{ needs.vars.outputs.pr }}" \

From 408c00a7ed82d2377aa15795df24e04588decbfc Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 10:35:40 -0800
Subject: [PATCH 31/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 .github/workflows/pr-open.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index c974b43bf..4fe5a6b84 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -82,5 +82,5 @@ jobs:
     with:
       tag: ${{ needs.vars.outputs.pr }}
       params: |
-        --set-string global.env.pr_num="${{ needs.vars.outputs.pr }}" \
-        --set-string global.env.release_num="${{ needs.vars.outputs.pr }}" \
+        --set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
+        --set-string global.env.release_num='${{ needs.vars.outputs.pr }}' \

From 7de50fb800551e43b73be57cdaa8fbda20894269 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 10:38:24 -0800
Subject: [PATCH 32/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 charts/onroutebc/values.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 88d2d10bf..d822c72c1 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -1,5 +1,6 @@
 ---
 global:
+  env: {}
   autoscaling: true
   license: "c28f0c"
   podAnnotations: |

From 408d726fe2971e9570f360c48c9fe430f5e9f1a3 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 10:42:20 -0800
Subject: [PATCH 33/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 charts/onroutebc/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index d822c72c1..a4adde4a9 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -69,9 +69,9 @@ frontend:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num | quote }}
+            value: "{{ .Values.global.env.pr_num | toString }}"
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num | quote }}
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: http
           containerPort: 3000

From 38cb3400c230aefd422c6b915c796b5fb06b9dea Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 10:43:11 -0800
Subject: [PATCH 34/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 charts/onroutebc/values.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index a4adde4a9..75b504f01 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -207,9 +207,9 @@ vehicles:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num | quote }}
+            value: "{{ .Values.global.env.pr_num | toString }}"
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num | quote }}
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: vehicles-api
           containerPort: 5000
@@ -348,9 +348,9 @@ dops:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num | quote }}
+            value: "{{ .Values.global.env.pr_num | toString }}"
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num | quote }}
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: dops-api
           containerPort: 5001
@@ -484,9 +484,9 @@ scheduler:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num | quote }}
+            value: "{{ .Values.global.env.pr_num | toString }}"
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num | quote }}
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: scheduler
           containerPort: 5050
@@ -593,9 +593,9 @@ policy:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
           - name: PR_NUM
-            value: {{ .Values.global.env.pr_num | quote }}
+            value: "{{ .Values.global.env.pr_num | toString }}"
           - name: RELEASE_NUM
-            value: {{ .Values.global.env.release_num | quote }}
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: policy-api
           containerPort: 5002

From 022bd1385113517eadfe5944e0bed33595f92de3 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 11:05:07 -0800
Subject: [PATCH 35/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 .github/workflows/merge.yml   | 3 +++
 .github/workflows/release.yml | 6 ++++++
 charts/onroutebc/values.yaml  | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 6cbc6d44f..01f8c0d09 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -42,6 +42,9 @@ jobs:
     secrets: inherit
     with:
       tag: ${{ needs.vars.outputs.pr }}
+      params: |
+        --set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
+        --set-string global.env.release_num='${{ needs.vars.outputs.pr }}' \
 
   promote-images-test:
     name: Promote Images - Test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6eb4e00e8..34c5c6100 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -57,6 +57,9 @@ jobs:
     secrets: inherit
     with:
       tag: ${{ needs.vars.outputs.pr }}
+      params: |
+        --set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
+        --set-string global.env.release_num='${{ needs.vars.outputs.release-name }}' \
         
   promote-images-uat:
     name: Promote Images - Uat
@@ -83,6 +86,9 @@ jobs:
     secrets: inherit
     with:
       tag: ${{ needs.vars.outputs.pr }}
+      params: |
+        --set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
+        --set-string global.env.release_num='${{ needs.vars.outputs.release-name }}' \
   
   promote-images-prod:
     name: Promote Images - Prod
diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index 75b504f01..f58367af5 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -35,7 +35,7 @@ frontend:
       ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
       POLICY_URL: "https://{{.Release.Name}}-policy.apps.silver.devops.gov.bc.ca"
       DEPLOY_ENVIRONMENT: "{{.Values.global.vault.zone}}"
-      FRONTEND_PR_NUM: "{{.Values.global.pr_num}}"
+      PR_NUM: "{{.Values.global.env.pr_num}}"
       config.js.template: |-
         const envConfig = (() => { return {
             "VITE_DEPLOY_ENVIRONMENT":"$DEPLOY_ENVIRONMENT",

From 3d84f080ba7bd6ed20f468a30484769739463c35 Mon Sep 17 00:00:00 2001
From: Chris Berg <chris.berg@aot-technologies.com>
Date: Fri, 24 Jan 2025 14:02:22 -0800
Subject: [PATCH 36/36] experiment: attmepting to inject addiontal params
 WITHOUT extending templating engine upstream

---
 charts/onroutebc/values.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
index f58367af5..41e87727c 100644
--- a/charts/onroutebc/values.yaml
+++ b/charts/onroutebc/values.yaml
@@ -36,6 +36,7 @@ frontend:
       POLICY_URL: "https://{{.Release.Name}}-policy.apps.silver.devops.gov.bc.ca"
       DEPLOY_ENVIRONMENT: "{{.Values.global.vault.zone}}"
       PR_NUM: "{{.Values.global.env.pr_num}}"
+      RELEASE_NUM: "{{.Values.global.env.release_num}}"
       config.js.template: |-
         const envConfig = (() => { return {
             "VITE_DEPLOY_ENVIRONMENT":"$DEPLOY_ENVIRONMENT",
@@ -44,7 +45,8 @@ frontend:
             "VITE_KEYCLOAK_ISSUER_URL":"$KEYCLOAK_ISSUER_URL",
             "VITE_KEYCLOAK_AUDIENCE":"$KEYCLOAK_AUDIENCE",
             "VITE_SITEMINDER_LOG_OFF_URL":"$SITEMINDER_LOG_OFF_URL",
-            "VITE_FRONTEND_PR_NUM":"$FRONTEND_PR_NUM",
+            "VITE_PR_NUM":"$PR_NUM",
+            "VITE_RELEASE_NUM":"$RELEASE_NUM",
           };
         })();
   containers: