Skip to content

Commit

Permalink
Community Edition 9.4.18-rc2 Release Candidate 2
Browse files Browse the repository at this point in the history
Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Dec 8, 2023
1 parent 897e4e0 commit 6b4e1a9
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions helm/hpcc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 9.4.18-rc1
version: 9.4.18-rc2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.

appVersion: 9.4.18-rc1
appVersion: 9.4.18-rc2
2 changes: 1 addition & 1 deletion helm/hpcc/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,7 @@ kind: Service
metadata:
name: {{ $lvars.serviceName | quote }}
labels:
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }}
{{- if $lvars.labels }}
{{ toYaml $lvars.labels | indent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion helm/hpcc/templates/dafilesrv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
labels:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }}
server: {{ .name | quote }}
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
annotations:
checksum/config: {{ $configSHA }}
{{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion helm/hpcc/templates/dali.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ spec:
run: {{ $dali.name | quote }}
server: {{ $dali.name | quote }}
app: dali
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey $.Values.global "metrics" }}
{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion helm/hpcc/templates/dfuserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }}
run: {{ .name | quote }}
accessDali: "yes"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions helm/hpcc/templates/eclagent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ data:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" $apptype "name" "eclagent" "instance" $appJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }}
accessDali: "yes"
accessEsp: "yes"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
{{- end }}
Expand Down Expand Up @@ -137,7 +137,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions helm/hpcc/templates/eclccserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ data:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclccserver" "name" "eclccserver" "instance" $compileJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }}
accessDali: "yes"
accessEsp: "yes"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
{{- end }}
Expand Down Expand Up @@ -143,7 +143,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion helm/hpcc/templates/eclscheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: "no"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion helm/hpcc/templates/esp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
accessSasha: "yes"
{{- end }}
app: {{ $application }}
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- include "hpcc.addStandardLabels" (dict "root" $ "name" $application "component" "esp" "instance" .name) | indent 8 }}
{{- if hasKey $.Values.global "metrics" }}
{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion helm/hpcc/templates/localroxie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
server: {{ $servername | quote }}
accessDali: "yes"
accessEsp: "yes"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }}
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
Expand Down
8 changes: 4 additions & 4 deletions helm/hpcc/templates/roxie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ spec:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }}
run: {{ $commonCtx.toponame | quote }}
roxie-cluster: {{ $roxie.name | quote }}
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey $.Values.global "metrics" }}
{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
{{- end }}
Expand Down Expand Up @@ -183,7 +183,7 @@ kind: Service
metadata:
name: {{ $commonCtx.toponame | quote }}
labels:
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
spec:
ports:
Expand Down Expand Up @@ -245,7 +245,7 @@ spec:
roxie-cluster: {{ $roxie.name | quote }}
accessDali: "yes"
accessEsp: "yes"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }}
{{- if hasKey $.Values.global "metrics" }}
{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
Expand Down Expand Up @@ -353,7 +353,7 @@ spec:
roxie-cluster: {{ $roxie.name | quote }}
accessDali: "yes"
accessEsp: "yes"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey $.Values.global "metrics" }}
{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion helm/hpcc/templates/sasha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
server: {{ $serviceName | quote }}
app: sasha
accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }}
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- if hasKey $sasha "labels" }}
{{ toYaml $sasha.labels | indent 8 }}
{{- end }}
Expand Down
10 changes: 5 additions & 5 deletions helm/hpcc/templates/thor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ data:
labels:
accessDali: "yes"
accessEsp: "yes"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 8 }}
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
Expand Down Expand Up @@ -151,7 +151,7 @@ data:
accessEsp: "yes"
app: "thor"
component: "thormanager"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
instance: "_HPCC_JOBNAME_"
job: "_HPCC_JOBNAME_"
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thormanager" "name" "thor" "instance" $thorManagerJobName "instanceOf" (printf "%s-thormanager-job" .me.name)) | indent 12 }}
Expand Down Expand Up @@ -218,7 +218,7 @@ data:
accessEsp: "yes"
app: "thor"
component: "thorworker"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
instance: "_HPCC_JOBNAME_"
job: "_HPCC_JOBNAME_"
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thorworker" "name" "thor" "instance" $thorWorkerJobName "instanceOf" (printf "%s-thorworker-job" .me.name)) | indent 12 }}
Expand Down Expand Up @@ -351,7 +351,7 @@ spec:
accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }}
app: "thor"
component: "thor-eclagent"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
instance: {{ $commonCtx.eclAgentName | quote }}
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }}
{{- if hasKey $commonCtx.me "labels" }}
Expand Down Expand Up @@ -416,7 +416,7 @@ spec:
accessEsp: "no"
app: "thor"
component: "thor-thoragent"
helmVersion: 9.4.18-rc1
helmVersion: 9.4.18-rc2
instance: {{ $commonCtx.thorAgentName | quote }}
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }}
{{- if hasKey $commonCtx.me "labels" }}
Expand Down
4 changes: 2 additions & 2 deletions version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ set ( HPCC_MAJOR 9 )
set ( HPCC_MINOR 4 )
set ( HPCC_POINT 18 )
set ( HPCC_MATURITY "rc" )
set ( HPCC_SEQUENCE 1 )
set ( HPCC_TAG_TIMESTAMP "2023-12-07T18:03:58Z" )
set ( HPCC_SEQUENCE 2 )
set ( HPCC_TAG_TIMESTAMP "2023-12-08T14:11:57Z" )
###

0 comments on commit 6b4e1a9

Please sign in to comment.