reformat few long includes

library/common/1.0.0/templates/lib/container/_env_vars.tpl

@@ -25,7 +25,14 @@ That's why the custom dict is expected.
   {{- end -}}
 
   {{- if $inject -}}
-    {{- $fixedEnv = (include "ix.v1.common.container.fixedEnvs" (dict "root" $root "fixedEnv" $fixedEnv "containerName" $containerName "isMainContainer" $isMainContainer "scaleGPU" $scaleGPU "nvidiaCaps" $nvidiaCaps "secCont" $secCont "secEnvs" $secEnvs)) -}}
+    {{- $fixedEnv = (include "ix.v1.common.container.fixedEnvs" (dict "root" $root
+                                                                      "fixedEnv" $fixedEnv
+                                                                      "containerName" $containerName
+                                                                      "isMainContainer" $isMainContainer
+                                                                      "scaleGPU" $scaleGPU
+                                                                      "nvidiaCaps" $nvidiaCaps
+                                                                      "secCont" $secCont
+                                                                      "secEnvs" $secEnvs)) -}}
   {{- end -}} {{/* Finish fixedEnv */}}
   {{- with $fixedEnv -}}
     {{- range $fixedEnv | fromJsonArray }} {{/* "fromJsonArray" parses stringified output and convet to list */}}
@@ -33,6 +40,14 @@ That's why the custom dict is expected.
   value: {{ .value | quote }}
     {{- end -}}
   {{- end -}}
-  {{- include "ix.v1.common.container.env" (dict "envs" $envs "root" $root "fixedEnv" $fixedEnv "containerName" $containerName) -}}
-  {{- include "ix.v1.common.container.envList" (dict "envList" $envList "envs" $envs "root" $root "fixedEnv" $fixedEnv "containerName" $containerName) -}}
+  {{- include "ix.v1.common.container.env"  (dict "envs" $envs
+                                                  "root" $root
+                                                  "fixedEnv" $fixedEnv
+                                                  "containerName" $containerName) -}}
+
+  {{- include "ix.v1.common.container.envList"  (dict "envList" $envList
+                                                      "envs" $envs
+                                                      "root" $root
+                                                      "fixedEnv" $fixedEnv
+                                                      "containerName" $containerName) -}}
 {{- end -}}

library/common/1.0.0/templates/lib/container/env/_fixedEnvs.tpl

@@ -12,13 +12,16 @@ will be parsed correctly without causing errors.
   {{- $nvidiaCaps := .nvidiaCaps -}}
 
   {{- $nvidiaCaps = $nvidiaCaps | default $root.Values.global.defaults.nvidiaCaps -}}
-
   {{- $podSecCont := $root.Values.podSecurityContext -}}
 
   {{/* Calculate all security values */}}
-  {{- $securityContext := (include "ix.v1.common.lib.securityContext" (dict "root" $root "secCont" $secCont "isMainContainer" $isMainContainer) | fromJson) -}}
-  {{- $podSecurityContext := (include "ix.v1.common.lib.podSecurityContext" (dict "root" $root "podSecCont" $podSecCont) | fromJson) -}}
-  {{- $securityEnvs := (include "ix.v1.common.lib.securityEnvs" (dict "root" $root "secEnvs" $secEnvs) | fromJson) -}}
+  {{- $securityContext := (include "ix.v1.common.lib.securityContext" (dict "root" $root
+                                                                            "secCont" $secCont
+                                                                            "isMainContainer" $isMainContainer) | fromJson) -}}
+  {{- $podSecurityContext := (include "ix.v1.common.lib.podSecurityContext" (dict "root" $root
+                                                                                  "podSecCont" $podSecCont) | fromJson) -}}
+  {{- $securityEnvs := (include "ix.v1.common.lib.securityEnvs" (dict "root" $root
+                                                                      "secEnvs" $secEnvs) | fromJson) -}}
 
   {{- $vars := list -}}
   {{- $vars = mustAppend $vars (dict "name" "TZ" "value" (tpl (toYaml $root.Values.TZ) $root)) -}}
@@ -29,7 +32,12 @@ will be parsed correctly without causing errors.
   {{- else -}}
     {{- $vars = mustAppend $vars (dict "name" "NVIDIA_DRIVER_CAPABILITIES" "value" (join "," $nvidiaCaps)) -}}
   {{- end -}}
-  {{- if and (or (eq ($securityContext.runAsUser | int) 0) (eq ($securityContext.runAsGroup | int) 0)) (ge ($securityEnvs.PUID | int) 0) -}} {{/* If root user or root group and a PUID is set, set PUID and related envs */}}
+  {{- if and
+        (or
+          (eq ($securityContext.runAsUser | int) 0)
+          (eq ($securityContext.runAsGroup | int) 0)
+        )
+        (ge ($securityEnvs.PUID | int) 0) -}} {{/* If root user or root group and a PUID is set, set PUID and related envs */}}
     {{- $vars = mustAppend $vars (dict "name" "PUID" "value" $securityEnvs.PUID) -}}
     {{- $vars = mustAppend $vars (dict "name" "USER_ID" "value" $securityEnvs.PUID) -}}
     {{- $vars = mustAppend $vars (dict "name" "UID" "value" $securityEnvs.PUID) -}}
@@ -37,9 +45,15 @@ will be parsed correctly without causing errors.
     {{- $vars = mustAppend $vars (dict "name" "GROUP_ID" "value" $podSecurityContext.fsGroup) -}}
     {{- $vars = mustAppend $vars (dict "name" "GID" "value" $podSecurityContext.fsGroup) -}}
   {{- end -}}
-  {{- if or ($securityContext.readOnlyRootFilesystem) ($securityContext.runAsNonRoot) -}} {{/* Mainly for LSIO containers, tell S6 to avoid using rootfs */}}
+  {{- if or
+        ($securityContext.readOnlyRootFilesystem)
+        ($securityContext.runAsNonRoot)
+  -}} {{/* Mainly for LSIO containers, tell S6 to avoid using rootfs */}}
     {{- $vars = mustAppend $vars (dict "name" "S6_READ_ONLY_ROOT" "value" "1") -}}
   {{- end -}}
-  {{- include "ix.v1.common.util.storeEnvsForDupeCheck" (dict "root" $root "source" "fixedEnv" "data" (toJson $vars) "containers" (list $containerName)) -}}
+  {{- include "ix.v1.common.util.storeEnvsForDupeCheck" (dict "root" $root
+                                                              "source" "fixedEnv"
+                                                              "data" (toJson $vars)
+                                                              "containers" (list $containerName)) -}}
   {{- toJson $vars -}} {{/* Helm can only return "string", so we stringify the output */}}
 {{- end -}}

library/common/1.0.0/templates/lib/pod/_extraContainers.tpl

@@ -42,7 +42,16 @@
   args:
     {{- . | nindent 4 }}
   {{- end -}} {{/* TODO: prepare dict above and make this line shorter */}}
-  {{- with (include "ix.v1.common.container.envVars" (dict "envs" $container.env "envList" $container.envList "containerName" $name "isMainContainer" false "scaleGPU" $container.scaleGPU "nvidiaCaps" $container.nvidiaCaps "secCont" $container.securityContext "secEnvs" $container.security "injectFixedEnvs" $container.injectFixedEnvs "root" $root) | trim) }}
+  {{- with (include "ix.v1.common.container.envVars"  (dict "envs" $container.env
+                                                            "envList" $container.envList
+                                                            "containerName" $name
+                                                            "isMainContainer" false
+                                                            "scaleGPU" $container.scaleGPU
+                                                            "nvidiaCaps" $container.nvidiaCaps
+                                                            "secCont" $container.securityContext
+                                                            "secEnvs" $container.security
+                                                            "injectFixedEnvs" $container.injectFixedEnvs
+                                                            "root" $root) | trim) }}
   env:
     {{- . | nindent 4 }} {{/* env, fixedEnvs and envList */}}
   {{- end -}}

library/common/1.0.0/templates/lib/pod/_mainContainer.tpl

@@ -33,7 +33,16 @@ So it can work on multiple places, like additional containers and not only the m
   {{- with (include "ix.v1.common.container.termination.messagePolicy" (dict "msgPolicy" .Values.termination.messagePolicy "root" $)) | trim }}
   terminationMessagePolicy: {{ . }}
   {{- end -}}{{/* TODO: prepare dict above and make this line shorter */}}
-  {{- with (include "ix.v1.common.container.envVars" (dict "envs" .Values.env "envList" .Values.envList "containerName" $name "isMainContainer" true "scaleGPU" .Values.scaleGPU "nvidiaCaps" .Values.nvidiaCaps "secCont" .Values.securityContext "secEnvs" .Values.security "injectFixedEnvs" .Values.injectFixedEnvs "root" $) | trim) }}
+  {{- with (include "ix.v1.common.container.envVars"  (dict "envs" .Values.env
+                                                            "envList" .Values.envList
+                                                            "containerName" $name
+                                                            "isMainContainer" true
+                                                            "scaleGPU" .Values.scaleGPU
+                                                            "nvidiaCaps" .Values.nvidiaCaps
+                                                            "secCont" .Values.securityContext
+                                                            "secEnvs" .Values.security
+                                                            "injectFixedEnvs" .Values.injectFixedEnvs
+                                                            "root" $) | trim) }}
   env:
     {{- . | nindent 4 }} {{/* env, fixedEnvs and envList */}}
   {{- end -}}