Merge pull request #38 from lalithkota/main

Helm Charts: Env Vars integer issue fixed. Command and args.
OpenG2P · Jun 19, 2024 · 7bb09ca · 7bb09ca
2 parents 754cc9a + c241120
commit 7bb09ca
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git 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 }}
@@ -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
@@ -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 }}
@@ -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/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
@@ -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 }}
@@ -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/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
@@ -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
@@ -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
@@ -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 }}