From 66255f247d1b0a7b47222a50972e134b11d1dd0a Mon Sep 17 00:00:00 2001
From: minottic <carlo.minotti1@gmail.com>
Date: Wed, 18 Jan 2023 14:06:03 +0100
Subject: [PATCH] Template image creation

---
 .github/workflows/proposals-sync.yml                      | 3 +--
 helm/charts/duo_facility_proposals/templates/cronjob.yaml | 2 +-
 helm/configs/proposals/development/values.yaml            | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/proposals-sync.yml b/.github/workflows/proposals-sync.yml
index 251e9d5..1252b7e 100644
--- 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
index 4574b27..ebb0f71 100644
--- 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
index 2e62b5b..0b636cc 100644
--- 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