From 1d7b3bcf32fcc91b26638527c3e781a1564df895 Mon Sep 17 00:00:00 2001
From: Gavin Halliday <gavin.halliday@lexisnexis.com>
Date: Fri, 14 Jun 2024 17:04:00 +0100
Subject: [PATCH] Community Edition 9.4.70-rc1 Release Candidate 1

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
---
 helm/hpcc/Chart.yaml                      |  4 ++--
 helm/hpcc/templates/_helpers.tpl          |  2 +-
 helm/hpcc/templates/dafilesrv.yaml        |  2 +-
 helm/hpcc/templates/dali.yaml             |  2 +-
 helm/hpcc/templates/dfuserver.yaml        |  2 +-
 helm/hpcc/templates/eclagent.yaml         |  4 ++--
 helm/hpcc/templates/eclccserver.yaml      |  4 ++--
 helm/hpcc/templates/eclscheduler.yaml     |  2 +-
 helm/hpcc/templates/esp.yaml              |  2 +-
 helm/hpcc/templates/localroxie.yaml       |  2 +-
 helm/hpcc/templates/localroxie.yaml.fixed |  4 ++--
 helm/hpcc/templates/roxie.yaml            |  8 ++++----
 helm/hpcc/templates/roxie.yaml.fixed      | 16 ++++++++--------
 helm/hpcc/templates/sasha.yaml            |  2 +-
 helm/hpcc/templates/thor.yaml             | 10 +++++-----
 version.cmake                             |  8 ++++----
 16 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml
index 139a9b83c03..4795fd308c0 100644
--- a/helm/hpcc/Chart.yaml
+++ b/helm/hpcc/Chart.yaml
@@ -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.69-closedown0
+version: 9.4.70-rc1
 
 # 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.69-closedown0
+appVersion: 9.4.70-rc1
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index 33b9199de4d..e9028744a7a 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -1519,7 +1519,7 @@ kind: Service
 metadata:
   name: {{ $lvars.serviceName | quote }}
   labels:
-    helmVersion: 9.4.69-closedown0
+    helmVersion: 9.4.70-rc1
     {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }}
 {{- if $lvars.labels }}
 {{ toYaml $lvars.labels | indent 4 }}
diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml
index 314832ebffc..d0ffc0bdacc 100644
--- a/helm/hpcc/templates/dafilesrv.yaml
+++ b/helm/hpcc/templates/dafilesrv.yaml
@@ -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.69-closedown0
+        helmVersion: 9.4.70-rc1
       annotations:
         checksum/config: {{ $configSHA }}
         {{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }}
diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml
index 1974d20224d..b9b6e02e308 100644
--- a/helm/hpcc/templates/dali.yaml
+++ b/helm/hpcc/templates/dali.yaml
@@ -88,7 +88,7 @@ spec:
         run: {{ $dali.name | quote }}
         server: {{ $dali.name | quote }}
         app: dali
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml
index c4e0dc5b0ff..c5ab5daf374 100644
--- a/helm/hpcc/templates/dfuserver.yaml
+++ b/helm/hpcc/templates/dfuserver.yaml
@@ -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.69-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml
index e50403c215d..49f8c5c7ccb 100644
--- a/helm/hpcc/templates/eclagent.yaml
+++ b/helm/hpcc/templates/eclagent.yaml
@@ -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.69-closedown0
+            helmVersion: 9.4.70-rc1
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
 {{- end }}
@@ -137,7 +137,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml
index d1f04144b0a..6a0208f5ae9 100644
--- a/helm/hpcc/templates/eclccserver.yaml
+++ b/helm/hpcc/templates/eclccserver.yaml
@@ -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.69-closedown0
+            helmVersion: 9.4.70-rc1
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
 {{- end }}
@@ -143,7 +143,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml
index fb4890e011d..8d7d7d943e6 100644
--- a/helm/hpcc/templates/eclscheduler.yaml
+++ b/helm/hpcc/templates/eclscheduler.yaml
@@ -65,7 +65,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: "no"
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml
index 5b692cf5102..efac06e3e2c 100644
--- a/helm/hpcc/templates/esp.yaml
+++ b/helm/hpcc/templates/esp.yaml
@@ -122,7 +122,7 @@ spec:
         accessSasha: "yes"
 {{- end }}
         app: {{ $application }}
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
         {{- 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 }}
diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml
index de404448da2..ad2da23d124 100644
--- a/helm/hpcc/templates/localroxie.yaml
+++ b/helm/hpcc/templates/localroxie.yaml
@@ -73,7 +73,7 @@ spec:
         server: {{ $servername | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }}
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
diff --git a/helm/hpcc/templates/localroxie.yaml.fixed b/helm/hpcc/templates/localroxie.yaml.fixed
index 099b501840b..1242e002786 100644
--- a/helm/hpcc/templates/localroxie.yaml.fixed
+++ b/helm/hpcc/templates/localroxie.yaml.fixed
@@ -74,13 +74,13 @@ spec:
         accessDali: "yes"
         accessEsp: "yes"
 <<<<<<< HEAD
-        helmVersion: 9.0.117-closedown0
+        helmVersion: 9.4.70-rc1
 {{-    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
+        helmVersion: 9.4.70-rc1
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }}
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml
index 073b7570de8..531d4b837cd 100644
--- a/helm/hpcc/templates/roxie.yaml
+++ b/helm/hpcc/templates/roxie.yaml
@@ -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.69-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel"  $.Values.global.metrics | nindent 8}}
 {{- end }}
@@ -182,7 +182,7 @@ kind: Service
 metadata:
   name: {{ $commonCtx.toponame | quote }}
   labels:
