From db9b4fed3a4cf93cfacf403a8c5b164642ee2b0b Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Wed, 19 Jun 2024 05:50:14 +0530
Subject: [PATCH 1/2] Helm Charts: Env Vars integer issue fixed

Signed-off-by: Lalith Kota <kotalalith@gmail.com>
---
 charts/esignet/templates/_helpers.tpl                           | 2 +-
 charts/keymanager/templates/_helpers.tpl                        | 2 +-
 charts/mail/templates/_helpers.tpl                              | 2 +-
 charts/mock-identity-system/templates/_helpers.tpl              | 2 +-
 .../charts/odk-central-backend/templates/_helpers.tpl           | 2 +-
 .../charts/odk-central-enketo/templates/_helpers.tpl            | 2 +-
 .../charts/odk-central-frontend/templates/_helpers.tpl          | 2 +-
 .../charts/odk-central-pyxform/templates/_helpers.tpl           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/esignet/templates/_helpers.tpl b/charts/esignet/templates/_helpers.tpl
index ec5998b..f6aa163 100644
--- a/charts/esignet/templates/_helpers.tpl
+++ b/charts/esignet/templates/_helpers.tpl
@@ -77,7 +77,7 @@ Render Env values section
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
 - name: {{ $k }}
-{{- if or (kindIs "int" $v) (kindIs "bool" $v) }}
+{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}
diff --git a/charts/keymanager/templates/_helpers.tpl b/charts/keymanager/templates/_helpers.tpl
index 3c3bc41..32ca4c3 100644
--- a/charts/keymanager/templates/_helpers.tpl
+++ b/charts/keymanager/templates/_helpers.tpl
@@ -64,7 +64,7 @@ Render Env values section
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
 - name: {{ $k }}
-{{- if or (kindIs "int" $v) (kindIs "bool" $v) }}
+{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}
diff --git a/charts/mail/templates/_helpers.tpl b/charts/mail/templates/_helpers.tpl
index f23c190..9349d18 100644
--- a/charts/mail/templates/_helpers.tpl
+++ b/charts/mail/templates/_helpers.tpl
@@ -5,7 +5,7 @@ Render Env values section
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
 - name: {{ $k }}
-{{- if or (kindIs "int" $v) (kindIs "bool" $v) }}
+{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}
diff --git a/charts/mock-identity-system/templates/_helpers.tpl b/charts/mock-identity-system/templates/_helpers.tpl
index 3cab8be..fd1c491 100644
--- a/charts/mock-identity-system/templates/_helpers.tpl
+++ b/charts/mock-identity-system/templates/_helpers.tpl
@@ -64,7 +64,7 @@ Render Env values section
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
 - name: {{ $k }}
-{{- if or (kindIs "int" $v) (kindIs "bool" $v) }}
+{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}
diff --git a/charts/odk-central/charts/odk-central-backend/templates/_helpers.tpl b/charts/odk-central/charts/odk-central-backend/templates/_helpers.tpl
index 8dbd820..dc68bc5 100644
--- a/charts/odk-central/charts/odk-central-backend/templates/_helpers.tpl
+++ b/charts/odk-central/charts/odk-central-backend/templates/_helpers.tpl
@@ -5,7 +5,7 @@ Render Env values section
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
 - name: {{ $k }}
-{{- if or (kindIs "int" $v) (kindIs "bool" $v) }}
+{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}
diff --git a/charts/odk-central/charts/odk-central-enketo/templates/_helpers.tpl b/charts/odk-central/charts/odk-central-enketo/templates/_helpers.tpl
index 5eb91b8..97be60a 100644
--- a/charts/odk-central/charts/odk-central-enketo/templates/_helpers.tpl
+++ b/charts/odk-central/charts/odk-central-enketo/templates/_helpers.tpl
@@ -5,7 +5,7 @@ Render Env values section
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
 - name: {{ $k }}
-{{- if or (kindIs "int" $v) (kindIs "bool" $v) }}
+{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}
diff --git a/charts/odk-central/charts/odk-central-frontend/templates/_helpers.tpl b/charts/odk-central/charts/odk-central-frontend/templates/_helpers.tpl
index e7df87b..50cda06 100644
--- a/charts/odk-central/charts/odk-central-frontend/templates/_helpers.tpl
+++ b/charts/odk-central/charts/odk-central-frontend/templates/_helpers.tpl
@@ -5,7 +5,7 @@ Render Env values section
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
 - name: {{ $k }}
-{{- if or (kindIs "int" $v) (kindIs "bool" $v) }}
+{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}
diff --git a/charts/odk-central/charts/odk-central-pyxform/templates/_helpers.tpl b/charts/odk-central/charts/odk-central-pyxform/templates/_helpers.tpl
index 97cc580..c47a3a5 100644
--- a/charts/odk-central/charts/odk-central-pyxform/templates/_helpers.tpl
+++ b/charts/odk-central/charts/odk-central-pyxform/templates/_helpers.tpl
@@ -5,7 +5,7 @@ Render Env values section
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
 - name: {{ $k }}
-{{- if or (kindIs "int" $v) (kindIs "bool" $v) }}
+{{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}

From c241120a9342ba66483b3476d5d2c3074cc12039 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Wed, 19 Jun 2024 20:45:26 +0530
Subject: [PATCH 2/2] Helm Charts: Command args fixed

Signed-off-by: Lalith Kota <kotalalith@gmail.com>
---
 charts/esignet/templates/_helpers.tpl              | 2 +-
 charts/keymanager/templates/_helpers.tpl           | 2 +-
 charts/mock-identity-system/templates/_helpers.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/esignet/templates/_helpers.tpl b/charts/esignet/templates/_helpers.tpl
index f6aa163..f736855 100644
--- a/charts/esignet/templates/_helpers.tpl
+++ b/charts/esignet/templates/_helpers.tpl
@@ -117,7 +117,7 @@ Return command
 {{- if .command }}
 command: {{- include "common.tplvalues.render" (dict "value" .command "context" .context) }}
 {{- end }}
-{{- if .Values.args }}
+{{- if .args }}
 args: {{- include "common.tplvalues.render" (dict "value" .args "context" .context) }}
 {{- end }}
 {{- else if .startUpCommand }}
diff --git a/charts/keymanager/templates/_helpers.tpl b/charts/keymanager/templates/_helpers.tpl
index 32ca4c3..9e960f6 100644
--- a/charts/keymanager/templates/_helpers.tpl
+++ b/charts/keymanager/templates/_helpers.tpl
@@ -99,7 +99,7 @@ Return command
 {{- if .command }}
 command: {{- include "common.tplvalues.render" (dict "value" .command "context" .context) }}
 {{- end }}
-{{- if .Values.args }}
+{{- if .args }}
 args: {{- include "common.tplvalues.render" (dict "value" .args "context" .context) }}
 {{- end }}
 {{- else if .startUpCommand }}
diff --git a/charts/mock-identity-system/templates/_helpers.tpl b/charts/mock-identity-system/templates/_helpers.tpl
index fd1c491..5d490a1 100644
--- a/charts/mock-identity-system/templates/_helpers.tpl
+++ b/charts/mock-identity-system/templates/_helpers.tpl
@@ -99,7 +99,7 @@ Return command
 {{- if .command }}
 command: {{- include "common.tplvalues.render" (dict "value" .command "context" .context) }}
 {{- end }}
-{{- if .Values.args }}
+{{- if .args }}
 args: {{- include "common.tplvalues.render" (dict "value" .args "context" .context) }}
 {{- end }}
 {{- else if .startUpCommand }}