From 261a1b959ab58d51034381471d70a52f9e358f8b Mon Sep 17 00:00:00 2001
From: Gavin Halliday <gavin.halliday@lexisnexis.com>
Date: Fri, 14 Jun 2024 17:27:22 +0100
Subject: [PATCH] Community Edition 9.6.22-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/roxie.yaml        |  8 ++++----
 helm/hpcc/templates/sasha.yaml        |  2 +-
 helm/hpcc/templates/thor.yaml         | 10 +++++-----
 version.cmake                         |  8 ++++----
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml
index 13fae5887dc..007f6dee3c1 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.6.21-closedown0
+version: 9.6.22-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.6.21-closedown0
+appVersion: 9.6.22-rc1
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index d8543620659..6ca1ec3a41a 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -1523,7 +1523,7 @@ kind: Service
 metadata:
   name: {{ $lvars.serviceName | quote }}
   labels:
-    helmVersion: 9.6.21-closedown0
+    helmVersion: 9.6.22-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 ff382b69d37..1b99cbd6975 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.6.21-closedown0
+        helmVersion: 9.6.22-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 dd60aaedcd8..7711cec760b 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.6.21-closedown0
+        helmVersion: 9.6.22-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 f272ffb018d..2cb70142d95 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.6.21-closedown0
+        helmVersion: 9.6.22-rc1
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml
index 3a4910ed5ac..2664db864ea 100644
--- a/helm/hpcc/templates/eclagent.yaml
+++ b/helm/hpcc/templates/eclagent.yaml
@@ -62,7 +62,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.6.21-closedown0
+            helmVersion: 9.6.22-rc1
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
 {{- end }}
@@ -139,7 +139,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
-        helmVersion: 9.6.21-closedown0
+        helmVersion: 9.6.22-rc1
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml
index 126e2291259..10db9bb4a46 100644
--- a/helm/hpcc/templates/eclccserver.yaml
+++ b/helm/hpcc/templates/eclccserver.yaml
@@ -62,7 +62,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.6.21-closedown0
+            helmVersion: 9.6.22-rc1
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
 {{- end }}
@@ -147,7 +147,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
-        helmVersion: 9.6.21-closedown0
+        helmVersion: 9.6.22-rc1
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml
index 28b723dbf1b..c89b517d980 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.6.21-closedown0
+        helmVersion: 9.6.22-rc1
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}
diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml
index 85556052525..a972e1574dd 100644
--- a/helm/hpcc/templates/esp.yaml
+++ b/helm/hpcc/templates/esp.yaml
@@ -125,7 +125,7 @@ spec:
         accessSasha: "yes"
 {{- end }}
         app: {{ $application }}
-        helmVersion: 9.6.21-closedown0
+        helmVersion: 9.6.22-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 4db571144f9..336f27ad21e 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.6.21-closedown0
+        helmVersion: 9.6.22-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 933b60193be..6721e7b7dae 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.6.21-closedown0
+        helmVersion: 9.6.22-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.6.21-closedown0
+    helmVersion: 9.6.22-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.6.21-closedown0
+        helmVersion: 9.6.22-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.6.21-closedown0
+        helmVersion: 9.6.22-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 72a15b9ec34..00f2526873e 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.6.21-closedown0
+        helmVersion: 9.6.22-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 e16ad6a6be1..ad2ed155cf7 100644
--- a/helm/hpcc/templates/thor.yaml
+++ b/helm/hpcc/templates/thor.yaml
@@ -88,7 +88,7 @@ data:
           labels:
             accessDali: "yes"
             accessEsp: "yes"
-            helmVersion: 9.6.21-closedown0
+            helmVersion: 9.6.22-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 }}
@@ -153,7 +153,7 @@ data:
             accessEsp: "yes"
             app: "thor"
             component: "thormanager"
-            helmVersion: 9.6.21-closedown0
+            helmVersion: 9.6.22-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 }}
@@ -220,7 +220,7 @@ data:
             accessEsp: "yes"
             app: "thor"
             component: "thorworker"
-            helmVersion: 9.6.21-closedown0
+            helmVersion: 9.6.22-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 }}
@@ -353,7 +353,7 @@ spec:
         accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }}
         app: "thor"
         component: "thor-eclagent"
-        helmVersion: 9.6.21-closedown0
+        helmVersion: 9.6.22-rc1
         instance: {{ $commonCtx.eclAgentName | quote }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }}
 {{- if hasKey $commonCtx.me "labels" }}
@@ -418,7 +418,7 @@ spec:
         accessEsp: "no"
         app: "thor"
         component: "thor-thoragent"
-        helmVersion: 9.6.21-closedown0
+        helmVersion: 9.6.22-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 93195ddb8d2..1a59b3ee37c 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 6 )
-set ( HPCC_POINT 21 )
-set ( HPCC_MATURITY "closedown" )
-set ( HPCC_SEQUENCE 0 )
-set ( HPCC_TAG_TIMESTAMP "2024-06-07T17:04:00Z" )
+set ( HPCC_POINT 22 )
+set ( HPCC_MATURITY "rc" )
+set ( HPCC_SEQUENCE 1 )
+set ( HPCC_TAG_TIMESTAMP "2024-06-14T16:27:21Z" )
 ###