Template image creation

paulscherrerinstitute · Jan 18, 2023 · 66255f2 · 66255f2
1 parent 9d967aa
commit 66255f2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/proposals-sync.yml b/.github/workflows/proposals-sync.yml
@@ -41,8 +41,7 @@ jobs:
 
       - name: Helm template
         run: | 
-          cat ../helm/configs/proposals/development/values.yaml >> ../helm/configs/proposals/values.yaml
-          helm template proposals --debug ../helm/charts/duo_facility_proposals  -f ../helm/configs/proposals/values.yaml > /dev/null
+          helm template proposals --debug ../helm/charts/duo_facility_proposals --values=../helm/configs/proposals/values.yaml --values=../helm/configs/proposals/development/values.yaml > /dev/null
 
       - name: Build
         run: |

diff --git a/helm/charts/duo_facility_proposals/templates/cronjob.yaml b/helm/charts/duo_facility_proposals/templates/cronjob.yaml
@@ -19,7 +19,7 @@ spec:
           restartPolicy: {{ $.Values.cronjob.restartPolicy }}
           containers:
           - name: {{ include "duo_facility_proposals.resource_name" $facility }}
-            image: {{ $.Values.image.repository }}:{{ $.Values.image.tag }}
+            image: {{ tpl $.Values.image.repository $ }}:{{ tpl $.Values.image.tag $ }}
             imagePullPolicy: {{ $.Values.image.pullPolicy }}
             command: [python]
             args:

diff --git a/helm/configs/proposals/development/values.yaml b/helm/configs/proposals/development/values.yaml
@@ -1,4 +1,4 @@
 secrets: 
-image:
-  repository: busybox
-  tag: latest
+
+ciRepository: busybox
+ciTag: latest