Merge branch 'main' into prod

noi-techpark · Nov 19, 2024 · b642eff · b642eff
2 parents 5453399 + 45390c4
commit b642eff
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/.github/workflows/dc-echarging-ocpi-neogy.yml b/.github/workflows/dc-echarging-ocpi-neogy.yml
@@ -93,15 +93,6 @@ jobs:
             repository:  ${{ env.DOCKER_IMAGE }}
             tag:  ${{ env.DOCKER_TAG }}
             pullPolicy: "IfNotPresent"
-          tls:
-            - hosts:
-              - neogy.ocpi.io.opendatahub.com
-              secretName: tls-ocpi-neogy
-          hosts:
-            - host: neogy.ocpi.io.opendatahub.com
-              paths: 
-                - path: "/"
-                  pathType: Prefix
           env:
             LOG_LEVEL: "INFO"
           envSecret:
@@ -113,6 +104,23 @@ jobs:
           # Merge yaml files https://mikefarah.gitbook.io/yq/operators/multiply-merge
           yq -i '. *= load("override.yml")' ${{env.VALUES_YAML}}
 
+      - name: Write environment-specific Helm values (hosts)
+        run: |
+          cat <<EOF > override.yml
+          ingress:
+            tls:
+              - hosts:
+                - neogy.ocpi.io.opendatahub.com
+                secretName: tls-ocpi-neogy
+            hosts:
+              - host: neogy.ocpi.io.opendatahub.com
+                paths: 
+                  - path: "/"
+                    pathType: Prefix
+            EOF
+          # Different from above, we only do a shallow merge, so that original hosts are replaced, not appended
+          yq -i '. += load("override.yml")' ${{env.VALUES_YAML}}
+
       - name: Deploy on cluster  
         uses: noi-techpark/github-actions/helm-deploy@v2
         with: