Merge pull request #13445 from richardkchapman/helm-standard

HPCC-23649 Rename utils.tpl and add standard templates

dockerfiles/hpcc/templates/_util.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "hpcc.utils.name" -}}
+{{- define "hpcc.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "hpcc.utils.fullname" -}}
+{{- define "hpcc.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -26,12 +26,12 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "hpcc.utils.chart" -}}
+{{- define "hpcc.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- /* Translate a port list to a comma-separated list */ -}}
-{{- define "hpcc.utils.portListToCommas" -}}
+{{- define "hpcc.portListToCommas" -}}
  {{- if hasPrefix "[]" (typeOf .) -}}
   {{- $local := dict "first" true -}}
   {{- range $key, $value := . -}}{{- if not $local.first -}},{{- end -}}{{- $value -}}{{- $_ := set $local "first" false -}}{{- end -}}
@@ -42,7 +42,7 @@ Create chart name and version as used by the chart label.
 
 {{- /* Generate local config info into config section */ -}}
 {{- /* Pass in a dictionary with root and me defined */ -}}
-{{- define "hpcc.utils.generateComponentConfigMap" -}}
+{{- define "hpcc.generateComponentConfigMap" -}}
 {{- if hasKey .me "configFile" -}}
 {{- $filename := (printf "files/%s" .me.configFile) -}}
 {{- .me.name -}}.yaml: |
@@ -55,7 +55,7 @@ Create chart name and version as used by the chart label.
 
 {{- /* Generate a ConfigMap for a component */ -}}
 {{- /* Pass in a dictionary with root and me defined */ -}}
-{{- define "hpcc.utils.generateConfigMap" }}
+{{- define "hpcc.generateConfigMap" }}
 kind: ConfigMap 
 apiVersion: v1 
 metadata:
@@ -66,61 +66,61 @@ data:
     Global:
       imageVersion: {{ .root.Values.global.image.version | quote }}
       singleNode: {{ .root.Values.global.singleNode }}
-{{ include "hpcc.utils.generateComponentConfigMap" . | indent 2 }}
+{{ include "hpcc.generateComponentConfigMap" . | indent 2 }}
 {{ end -}}
 
 {{- /* Add a ConfigMap volume for a component */ -}}
-{{- define "hpcc.utils.addConfigVolume" -}}
+{{- define "hpcc.addConfigVolume" -}}
 - name: {{ .name }}-configmap-volume
   configMap:
     name: {{ .name }}-configmap
 {{- end -}}
 
 {{- /* Add a ConfigMap volume mount for a component */ -}}
-{{- define "hpcc.utils.addConfigVolumeMount" -}}
+{{- define "hpcc.addConfigVolumeMount" -}}
 - name: {{ .name }}-configmap-volume
   mountPath: /etc/config
 {{- end -}}
 
 {{- /* Add data volume mount for a component */ -}}
-{{- define "hpcc.utils.addDataVolumeMount" -}}
+{{- define "hpcc.addDataVolumeMount" -}}
 - name: datastorage-pv
   mountPath: "/var/lib/HPCCSystems/hpcc-data"
 {{- end -}}
 
 {{- /* Add standard volumes for a component */ -}}
-{{- define "hpcc.utils.addVolumes" -}}
+{{- define "hpcc.addVolumes" -}}
 - name: dllserver-pv-storage
   persistentVolumeClaim:
-    claimName: {{ .Values.global.dllserver.existingClaim | default (printf "%s-dllserver-pv-claim" (include "hpcc.utils.fullname" .)) }}
+    claimName: {{ .Values.global.dllserver.existingClaim | default (printf "%s-dllserver-pv-claim" (include "hpcc.fullname" .)) }}
 - name: datastorage-pv
   persistentVolumeClaim:
-    claimName: {{ .Values.global.dataStorage.existingClaim | default (printf "%s-datastorage-pv-claim" (include "hpcc.utils.fullname" .)) }}
+    claimName: {{ .Values.global.dataStorage.existingClaim | default (printf "%s-datastorage-pv-claim" (include "hpcc.fullname" .)) }}
 {{- end -}}
 
 {{- /* Add standard volume mounts for a component */ -}}
-{{- define "hpcc.utils.addVolumeMounts" -}}
+{{- define "hpcc.addVolumeMounts" -}}
 volumeMounts:
-{{ include "hpcc.utils.addConfigVolumeMount" . }}
-{{ include "hpcc.utils.addDataVolumeMount" . }}
+{{ include "hpcc.addConfigVolumeMount" . }}
+{{ include "hpcc.addDataVolumeMount" . }}
 - name: dllserver-pv-storage
   mountPath: "/var/lib/HPCCSystems/queries"
 {{- end -}}
 
 {{- /* Add config arg for a component */ -}}
-{{- define "hpcc.utils.configArg" -}}
+{{- define "hpcc.configArg" -}}
 {{- if or (hasKey . "configFile") (hasKey . "config") -}}
 "--config=/etc/config/{{ .name }}.yaml", {{ end -}}
 "--global=/etc/config/global.yaml"
 {{- end -}}
 
 {{- /* Add dali arg for a component */ -}}
-{{- define "hpcc.utils.daliArg" -}}
+{{- define "hpcc.daliArg" -}}
 "--daliServers={{ (index .Values.dali 0).name }}"
 {{- end -}}
 
 {{- /* Get image name */ -}}
-{{- define "hpcc.utils.imageName" -}}
+{{- define "hpcc.imageName" -}}
 {{- /* Pass in a dictionary with root, me and imagename defined */ -}}
 {{- if .me.image -}}
 {{ .me.image.root | default .root.Values.global.image.root | default "hpccsystems" }}/{{ .imagename }}:{{ .me.image.version | default .root.Values.global.image.version }}
@@ -131,8 +131,8 @@ volumeMounts:
 
 {{- /* Add image attributes for a component */ -}}
 {{- /* Pass in a dictionary with root, me and imagename defined */ -}}
-{{- define "hpcc.utils.addImageAttrs" -}}
-image: {{ include "hpcc.utils.imageName" . | quote }}
+{{- define "hpcc.addImageAttrs" -}}
+image: {{ include "hpcc.imageName" . | quote }}
 {{ if .me.image -}}
 imagePullPolicy: {{ .me.image.pullPolicy | default .root.Values.global.image.pullPolicy | default "IfNotPresent" }}
 {{- else -}}

dockerfiles/hpcc/templates/dali.yaml

@@ -16,15 +16,15 @@ spec:
       containers:
       - name: {{ .name | quote }}
         args: [
-                # {{ include "hpcc.utils.configArg" . }} - dali does not support this yet
+                # {{ include "hpcc.configArg" . }} - dali does not support this yet
               ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" . "imagename" "dali") | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" . "imagename" "dali") | indent 8 }}
         volumeMounts:
-{{ include "hpcc.utils.addConfigVolumeMount" . | indent 8 }}
+{{ include "hpcc.addConfigVolumeMount" . | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
 ---
-{{- include "hpcc.utils.generateConfigMap" (dict "root" $ "me" .) -}}
+{{- include "hpcc.generateConfigMap" (dict "root" $ "me" .) -}}
 ---
 apiVersion: v1
 kind: Service

dockerfiles/hpcc/templates/datastorage.yaml

@@ -2,12 +2,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ printf "%s-datastorage-pv-claim" (include "hpcc.utils.fullname" .) }}
+  name: {{ printf "%s-datastorage-pv-claim" (include "hpcc.fullname" .) }}
   labels:
-    app.kubernetes.io/name: {{ printf "%s-datastorage-pv-claim" (include "hpcc.utils.fullname" .) }}
+    app.kubernetes.io/name: {{ printf "%s-datastorage-pv-claim" (include "hpcc.fullname" .) }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "hpcc.utils.chart" . }}
+    helm.sh/chart: {{ include "hpcc.chart" . }}
 spec:
   accessModes:
     - ReadWriteMany

dockerfiles/hpcc/templates/dllserver-claim.yaml

@@ -2,12 +2,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ printf "%s-dllserver-pv-claim" (include "hpcc.utils.fullname" .) }}
+  name: {{ printf "%s-dllserver-pv-claim" (include "hpcc.fullname" .) }}
   labels:
-    app.kubernetes.io/name: {{ printf "%s-dllserver-pv-claim" (include "hpcc.utils.fullname" .) }}
+    app.kubernetes.io/name: {{ printf "%s-dllserver-pv-claim" (include "hpcc.fullname" .) }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "hpcc.utils.chart" . }}
+    helm.sh/chart: {{ include "hpcc.chart" . }}
 spec:
   accessModes:
     - ReadWriteMany

