diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml index aee2fa519d6..75a631f2b6f 100644 --- a/helm/hpcc/templates/dafilesrv.yaml +++ b/helm/hpcc/templates/dafilesrv.yaml @@ -133,7 +133,7 @@ Generate network policies for spray services to allow ingress from dfuservers {{- if hasKey $networkPolicyCtx.dfuServerMap .name -}} {{- $_ := set $commonCtx "allowedDfuServers" (concat $commonCtx.allowedDfuServers (get $networkPolicyCtx.dfuServerMap .name)) -}} {{- end -}} - {{- if $commonCtx.allowedDfuServers -}} + {{- if $commonCtx.allowedDfuServers }} apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml index a8c12ba0dbf..dd040746eec 100644 --- a/helm/hpcc/templates/roxie.yaml +++ b/helm/hpcc/templates/roxie.yaml @@ -222,7 +222,7 @@ kind: ConfigMap {{- $_ := set $commonCtx "instanceNames" list -}} {{ if $roxie.serverReplicas -}} -{{ $_ := set $commonCtx "instanceNames" (list $servername) -}} +{{ $_ := set $commonCtx "instanceNames" (list $servername) }} apiVersion: apps/v1 kind: Deployment metadata: diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml index a2fff9e6611..8781ca10736 100644 --- a/helm/hpcc/templates/thor.yaml +++ b/helm/hpcc/templates/thor.yaml @@ -83,7 +83,7 @@ data: accessDali: "yes" accessEsp: "yes" {{- include "hpcc.generateHelmVersion" . | nindent 12 }} - {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 8 }} + {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 12 }} {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} diff --git a/testing/helm/tests/furthercoverage.yaml b/testing/helm/tests/furthercoverage.yaml new file mode 100644 index 00000000000..7396612ba53 --- /dev/null +++ b/testing/helm/tests/furthercoverage.yaml @@ -0,0 +1,31 @@ +# This values file is here to exrcise all of the different paths in the helm chart. +# It is a copy of values.yaml, all changes are marked with #CHANGE. +# +# - roxie: Enabling server replicas in roxie +# - thor: eclAgentUseChildProcesses=false + +roxie: +- name: roxie + disabled: false + prefix: roxie + services: + - name: roxie + servicePort: 9876 + listenQueue: 200 + numThreads: 30 + visibility: local + replicas: 2 + numChannels: 2 + singleNode: false + traceLevel: 1 + serverReplicas: 4 #CHANGE + topoServer: + replicas: 1 + +thor: +- name: thor + prefix: thor + numWorkers: 2 + maxJobs: 4 + maxGraphs: 2 + eclAgentUseChildProcesses: false #CHANGE