11{ {/*
22
33--- DO NOT EDIT THIS FILE - all configuration of HPCC platform should be done via values.yaml ----
4-
4+
55##############################################################################
66
77 HPCC SYSTEMS software Copyright (C) 2021 HPCC Systems®.
1717 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1818 See the License for the specific language governing permissions and
1919 limitations under the License.
20-
20+
2121##############################################################################
2222
2323*/} }
@@ -64,7 +64,7 @@ Translate a port list to a comma-separated list
6464 { {- $local := dict " first" true -} }
6565 { {- range $key , $value := . -} }{ {- if not $local .first -} },{ {- end -} }{ {- $value -} }{ {- $_ := set $local " first" false -} }{ {- end -} }
6666 { {- else -} }
67- { {- . -} }
67+ { {- . -} }
6868 { {- end -} }
6969{ {- end -} }
7070
@@ -877,7 +877,7 @@ Generates image information into env. variables used at runtime for runtime plat
877877{ {- end -} }
878878
879879{ {/*
880- Add image attributes for a component
880+ Add image attributes for a component
881881Pass in a dictionary with root, me and imagename defined
882882*/} }
883883{ {- define " hpcc.addImageAttrs" -} }
@@ -890,7 +890,7 @@ imagePullPolicy: {{ .root.Values.global.image.pullPolicy | default "IfNotPresent
890890{ {- end -} }
891891
892892{ {/*
893- Add image pull credentials for a component
893+ Add image pull credentials for a component
894894Pass in a dictionary with root and me defined
895895*/} }
896896{ {- define " hpcc.addImagePullSecrets" -} }
@@ -1237,7 +1237,7 @@ Generate instance queue names
12371237{ {- range $.Values.roxie -} }
12381238 { {- if not .disabled -} }
12391239- name: { { .name } }
1240- type: roxie
1240+ type: roxie
12411241 { {- if hasKey . " prefix" } }
12421242 prefix: { { .prefix } }
12431243 { {- end } }
@@ -1660,12 +1660,12 @@ spec:
16601660 loadBalancerSourceRanges:
16611661 { {- if ne $lvars .type " LoadBalancer" -} }
16621662 { {- $_ := fail (printf " loadBalanceSourceRanges invalid unless service type is LoadBalancer" ) -} }
1663- { {- end -} }
1663+ { {- end -} }
16641664 { {- range $cidr := $lvars .loadBalancerSourceRanges } }
16651665 - { { $cidr } }
16661666 { {- end } }
16671667{ { end } }
1668- { {- if $lvars .ingress } }
1668+ { {- if $lvars .ingress } }
16691669---
16701670apiVersion: networking.k8s.io/v1
16711671kind: NetworkPolicy
@@ -1727,7 +1727,7 @@ dali data
17271727A template to generate the standard app.kubernetes.io labels and standard HPCC labels
17281728
17291729Pass in root, name, component, instance
1730- root name(k8s application name) component(component within the application, can be same as app) instance
1730+ root name(k8s application name) component(component within the application, can be same as app) instance
17311731
17321732https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/
17331733----------------------------+-------------------------------------------------------------+----------
@@ -2623,7 +2623,7 @@ globalExcludeList below is a hard-coded list of global keys to exclude.
26232623
26242624*/} }
26252625{ {- define " hpcc.getConfigSHA" } }
2626- { {- $globalExcludeList := list " ~.*::replicas" " ~.*::vaults" -} }
2626+ { {- $globalExcludeList := list " ~.*::logging " " ~.*:: replicas" " ~.*::vaults" -} }
26272627{ {- $globalExcludeSectionRegexList := list " .*-job.yaml$" -} }
26282628{ {- $componentExcludeList := ternary (splitList " ," (.excludeKeys | default " " )) list (hasKey . " excludeKeys" ) -} }
26292629{ {- $combinedExcludeKeyList := concat $globalExcludeList $componentExcludeList -} }
@@ -2803,7 +2803,7 @@ Pass in dict with .root, .me and .labels
28032803 { {- $_ := set $lvars " egress" .me.egress -} }
28042804 { {- end -} }
28052805{ {- end -} }
2806- { {- if $lvars .egress } }
2806+ { {- if $lvars .egress } }
28072807apiVersion: networking.k8s.io/v1
28082808kind: NetworkPolicy
28092809metadata:
@@ -2921,7 +2921,7 @@ spec:
29212921 minReplicas: { { (hasKey .hpa " minReplicas" ) | ternary .hpa.minReplicas 1 } }
29222922 maxReplicas: { { .hpa.maxReplicas } }
29232923 { {- if hasKey .hpa " behavior" } }
2924- behavior:
2924+ behavior:
29252925 { {- if hasKey .hpa.behavior " scaleDown" } }
29262926 scaleDown:
29272927 { {- include " hpcc.addHPABehaviorScale" (dict " behaviorScale" .hpa.behavior.scaleDown) | nindent 6 } }
0 commit comments