dockerfiles/hpcc/templates/eclagent.yaml

@@ -17,16 +17,16 @@ spec:
       containers:
       - name: {{ .name | quote }}
         args: [ 
-                {{ include "hpcc.utils.configArg" . }},
-                {{ include "hpcc.utils.daliArg" $ }}
+                {{ include "hpcc.configArg" . }},
+                {{ include "hpcc.daliArg" $ }}
               ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" . "imagename" "eclagent") | indent 8 }}
-{{ include "hpcc.utils.addVolumeMounts" . | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" . "imagename" "eclagent") | indent 8 }}
+{{ include "hpcc.addVolumeMounts" . | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addVolumes" $ | indent 6 }}
 ---
-{{- include "hpcc.utils.generateConfigMap" (dict "root" $ "me" .) }}
+{{- include "hpcc.generateConfigMap" (dict "root" $ "me" .) }}
   jobspec.yaml: |
     apiVersion: batch/v1
     kind: Job
@@ -38,7 +38,7 @@ spec:
         spec:
           containers:
           - name: %jobname
-            image: {{ include "hpcc.utils.imageName" (dict "root" $ "me" . "imagename" "eclagent") }}
+            image: {{ include "hpcc.imageName" (dict "root" $ "me" . "imagename" "eclagent") }}
             resources:
               requests:
                 #request-memory
@@ -48,14 +48,14 @@ spec:
                 #limit-cpu
             command: [
                         "eclagent",
-                        {{ include "hpcc.utils.configArg" . }},
-                        {{ include "hpcc.utils.daliArg" $ }},
+                        {{ include "hpcc.configArg" . }},
+                        {{ include "hpcc.daliArg" $ }},
                         %args
                      ]
-{{ include "hpcc.utils.addVolumeMounts" . | indent 12 }}
+{{ include "hpcc.addVolumeMounts" . | indent 12 }}
           volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 10 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 10 }}
+{{ include "hpcc.addConfigVolume" . | indent 10 }}
+{{ include "hpcc.addVolumes" $ | indent 10 }}
           restartPolicy: Never
       backoffLimit: 0
       

dockerfiles/hpcc/templates/eclccserver.yaml

@@ -19,16 +19,16 @@ spec:
       - name: {{ .name | quote }}
         args: [
                 "--containerPerCompile=1",
-                {{ include "hpcc.utils.configArg" . }},
-                {{ include "hpcc.utils.daliArg" $ }}
+                {{ include "hpcc.configArg" . }},
+                {{ include "hpcc.daliArg" $ }}
               ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" . "imagename" "eclccserver") | indent 8 }}
-{{ include "hpcc.utils.addVolumeMounts" . | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" . "imagename" "eclccserver") | indent 8 }}
+{{ include "hpcc.addVolumeMounts" . | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addVolumes" $ | indent 6 }}
 ---
-{{- include "hpcc.utils.generateConfigMap" (dict "root" $ "me" .) }}
+{{- include "hpcc.generateConfigMap" (dict "root" $ "me" .) }}
   jobspec.yaml: |
     apiVersion: batch/v1
     kind: Job
@@ -40,7 +40,7 @@ spec:
         spec:
           containers:
           - name: %jobname
-            image: {{ include "hpcc.utils.imageName" (dict "root" $ "me" . "imagename" "eclccserver") }}
+            image: {{ include "hpcc.imageName" (dict "root" $ "me" . "imagename" "eclccserver") }}
             resources:
               requests:
                 #request-memory
@@ -50,14 +50,14 @@ spec:
                 #limit-cpu
             command: [
                         "eclccserver",
-                        {{ include "hpcc.utils.configArg" . }},
-                        {{ include "hpcc.utils.daliArg" $ }},
+                        {{ include "hpcc.configArg" . }},
+                        {{ include "hpcc.daliArg" $ }},
                         %args
                      ]
-{{ include "hpcc.utils.addVolumeMounts" . | indent 12 }}
+{{ include "hpcc.addVolumeMounts" . | indent 12 }}
           volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 10 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 10 }}
+{{ include "hpcc.addConfigVolume" . | indent 10 }}
+{{ include "hpcc.addVolumes" $ | indent 10 }}
           restartPolicy: Never
       backoffLimit: 0
       

dockerfiles/hpcc/templates/esp.yaml

@@ -16,16 +16,16 @@ spec:
       containers:
       - name: {{ .name | quote }}
         args: [
-                # {{ include "hpcc.utils.configArg" . }},
-                # {{ include "hpcc.utils.daliArg" $ }}
+                # {{ include "hpcc.configArg" . }},
+                # {{ include "hpcc.daliArg" $ }}
               ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" . "imagename" "esp") | indent 8 }}
-{{ include "hpcc.utils.addVolumeMounts" . | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" . "imagename" "esp") | indent 8 }}
+{{ include "hpcc.addVolumeMounts" . | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addVolumes" $ | indent 6 }}
 ---
-{{- include "hpcc.utils.generateConfigMap" (dict "root" $ "me" .) -}}
+{{- include "hpcc.generateConfigMap" (dict "root" $ "me" .) -}}
 ---
 apiVersion: v1
 kind: Service

dockerfiles/hpcc/templates/localroxie.yaml

@@ -19,19 +19,19 @@ spec:
       containers:
       - name: {{ $roxie.name | quote }}
         args: [
-                {{ include "hpcc.utils.configArg" $roxie }},
-                {{ include "hpcc.utils.daliArg" $ }},
-                "--serverPorts={{ template "hpcc.utils.portListToCommas" $roxie.ports }}", 
+                {{ include "hpcc.configArg" $roxie }},
+                {{ include "hpcc.daliArg" $ }},
+                "--serverPorts={{ template "hpcc.portListToCommas" $roxie.ports }}", 
                 "--localSlave=true",
                 "--resolveLocally=false"
               ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" . "imagename" "roxie") | indent 8 }}
-{{ include "hpcc.utils.addVolumeMounts" . | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" . "imagename" "roxie") | indent 8 }}
+{{ include "hpcc.addVolumeMounts" . | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addVolumes" $ | indent 6 }}
 ---
-{{- include "hpcc.utils.generateConfigMap" (dict "root" $ "me" $roxie ) -}}
+{{- include "hpcc.generateConfigMap" (dict "root" $ "me" $roxie ) -}}
 ---
 {{- end }}
 {{- end }}

dockerfiles/hpcc/templates/roxie.yaml

@@ -21,11 +21,11 @@ spec:
       containers:
       - name: {{ $toponame | quote }}
         args: [ "--port={{ $topoport }}" ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" $roxie "imagename" "toposerver") | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" $roxie "imagename" "toposerver") | indent 8 }}
         volumeMounts:
-{{ include "hpcc.utils.addConfigVolumeMount" . | indent 8 }}
+{{ include "hpcc.addConfigVolumeMount" . | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
 
 ---
 
@@ -44,7 +44,7 @@ spec:
 
 ---
 
-{{- include "hpcc.utils.generateConfigMap" (dict "root" $ "me" $roxie) -}}
+{{- include "hpcc.generateConfigMap" (dict "root" $ "me" $roxie) -}}
 
 ---
 
@@ -67,19 +67,19 @@ spec:
       containers:
       - name: {{ $servername | quote }}
         args: [
-                {{ include "hpcc.utils.configArg" . }},
-                {{ include "hpcc.utils.daliArg" $ }},
+                {{ include "hpcc.configArg" . }},
+                {{ include "hpcc.daliArg" $ }},
                 "--numChannels={{ $numChannels }}",
-                "--serverPorts={{ template "hpcc.utils.portListToCommas" $roxie.ports }}", 
+                "--serverPorts={{ template "hpcc.portListToCommas" $roxie.ports }}", 
                 "--topologyServers={{ $toponame }}:{{ $roxie.topoport }}",
                 "--localSlave=false", 
                 "--resolveLocally=false"
               ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" $roxie "imagename" "roxie") | indent 8 }}
-{{ include "hpcc.utils.addVolumeMounts" . | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" $roxie "imagename" "roxie") | indent 8 }}
+{{ include "hpcc.addVolumeMounts" . | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addVolumes" $ | indent 6 }}
 ---
 
 {{ end -}}
@@ -104,19 +104,19 @@ spec:
       containers:
       - name: {{ $name | quote}}
         args: [ 
-                {{ include "hpcc.utils.configArg" $roxie }},
-                {{ include "hpcc.utils.daliArg" $ }},
+                {{ include "hpcc.configArg" $roxie }},
+                {{ include "hpcc.daliArg" $ }},
                 "--channels={{ $channel }}", 
-                "--serverPorts={{ if not $roxie.serverReplicas }}{{ template "hpcc.utils.portListToCommas" $roxie.ports }}{{ end }}",
+                "--serverPorts={{ if not $roxie.serverReplicas }}{{ template "hpcc.portListToCommas" $roxie.ports }}{{ end }}",
                 "--numChannels={{ $numChannels }}",
                 "--localSlave=false", 
                 "--topologyServers={{ $toponame }}:{{ $roxie.topoport }}",
               ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" $roxie "imagename" "roxie") | indent 8 }}
-{{ include "hpcc.utils.addVolumeMounts" $roxie | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" $roxie "imagename" "roxie") | indent 8 }}
+{{ include "hpcc.addVolumeMounts" $roxie | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addVolumes" $ | indent 6 }}
 
 ---
 

dockerfiles/hpcc/templates/thor.yaml

@@ -22,16 +22,16 @@ spec:
         ports:
           - containerPort: {{ $masterPort }}
         args: [
-                {{ include "hpcc.utils.configArg" . }},
-                {{ include "hpcc.utils.daliArg" $ }},
+                {{ include "hpcc.configArg" . }},
+                {{ include "hpcc.daliArg" $ }},
                 --masterport={{ $masterPort }},
                 --numSlaves={{ $thor.numSlaves }}
               ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" . "imagename" "thormaster") | indent 8 }}
-{{ include "hpcc.utils.addVolumeMounts" . | indent 8 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" . "imagename" "thormaster") | indent 8 }}
+{{ include "hpcc.addVolumeMounts" . | indent 8 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addVolumes" $ | indent 6 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -50,18 +50,18 @@ spec:
       containers:
         - name: {{ $slaveName | quote }}
           args: [
-                  {{ include "hpcc.utils.configArg" . }},
-                  {{ include "hpcc.utils.daliArg" $ }},
+                  {{ include "hpcc.configArg" . }},
+                  {{ include "hpcc.daliArg" $ }},
                   --slaveport={{ $slavePort }},
                   --master={{ printf "%s:%v" $serviceName $masterPort }}
                 ]
-{{ include "hpcc.utils.addImageAttrs" (dict "root" $ "me" . "imagename" "thorslave") | indent 10 }}
+{{ include "hpcc.addImageAttrs" (dict "root" $ "me" . "imagename" "thorslave") | indent 10 }}
           ports:
             - containerPort: {{ $slavePort }}
-{{ include "hpcc.utils.addVolumeMounts" . | indent 10 }}
+{{ include "hpcc.addVolumeMounts" . | indent 10 }}
       volumes:
-{{ include "hpcc.utils.addConfigVolume" . | indent 6 }}
-{{ include "hpcc.utils.addVolumes" $ | indent 6 }}
+{{ include "hpcc.addConfigVolume" . | indent 6 }}
+{{ include "hpcc.addVolumes" $ | indent 6 }}
 ---
 apiVersion: v1
 kind: Service
@@ -76,5 +76,5 @@ spec:
     run: {{ .name | quote }}
   type: ClusterIP
 ---
-{{- include "hpcc.utils.generateConfigMap" (dict "root" $ "me" .) -}}
+{{- include "hpcc.generateConfigMap" (dict "root" $ "me" .) -}}
 {{- end }}

dockerfiles/hpcc/values.yaml

@@ -15,7 +15,7 @@ global:
     # existingClaim: ""
   
   dataStorage:
-    storageSize: 1G
+    storageSize: 1Gi
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is