-    helmVersion: 9.4.69-closedown0
+    helmVersion: 9.4.70-rc1
     {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
 spec:
   ports:
@@ -244,7 +244,7 @@ spec:
         roxie-cluster: {{ $roxie.name | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
         {{- 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}}
@@ -352,7 +352,7 @@ spec:
         roxie-cluster: {{ $roxie.name | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
 {{- end }}
diff --git a/helm/hpcc/templates/roxie.yaml.fixed b/helm/hpcc/templates/roxie.yaml.fixed
index 3f919f7c048..c378c5f54c9 100644
--- a/helm/hpcc/templates/roxie.yaml.fixed
+++ b/helm/hpcc/templates/roxie.yaml.fixed
@@ -126,7 +126,7 @@ spec:
         run: {{ $commonCtx.toponame | quote }}
         roxie-cluster: {{ $roxie.name | quote }}
 <<<<<<< HEAD
-        helmVersion: 9.0.117-closedown0
+        helmVersion: 9.4.70-rc1
 {{-    if hasKey $.Values.global "metrics" }}
 {{-     include "hpcc.generateMetricsReporterLabel"  $.Values.global.metrics | nindent 8}}
 {{-    end }}
@@ -134,7 +134,7 @@ spec:
 {{      toYaml $toposerver.labels | indent 8 }}
 {{-    end }}
 =======
-        helmVersion: 9.0.117-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel"  $.Values.global.metrics | nindent 8}}
 {{- end }}
@@ -193,10 +193,10 @@ metadata:
   name: {{ $commonCtx.toponame | quote }}
   labels:
 <<<<<<< HEAD
-    helmVersion: 9.0.117-closedown0
+    helmVersion: 9.4.70-rc1
 {{-    include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
 =======
-    helmVersion: 9.0.117-closedown0
+    helmVersion: 9.4.70-rc1
     {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
 >>>>>>> origin/candidate-9.6.x
 spec:
@@ -260,7 +260,7 @@ spec:
         accessDali: "yes"
         accessEsp: "yes"
 <<<<<<< HEAD
-        helmVersion: 9.0.117-closedown0
+        helmVersion: 9.4.70-rc1
 {{-     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}}
@@ -269,7 +269,7 @@ spec:
 {{       toYaml $roxie.labels | indent 8 }}
 {{-     end }}
 =======
-        helmVersion: 9.0.117-closedown0
+        helmVersion: 9.4.70-rc1
         {{- 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}}
@@ -379,7 +379,7 @@ spec:
         accessDali: "yes"
         accessEsp: "yes"
 <<<<<<< HEAD
-        helmVersion: 9.0.117-closedown0
+        helmVersion: 9.4.70-rc1
 {{-     if hasKey $.Values.global "metrics" }}
 {{-      include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
 {{-     end }}
@@ -387,7 +387,7 @@ spec:
 {{       toYaml $roxie.labels | indent 8 }}
 {{-     end }}
 =======
-        helmVersion: 9.0.117-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
 {{- end }}
diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml
index df851836973..394ac7c7a62 100644
--- a/helm/hpcc/templates/sasha.yaml
+++ b/helm/hpcc/templates/sasha.yaml
@@ -53,7 +53,7 @@ spec:
         server: {{ $serviceName | quote }}
         app: sasha
         accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }}
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
 {{- if hasKey $sasha "labels" }}
 {{ toYaml $sasha.labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml
index a69918afa2b..5b57373bceb 100644
--- a/helm/hpcc/templates/thor.yaml
+++ b/helm/hpcc/templates/thor.yaml
@@ -86,7 +86,7 @@ data:
           labels:
             accessDali: "yes"
             accessEsp: "yes"
-            helmVersion: 9.4.69-closedown0
+            helmVersion: 9.4.70-rc1
             {{- 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 }}
@@ -151,7 +151,7 @@ data:
             accessEsp: "yes"
             app: "thor"
             component: "thormanager"
-            helmVersion: 9.4.69-closedown0
+            helmVersion: 9.4.70-rc1
             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 }}
@@ -218,7 +218,7 @@ data:
             accessEsp: "yes"
             app: "thor"
             component: "thorworker"
-            helmVersion: 9.4.69-closedown0
+            helmVersion: 9.4.70-rc1
             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 }}
@@ -351,7 +351,7 @@ spec:
         accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }}
         app: "thor"
         component: "thor-eclagent"
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
         instance: {{ $commonCtx.eclAgentName | quote }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }}
 {{- if hasKey $commonCtx.me "labels" }}
@@ -416,7 +416,7 @@ spec:
         accessEsp: "no"
         app: "thor"
         component: "thor-thoragent"
-        helmVersion: 9.4.69-closedown0
+        helmVersion: 9.4.70-rc1
         instance: {{ $commonCtx.thorAgentName | quote }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }}
 {{- if hasKey $commonCtx.me "labels" }}
diff --git a/version.cmake b/version.cmake
index c2381512fc8..8a738b7c145 100644
--- a/version.cmake
+++ b/version.cmake
@@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" )
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 9 )
 set ( HPCC_MINOR 4 )
-set ( HPCC_POINT 69 )
-set ( HPCC_MATURITY "closedown" )
-set ( HPCC_SEQUENCE 0 )
-set ( HPCC_TAG_TIMESTAMP "2024-06-07T17:02:37Z" )
+set ( HPCC_POINT 70 )
+set ( HPCC_MATURITY "rc" )
+set ( HPCC_SEQUENCE 1 )
+set ( HPCC_TAG_TIMESTAMP "2024-06-14T16:04:00Z" )
 ###