-
Notifications
You must be signed in to change notification settings - Fork 304
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/candidate-9.6.x'
Signed-off-by: Gavin Halliday <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
- Loading branch information
Showing
9 changed files
with
700 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| {{/* | ||
|
|
||
| --- DO NOT EDIT THIS FILE - all configuration of HPCC platform should be done via values.yaml ---- | ||
|
|
||
| ############################################################################## | ||
|
|
||
| HPCC SYSTEMS software Copyright (C) 2021 HPCC Systems®. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
|
|
||
| ############################################################################## | ||
|
|
||
| */}} | ||
| {{/* | ||
| localroxie configmap | ||
| Pass in dict with root and me | ||
| */}} | ||
| {{- define "hpcc.localroxieConfigMap" }} | ||
| apiVersion: v1 | ||
| metadata: | ||
| name: {{ .me.name }}-configmap | ||
| data: | ||
| {{ .me.name }}.yaml: | ||
| version: 1.0 | ||
| roxie: | ||
| {{ toYaml (omit .me "logging" "tracing" "env") | indent 6 }} | ||
| {{- include "hpcc.generateLoggingConfig" . | indent 6 }} | ||
| {{- include "hpcc.generateTracingConfig" . | indent 6 }} | ||
| {{ include "hpcc.generateVaultConfig" . | indent 6 }} | ||
| global: | ||
| {{ include "hpcc.generateGlobalConfigMap" .root | indent 6 }} | ||
| {{- end -}}{{/* define "hpcc.localroxieConfigMap */}} | ||
|
|
||
| {{ range $roxie := $.Values.roxie -}} | ||
| {{- if not $roxie.disabled -}} | ||
| {{- $env := concat ($.Values.global.env | default list) (.env | default list) -}} | ||
| {{- $secretsCategories := list "system" "eclUser" "ecl" "storage" }} | ||
| {{- $enginePlaneDetails := dict -}} | ||
| {{- $_ := include "hpcc.getEnginePlanes" (dict "root" $ "me" . "result" $enginePlaneDetails) -}} | ||
| {{- $commonCtx := dict "root" $ "me" $roxie "includeCategories" $enginePlaneDetails.planeCategories "includeNames" $enginePlaneDetails.namedPlanes "secretsCategories" $secretsCategories "env" $env }} | ||
| {{- $configSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.localroxieConfigMap" "component" "roxie" "excludeKeys" "global")) }} | ||
| {{- include "hpcc.checkDefaultStoragePlane" $commonCtx }} | ||
| {{- $singleNode := (hasKey $roxie "singleNode") | ternary $roxie.singleNode ((hasKey $roxie "localAgent") | ternary $roxie.localAgent false) }} | ||
| {{- if $singleNode -}} | ||
| {{- $localAgent := ((hasKey $roxie "localAgent") | ternary $roxie.localAgent true) -}} | ||
| {{- $name := $roxie.name -}} | ||
| {{- $servername := printf "%s-server" $roxie.name -}} | ||
|
|
||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{ $roxie.name | quote }} | ||
| spec: | ||
| replicas: {{ $roxie.replicas | default 1 }} | ||
| selector: | ||
| matchLabels: | ||
| run: {{ $roxie.name | quote }} | ||
| server: {{ $servername | quote }} | ||
| template: | ||
| metadata: | ||
| labels: | ||
| run: {{ $roxie.name | quote }} | ||
| server: {{ $servername | quote }} | ||
| accessDali: "yes" | ||
| accessEsp: "yes" | ||
| <<<<<<< HEAD | ||
| helmVersion: 9.0.117-closedown0 | ||
| {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} | ||
| {{- if hasKey . "labels" }} | ||
| {{ toYaml .labels | indent 8 }} | ||
| {{- end }} | ||
| ======= | ||
| helmVersion: 9.0.117-closedown0 | ||
| {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} | ||
| {{- if hasKey . "labels" }} | ||
| {{ toYaml .labels | indent 8 }} | ||
| {{- end }} | ||
| >>>>>>> origin/candidate-9.6.x | ||
| annotations: | ||
| checksum/config: {{ $configSHA }} | ||
| {{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }} | ||
| spec: | ||
| {{- include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $roxie.name "target" $roxie.name "type" "roxie") | indent 6 }} | ||
| serviceAccountName: "hpcc-default" | ||
| initContainers: | ||
| {{- include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }} | ||
| {{- include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}} | ||
| containers: | ||
| - name: {{ $roxie.name | quote }} | ||
| workingDir: /var/lib/HPCCSystems | ||
| command: [ {{ include "hpcc.componentCommand" (dict "me" $roxie "root" $ "process" "roxie") }} ] | ||
| args: [ {{- include "hpcc.componentStartArgs" (dict "me" $roxie "root" $ "process" "roxie") | nindent 16 }} | ||
| {{ include "hpcc.configArg" $roxie }}, | ||
| {{ include "hpcc.daliArg" (dict "root" $ "component" "Local Roxie" "optional" false) }}, | ||
| "--server=true", | ||
| "--localAgent={{ $localAgent }}", | ||
| "--resolveLocally=false" | ||
| ] | ||
| env: | ||
| {{ include "hpcc.mergeEnvironments" $env | indent 8 -}} | ||
| - name: "SENTINEL" | ||
| value: "/tmp/{{ $roxie.name }}.sentinel" | ||
| {{- $local := dict "first" true }} | ||
| {{- range $service := $roxie.services }} | ||
| {{- if ne (int $service.servicePort) 0 }} | ||
| {{- if $local.first }} | ||
| {{- $_ := set $local "first" false }} | ||
| ports: | ||
| {{- end }} | ||
| - name: {{ $service.name }} | ||
| containerPort: {{ $service.servicePort }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }} | ||
| {{- include "hpcc.addResources" (dict "me" $roxie.resources "root" $) | indent 8 }} | ||
| {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }} | ||
| volumeMounts: | ||
| {{ include "hpcc.addConfigMapVolumeMount" . | indent 8 }} | ||
| {{ include "hpcc.addVolumeMounts" $commonCtx | indent 8 }} | ||
| {{- include "hpcc.addSecretVolumeMounts" $commonCtx | indent 8 }} | ||
| {{ include "hpcc.addVaultClientCertificateVolumeMounts" $commonCtx | indent 8 }} | ||
| {{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" false) | indent 8 }} | ||
| {{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" true "includeRemote" true) | indent 8 }} | ||
| {{ include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localudpkey" ) | indent 8 }} | ||
| volumes: | ||
| {{ include "hpcc.addConfigMapVolume" . | indent 6 }} | ||
| {{ include "hpcc.addVolumes" $commonCtx | indent 6 }} | ||
| {{ include "hpcc.addSecretVolumes" $commonCtx | indent 6 }} | ||
| {{ include "hpcc.addVaultClientCertificateVolumes" $commonCtx | indent 6 }} | ||
| {{ include "hpcc.addCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" false) | indent 6 }} | ||
| {{ include "hpcc.addCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" true "includeRemote" true) | indent 6 }} | ||
| {{ include "hpcc.addUDPCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localudpkey" ) | indent 6 }} | ||
| --- | ||
| {{- range $service := $roxie.services }} | ||
| {{- if ne (int $service.servicePort) 0 }} | ||
| {{ include "hpcc.addService" ( dict "root" $ "name" $service.name "service" $service "selector" $servername "defaultPort" $service.servicePort ) }} | ||
| --- | ||
| {{- end }} | ||
| {{- end }} | ||
| kind: ConfigMap | ||
| {{ include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.localroxieConfigMap")) }} | ||
| --- | ||
| {{ include "hpcc.addCertificate" (dict "root" $ "name" $roxie.name "services" $roxie.services "component" "localroxie" "external" false) }} | ||
| {{ include "hpcc.addCertificate" (dict "root" $ "name" $roxie.name "services" $roxie.services "component" "localroxie" "external" true "includeRemote" true) }} | ||
| {{ include "hpcc.addUDPCertificate" (dict "root" $ "name" $roxie.name "component" "localudpkey") }} | ||
| --- | ||
| {{ include "hpcc.addEgress" $commonCtx }} | ||
|
|
||
| {{- end }}{{/* if singleNode */}} | ||
| {{- end }}{{/* if not disabled */}} | ||
| {{- end }}{{/* range */}} |
Oops, something went wrong.