From 0403e49bc5dc127f1e8632eeab842b82ef0541b3 Mon Sep 17 00:00:00 2001
From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
Date: Wed, 22 May 2024 15:44:04 -0400
Subject: [PATCH 1/5] HPCC-31900 ECL Watch v9 global search DFU WU & File tabs
Fix issue where from the global search results, switching to the
DFU Workunits tab would show an empty list and switching to the Files
tab would crash ECL Watch with an unhandled JavaScript exception
Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
---
esp/src/eclwatch/GetDFUWorkunitsWidget.js | 4 ---
.../eclwatch/templates/DFUQueryWidget.html | 2 +-
esp/src/src-react/components/DFUWorkunits.tsx | 4 +--
esp/src/src/ESPDFUWorkunit.ts | 32 +++++++++++++++++--
esp/src/src/ESPLogicalFile.ts | 2 +-
esp/src/src/FileSpray.ts | 2 ++
6 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/esp/src/eclwatch/GetDFUWorkunitsWidget.js b/esp/src/eclwatch/GetDFUWorkunitsWidget.js
index dc320468733..ea5285824ce 100644
--- a/esp/src/eclwatch/GetDFUWorkunitsWidget.js
+++ b/esp/src/eclwatch/GetDFUWorkunitsWidget.js
@@ -369,8 +369,6 @@ define([
initWorkunitsGrid: function () {
var context = this;
var filter = this.filter.toObject();
- filter.includeTimings = true;
- filter.includeTransferRate = true;
var store = this.params.searchResults ? this.params.searchResults : new ESPDFUWorkunit.CreateWUQueryStore();
this.workunitsGrid = new declare([ESPUtil.Grid(true, true, false, false, "GetDFUWorkunitsWidget")])({
store: store,
@@ -477,8 +475,6 @@ define([
refreshGrid: function (clearSelection) {
var filter = this.filter.toObject();
- filter.includeTimings = true;
- filter.includeTransferRate = true;
this.workunitsGrid.set("query", filter);
if (clearSelection) {
this.workunitsGrid.clearSelection();
diff --git a/esp/src/eclwatch/templates/DFUQueryWidget.html b/esp/src/eclwatch/templates/DFUQueryWidget.html
index b45187e2be7..0eb44da4b31 100644
--- a/esp/src/eclwatch/templates/DFUQueryWidget.html
+++ b/esp/src/eclwatch/templates/DFUQueryWidget.html
@@ -69,7 +69,7 @@
-
+
diff --git a/esp/src/src-react/components/DFUWorkunits.tsx b/esp/src/src-react/components/DFUWorkunits.tsx
index 39170270844..a8379f14aae 100644
--- a/esp/src/src-react/components/DFUWorkunits.tsx
+++ b/esp/src/src-react/components/DFUWorkunits.tsx
@@ -39,8 +39,6 @@ function formatQuery(_filter): { [id: string]: any } {
if (filter.Type === true) {
filter.Type = "archived workunits";
}
- filter.includeTimings = true;
- filter.includeTransferRate = true;
return filter;
}
@@ -83,7 +81,7 @@ export const DFUWorkunits: React.FunctionComponent = ({
// Grid ---
const gridStore = React.useMemo(() => {
- return store || ESPDFUWorkunit.CreateWUQueryStore({});
+ return store || ESPDFUWorkunit.CreateWUQueryStore();
}, [store]);
const query = React.useMemo(() => {
diff --git a/esp/src/src/ESPDFUWorkunit.ts b/esp/src/src/ESPDFUWorkunit.ts
index f9d3fc7165c..3de6c1ba48a 100644
--- a/esp/src/src/ESPDFUWorkunit.ts
+++ b/esp/src/src/ESPDFUWorkunit.ts
@@ -8,6 +8,11 @@ import * as FileSpray from "./FileSpray";
import nlsHPCC from "./nlsHPCC";
import * as Utility from "./Utility";
+import { FileSprayService, FileSpray as FileSprayNS } from "@hpcc-js/comms";
+
+import { Paged } from "./store/Paged";
+import { BaseStore } from "./store/Store";
+
const i18n = nlsHPCC;
class Store extends ESPRequest.Store {
@@ -297,14 +302,37 @@ export function isInstanceOfWorkunit(obj) {
export function Get(wuid, data?) {
const store = new Store();
const retVal = store.get(wuid);
- if (data) {
+ if (data && !retVal.__hpcc_id) {
retVal.updateData(data);
}
return retVal;
}
-export function CreateWUQueryStore(options) {
+export function CreateWUQueryStoreLegacy(options) {
let store = new Store(options);
store = new Observable(store);
return store;
}
+
+const service = new FileSprayService({ baseUrl: "" });
+
+export type WUQueryStore = BaseStore;
+
+export function CreateWUQueryStore(): BaseStore {
+ const store = new Paged({
+ start: "PageStartFrom",
+ count: "PageSize",
+ sortBy: "Sortby",
+ descending: "Descending"
+ }, "ID", request => {
+ request.includeTimings = true;
+ request.includeTransferRate = true;
+ return service.GetDFUWorkunits(request).then(response => {
+ return {
+ data: response.results.DFUWorkunit.map(wu => Get(wu.ID, wu)),
+ total: response.NumWUs
+ };
+ });
+ });
+ return new Observable(store);
+}
diff --git a/esp/src/src/ESPLogicalFile.ts b/esp/src/src/ESPLogicalFile.ts
index 62f7a8a8e54..24d7e78720d 100644
--- a/esp/src/src/ESPLogicalFile.ts
+++ b/esp/src/src/ESPLogicalFile.ts
@@ -472,7 +472,7 @@ export function Get(Cluster, Name, data?) {
}
const store = new Store();
const retVal = store.get(createID(Cluster, Name));
- if (data) {
+ if (data && !retVal.__hpcc_id) {
lang.mixin(data, {
__hpcc_id: createID(data.NodeGroup, data.Name),
__hpcc_isDir: false,
diff --git a/esp/src/src/FileSpray.ts b/esp/src/src/FileSpray.ts
index 1dc36490c37..8263f04345f 100644
--- a/esp/src/src/FileSpray.ts
+++ b/esp/src/src/FileSpray.ts
@@ -327,6 +327,8 @@ export function CreateLandingZonesFilterStore(options) {
}
export function GetDFUWorkunits(params) {
+ params.request.includeTimings = true;
+ params.request.includeTransferRate = true;
return ESPRequest.send("FileSpray", "GetDFUWorkunits", params);
}
From 0e2fcedea780c4712fa1472451e49e01bdc3c900 Mon Sep 17 00:00:00 2001
From: Jake Smith
Date: Fri, 31 May 2024 16:15:05 +0100
Subject: [PATCH 2/5] Split off 9.0.114
Signed-off-by: Jake Smith
---
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 | 4 ++--
16 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml
index f510ae7ad10..e13e0b82478 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.0.113-closedown0
+version: 9.0.115-closedown0
# 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.0.113-closedown0
+appVersion: 9.0.115-closedown0
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index d9efa42079f..5e5f62840e2 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -1314,7 +1314,7 @@ kind: Service
metadata:
name: {{ $lvars.serviceName | quote }}
labels:
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 cbb749ebc7b..503ce98f06a 100644
--- a/helm/hpcc/templates/dafilesrv.yaml
+++ b/helm/hpcc/templates/dafilesrv.yaml
@@ -50,7 +50,7 @@ spec:
labels:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }}
server: {{ .name | quote }}
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
annotations:
checksum/config: {{ $configSHA }}
spec:
diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml
index dc7858734d1..b8f744494a1 100644
--- a/helm/hpcc/templates/dali.yaml
+++ b/helm/hpcc/templates/dali.yaml
@@ -82,7 +82,7 @@ spec:
run: {{ $dali.name | quote }}
server: {{ $dali.name | quote }}
app: dali
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 6db713f6534..3cb50bb8770 100644
--- a/helm/hpcc/templates/dfuserver.yaml
+++ b/helm/hpcc/templates/dfuserver.yaml
@@ -56,7 +56,7 @@ spec:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }}
run: {{ .name | quote }}
accessDali: "yes"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml
index 0a4e6a6b28a..1633dc80d63 100644
--- a/helm/hpcc/templates/eclagent.yaml
+++ b/helm/hpcc/templates/eclagent.yaml
@@ -58,7 +58,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.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
{{- end }}
@@ -135,7 +135,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml
index c6b4409a292..a703430ed65 100644
--- a/helm/hpcc/templates/eclccserver.yaml
+++ b/helm/hpcc/templates/eclccserver.yaml
@@ -57,7 +57,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.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
{{- end }}
@@ -142,7 +142,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml
index 6c08b88e79c..c7e902c158a 100644
--- a/helm/hpcc/templates/eclscheduler.yaml
+++ b/helm/hpcc/templates/eclscheduler.yaml
@@ -64,7 +64,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: "no"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml
index 2ce4e023070..781c395abb3 100644
--- a/helm/hpcc/templates/esp.yaml
+++ b/helm/hpcc/templates/esp.yaml
@@ -117,7 +117,7 @@ spec:
server: {{ .name | quote }}
accessDali: "yes"
app: {{ $application }}
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 3fc9e88cb61..447a38d6189 100644
--- a/helm/hpcc/templates/localroxie.yaml
+++ b/helm/hpcc/templates/localroxie.yaml
@@ -70,7 +70,7 @@ spec:
server: {{ $servername | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 22a619c9ed4..9cda81d8b8f 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.113-closedown0
+ helmVersion: 9.0.115-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.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 9c1a21f0f84..0662bd2c291 100644
--- a/helm/hpcc/templates/roxie.yaml
+++ b/helm/hpcc/templates/roxie.yaml
@@ -120,7 +120,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.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- if hasKey $.Values.global "metrics" }}
{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
{{- end }}
@@ -180,7 +180,7 @@ kind: Service
metadata:
name: {{ $commonCtx.toponame | quote }}
labels:
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
spec:
ports:
@@ -242,7 +242,7 @@ spec:
roxie-cluster: {{ $roxie.name | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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}}
@@ -347,7 +347,7 @@ spec:
roxie-cluster: {{ $roxie.name | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 b8af556380a..55a501816f0 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.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
=======
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 cb8efb2c45b..f21fe53a9e3 100644
--- a/helm/hpcc/templates/sasha.yaml
+++ b/helm/hpcc/templates/sasha.yaml
@@ -52,7 +52,7 @@ spec:
run: {{ $serviceName | quote }}
server: {{ $serviceName | quote }}
accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }}
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 3a18d9ae781..e889da23c4a 100644
--- a/helm/hpcc/templates/thor.yaml
+++ b/helm/hpcc/templates/thor.yaml
@@ -82,7 +82,7 @@ data:
labels:
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
{{- 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 }}
@@ -147,7 +147,7 @@ data:
accessEsp: "yes"
app: "thor"
component: "thormanager"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
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 }}
@@ -214,7 +214,7 @@ data:
accessEsp: "yes"
app: "thor"
component: "thorworker"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
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 }}
@@ -347,7 +347,7 @@ spec:
accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }}
app: "thor"
component: "thor-eclagent"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
instance: {{ $commonCtx.eclAgentName | quote }}
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }}
{{- if hasKey $commonCtx.me "labels" }}
@@ -412,7 +412,7 @@ spec:
accessEsp: "no"
app: "thor"
component: "thor-thoragent"
- helmVersion: 9.0.113-closedown0
+ helmVersion: 9.0.115-closedown0
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 cc126433607..a4c5c3ed115 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 0 )
-set ( HPCC_POINT 113 )
+set ( HPCC_POINT 115 )
set ( HPCC_MATURITY "closedown" )
set ( HPCC_SEQUENCE 0 )
-set ( HPCC_TAG_TIMESTAMP "2024-05-23T17:16:46Z" )
+set ( HPCC_TAG_TIMESTAMP "2024-05-31T15:15:05Z" )
###
From 907be4fcd071a532f7304fb02115f006baf6735a Mon Sep 17 00:00:00 2001
From: Jake Smith
Date: Fri, 31 May 2024 16:16:03 +0100
Subject: [PATCH 3/5] Split off 9.2.92
Signed-off-by: Jake Smith
---
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 | 4 ++--
14 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml
index a6063fa3afd..9bb52d01957 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.2.91-closedown0
+version: 9.2.93-closedown0
# 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.2.91-closedown0
+appVersion: 9.2.93-closedown0
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index e00705a2b1f..0191fd5a91f 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -1405,7 +1405,7 @@ kind: Service
metadata:
name: {{ $lvars.serviceName | quote }}
labels:
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- 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 44f0c6243f2..7b73ab073ca 100644
--- a/helm/hpcc/templates/dafilesrv.yaml
+++ b/helm/hpcc/templates/dafilesrv.yaml
@@ -50,7 +50,7 @@ spec:
labels:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }}
server: {{ .name | quote }}
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
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 876ad3508b0..0eda5998e8b 100644
--- a/helm/hpcc/templates/dali.yaml
+++ b/helm/hpcc/templates/dali.yaml
@@ -82,7 +82,7 @@ spec:
run: {{ $dali.name | quote }}
server: {{ $dali.name | quote }}
app: dali
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- 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 1174af19bd7..4c13930294f 100644
--- a/helm/hpcc/templates/dfuserver.yaml
+++ b/helm/hpcc/templates/dfuserver.yaml
@@ -56,7 +56,7 @@ spec:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }}
run: {{ .name | quote }}
accessDali: "yes"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml
index 7e9e10a5d76..056bf663efc 100644
--- a/helm/hpcc/templates/eclagent.yaml
+++ b/helm/hpcc/templates/eclagent.yaml
@@ -58,7 +58,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.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
{{- end }}
@@ -133,7 +133,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml
index ff50c624e24..305f2bea1d1 100644
--- a/helm/hpcc/templates/eclccserver.yaml
+++ b/helm/hpcc/templates/eclccserver.yaml
@@ -57,7 +57,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.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
{{- end }}
@@ -140,7 +140,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml
index 8a34344ab9d..8d94e37fde9 100644
--- a/helm/hpcc/templates/eclscheduler.yaml
+++ b/helm/hpcc/templates/eclscheduler.yaml
@@ -64,7 +64,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: "no"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml
index 148e95577c0..b9412020b9e 100644
--- a/helm/hpcc/templates/esp.yaml
+++ b/helm/hpcc/templates/esp.yaml
@@ -120,7 +120,7 @@ spec:
accessSasha: "yes"
{{- end }}
app: {{ $application }}
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- 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 159b0f2bb81..10f841e3ee7 100644
--- a/helm/hpcc/templates/localroxie.yaml
+++ b/helm/hpcc/templates/localroxie.yaml
@@ -70,7 +70,7 @@ spec:
server: {{ $servername | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- 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 5d512b8ec13..1983af2627f 100644
--- a/helm/hpcc/templates/roxie.yaml
+++ b/helm/hpcc/templates/roxie.yaml
@@ -120,7 +120,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.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- if hasKey $.Values.global "metrics" }}
{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
{{- end }}
@@ -178,7 +178,7 @@ kind: Service
metadata:
name: {{ $commonCtx.toponame | quote }}
labels:
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
spec:
ports:
@@ -240,7 +240,7 @@ spec:
roxie-cluster: {{ $roxie.name | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- 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}}
@@ -346,7 +346,7 @@ spec:
roxie-cluster: {{ $roxie.name | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- 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 0aaa81fd5d7..2622fefb98f 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.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- 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 bbb397994c2..7c0fbee21a3 100644
--- a/helm/hpcc/templates/thor.yaml
+++ b/helm/hpcc/templates/thor.yaml
@@ -82,7 +82,7 @@ data:
labels:
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
{{- 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 }}
@@ -145,7 +145,7 @@ data:
accessEsp: "yes"
app: "thor"
component: "thormanager"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
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 }}
@@ -210,7 +210,7 @@ data:
accessEsp: "yes"
app: "thor"
component: "thorworker"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
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 }}
@@ -341,7 +341,7 @@ spec:
accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }}
app: "thor"
component: "thor-eclagent"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
instance: {{ $commonCtx.eclAgentName | quote }}
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }}
{{- if hasKey $commonCtx.me "labels" }}
@@ -404,7 +404,7 @@ spec:
accessEsp: "no"
app: "thor"
component: "thor-thoragent"
- helmVersion: 9.2.91-closedown0
+ helmVersion: 9.2.93-closedown0
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 164d057070d..5626bf07968 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 2 )
-set ( HPCC_POINT 91 )
+set ( HPCC_POINT 93 )
set ( HPCC_MATURITY "closedown" )
set ( HPCC_SEQUENCE 0 )
-set ( HPCC_TAG_TIMESTAMP "2024-05-23T17:20:41Z" )
+set ( HPCC_TAG_TIMESTAMP "2024-05-31T15:16:03Z" )
###
From ae8337ee1730d24a22822afc8e268aea23a88f4b Mon Sep 17 00:00:00 2001
From: Michael Gardner
Date: Wed, 29 May 2024 11:35:46 -0400
Subject: [PATCH 4/5] HPCC-31901 Add Jfrog internal package releases to
build-assets
Signed-off-by: Michael Gardner
---
.github/workflows/build-assets.yml | 43 ++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
index 195034d0efc..4fd56f61eb6 100644
--- a/.github/workflows/build-assets.yml
+++ b/.github/workflows/build-assets.yml
@@ -321,6 +321,29 @@ jobs:
tag: ${{ needs.preamble.outputs.internal_tag }}
artifacts: "${{ needs.preamble.outputs.folder_build }}/hpccsystems-*-internal*.deb,${{ needs.preamble.outputs.folder_build }}/hpccsystems-*-internal*.rpm"
+ - name: Upload Assets to Jfrog (debian internal)
+ if: ${{ matrix.ln && !matrix.container && contains(matrix.os, 'ubuntu') && github.repository_owner == 'hpcc-systems'}}
+ shell: bash
+ run: |
+ cd ${{ needs.preamble.outputs.folder_build }}
+ version=$(echo "${{ needs.preamble.outputs.internal_tag }}" | sed 's/internal_//')
+ packages=($(ls -1 hpccsystems-*.deb ))
+ for _package in ${packages[@]}; do
+ distribution=$( echo "${_package}" | sed "s/^.*${version}//" | awk -F '_' '{print $1;}' )
+ curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} -XPUT "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-debian-local/pool/LN/${_package};deb.distribution=${distribution};deb.component=LN;deb.architecture=amd64" -T ${{ needs.preamble.outputs.folder_build }}/${_package}
+ done
+
+ - name: Upload Assets to Jfrog (centos internal)
+ if: ${{ matrix.ln && !matrix.container && !contains(matrix.os, 'ubuntu') && github.repository_owner == 'hpcc-systems'}}
+ shell: bash
+ run: |
+ cd ${{ needs.preamble.outputs.folder_build }}
+ packages=($(ls -1 hpccsystems-*.rpm ))
+ for _package in ${packages[@]}; do
+ distribution=$( echo "${_package}" | awk -F '.' '{print $4;}' )
+ curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} -XPUT "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-rpm-local/LN/${distribution}/x86_64/${_package}" -T ${{ needs.preamble.outputs.folder_build }}/${_package}
+ done
+
- name: Locate k8s deb file (internal)
if: ${{ matrix.ln && matrix.container && !matrix.documentation }}
id: ln-container
@@ -470,6 +493,26 @@ jobs:
tag: ${{ needs.preamble.outputs.internal_tag }}
artifacts: "./build/hpccsystems-clienttools-internal*.exe,./build/hpccsystems-clienttools-internal*.msi,./build/hpccsystems-clienttools-internal*.dmg,./build/hpccsystems-clienttools-internal*.pkg,./build/hpccsystems-clienttools-internal*.tar.gz"
+ - name: Upload Assets to Jfrog (windows)
+ if: ${{ contains(matrix.os, 'windows') && github.repository_owner == 'hpcc-systems' }}
+ shell: bash
+ run: |
+ cd ./build
+ packages=($(ls -1 hpccsystems-*.exe ))
+ for _package in ${packages[@]}; do
+ curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-windows-local/LN/windows/x86_64/${_package}" -T ${_package}
+ done
+
+ - name: Upload Assets to Jfrog (macos)
+ if: ${{ contains(matrix.os, 'macos') && github.repository_owner == 'hpcc-systems' }}
+ shell: bash
+ run: |
+ cd ./build
+ packages=($(ls -1 hpccsystems-*.pkg ))
+ for _package in ${packages[@]}; do
+ curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-macos-local/LN/macos/x86_64/${_package}" -T ${_package}
+ done
+
- name: Upload error logs
if: ${{ failure() || cancelled() }}
uses: actions/upload-artifact@v4
From 6c4f9a10e511964d7d7524d222c226c92ffde793 Mon Sep 17 00:00:00 2001
From: Gavin Halliday
Date: Fri, 7 Jun 2024 17:28:53 +0100
Subject: [PATCH 5/5] Remove invalid artifacts from helm directory
Signed-off-by: Gavin Halliday
---
.github/workflows/build-assets.yml | 43 --
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 | 161 --------
helm/hpcc/templates/roxie.yaml | 8 +-
helm/hpcc/templates/roxie.yaml.fixed | 479 ----------------------
helm/hpcc/templates/sasha.yaml | 2 +-
helm/hpcc/templates/thor.yaml | 10 +-
system/jlib/jlzw.cpp | 9 +-
version.cmake | 4 +-
18 files changed, 28 insertions(+), 714 deletions(-)
delete mode 100644 helm/hpcc/templates/localroxie.yaml.fixed
delete mode 100644 helm/hpcc/templates/roxie.yaml.fixed
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
index 4fd56f61eb6..195034d0efc 100644
--- a/.github/workflows/build-assets.yml
+++ b/.github/workflows/build-assets.yml
@@ -321,29 +321,6 @@ jobs:
tag: ${{ needs.preamble.outputs.internal_tag }}
artifacts: "${{ needs.preamble.outputs.folder_build }}/hpccsystems-*-internal*.deb,${{ needs.preamble.outputs.folder_build }}/hpccsystems-*-internal*.rpm"
- - name: Upload Assets to Jfrog (debian internal)
- if: ${{ matrix.ln && !matrix.container && contains(matrix.os, 'ubuntu') && github.repository_owner == 'hpcc-systems'}}
- shell: bash
- run: |
- cd ${{ needs.preamble.outputs.folder_build }}
- version=$(echo "${{ needs.preamble.outputs.internal_tag }}" | sed 's/internal_//')
- packages=($(ls -1 hpccsystems-*.deb ))
- for _package in ${packages[@]}; do
- distribution=$( echo "${_package}" | sed "s/^.*${version}//" | awk -F '_' '{print $1;}' )
- curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} -XPUT "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-debian-local/pool/LN/${_package};deb.distribution=${distribution};deb.component=LN;deb.architecture=amd64" -T ${{ needs.preamble.outputs.folder_build }}/${_package}
- done
-
- - name: Upload Assets to Jfrog (centos internal)
- if: ${{ matrix.ln && !matrix.container && !contains(matrix.os, 'ubuntu') && github.repository_owner == 'hpcc-systems'}}
- shell: bash
- run: |
- cd ${{ needs.preamble.outputs.folder_build }}
- packages=($(ls -1 hpccsystems-*.rpm ))
- for _package in ${packages[@]}; do
- distribution=$( echo "${_package}" | awk -F '.' '{print $4;}' )
- curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} -XPUT "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-rpm-local/LN/${distribution}/x86_64/${_package}" -T ${{ needs.preamble.outputs.folder_build }}/${_package}
- done
-
- name: Locate k8s deb file (internal)
if: ${{ matrix.ln && matrix.container && !matrix.documentation }}
id: ln-container
@@ -493,26 +470,6 @@ jobs:
tag: ${{ needs.preamble.outputs.internal_tag }}
artifacts: "./build/hpccsystems-clienttools-internal*.exe,./build/hpccsystems-clienttools-internal*.msi,./build/hpccsystems-clienttools-internal*.dmg,./build/hpccsystems-clienttools-internal*.pkg,./build/hpccsystems-clienttools-internal*.tar.gz"
- - name: Upload Assets to Jfrog (windows)
- if: ${{ contains(matrix.os, 'windows') && github.repository_owner == 'hpcc-systems' }}
- shell: bash
- run: |
- cd ./build
- packages=($(ls -1 hpccsystems-*.exe ))
- for _package in ${packages[@]}; do
- curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-windows-local/LN/windows/x86_64/${_package}" -T ${_package}
- done
-
- - name: Upload Assets to Jfrog (macos)
- if: ${{ contains(matrix.os, 'macos') && github.repository_owner == 'hpcc-systems' }}
- shell: bash
- run: |
- cd ./build
- packages=($(ls -1 hpccsystems-*.pkg ))
- for _package in ${packages[@]}; do
- curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-macos-local/LN/macos/x86_64/${_package}" -T ${_package}
- done
-
- name: Upload error logs
if: ${{ failure() || cancelled() }}
uses: actions/upload-artifact@v4
diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml
index e13e0b82478..cd689f32b18 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.0.115-closedown0
+version: 9.0.111-closedown0
# 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.0.115-closedown0
+appVersion: 9.0.111-closedown0
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index 5e5f62840e2..34fe972ae12 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -1314,7 +1314,7 @@ kind: Service
metadata:
name: {{ $lvars.serviceName | quote }}
labels:
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- 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 503ce98f06a..478354bde26 100644
--- a/helm/hpcc/templates/dafilesrv.yaml
+++ b/helm/hpcc/templates/dafilesrv.yaml
@@ -50,7 +50,7 @@ spec:
labels:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }}
server: {{ .name | quote }}
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
annotations:
checksum/config: {{ $configSHA }}
spec:
diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml
index b8f744494a1..c73d45c4185 100644
--- a/helm/hpcc/templates/dali.yaml
+++ b/helm/hpcc/templates/dali.yaml
@@ -82,7 +82,7 @@ spec:
run: {{ $dali.name | quote }}
server: {{ $dali.name | quote }}
app: dali
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- 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 3cb50bb8770..9e3ee1607ba 100644
--- a/helm/hpcc/templates/dfuserver.yaml
+++ b/helm/hpcc/templates/dfuserver.yaml
@@ -56,7 +56,7 @@ spec:
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }}
run: {{ .name | quote }}
accessDali: "yes"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml
index 1633dc80d63..067dddd5bdb 100644
--- a/helm/hpcc/templates/eclagent.yaml
+++ b/helm/hpcc/templates/eclagent.yaml
@@ -58,7 +58,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.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
{{- end }}
@@ -135,7 +135,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml
index a703430ed65..b269a2030f7 100644
--- a/helm/hpcc/templates/eclccserver.yaml
+++ b/helm/hpcc/templates/eclccserver.yaml
@@ -57,7 +57,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.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- if hasKey .me "labels" }}
{{ toYaml .me.labels | indent 12 }}
{{- end }}
@@ -142,7 +142,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml
index c7e902c158a..a051e0a480e 100644
--- a/helm/hpcc/templates/eclscheduler.yaml
+++ b/helm/hpcc/templates/eclscheduler.yaml
@@ -64,7 +64,7 @@ spec:
run: {{ .name | quote }}
accessDali: "yes"
accessEsp: "no"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- if hasKey . "labels" }}
{{ toYaml .labels | indent 8 }}
{{- end }}
diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml
index 781c395abb3..60668168a9a 100644
--- a/helm/hpcc/templates/esp.yaml
+++ b/helm/hpcc/templates/esp.yaml
@@ -117,7 +117,7 @@ spec:
server: {{ .name | quote }}
accessDali: "yes"
app: {{ $application }}
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- 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 447a38d6189..37f2da967e7 100644
--- a/helm/hpcc/templates/localroxie.yaml
+++ b/helm/hpcc/templates/localroxie.yaml
@@ -70,7 +70,7 @@ spec:
server: {{ $servername | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- 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
deleted file mode 100644
index 9cda81d8b8f..00000000000
--- a/helm/hpcc/templates/localroxie.yaml.fixed
+++ /dev/null
@@ -1,161 +0,0 @@
-{{/*
-
---- 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.115-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.115-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 */}}
diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml
index 0662bd2c291..00f0b503d46 100644
--- a/helm/hpcc/templates/roxie.yaml
+++ b/helm/hpcc/templates/roxie.yaml
@@ -120,7 +120,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.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- if hasKey $.Values.global "metrics" }}
{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
{{- end }}
@@ -180,7 +180,7 @@ kind: Service
metadata:
name: {{ $commonCtx.toponame | quote }}
labels:
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
spec:
ports:
@@ -242,7 +242,7 @@ spec:
roxie-cluster: {{ $roxie.name | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- 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}}
@@ -347,7 +347,7 @@ spec:
roxie-cluster: {{ $roxie.name | quote }}
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- 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
deleted file mode 100644
index 55a501816f0..00000000000
--- a/helm/hpcc/templates/roxie.yaml.fixed
+++ /dev/null
@@ -1,479 +0,0 @@
-{{/*
-
---- 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.
-
-##############################################################################
-
-*/}}
-
-{{/*
-roxie configmap
-Pass in dict with root and me
-*/}}
-{{- define "hpcc.roxieConfigMap" -}}
-apiVersion: v1
-metadata:
- name: {{ .me.name }}-configmap
-data:
- {{ .me.name }}.yaml:
- version: 1.0
- roxie:
-{{- $root := .root -}}
-{{- $component := .me }}
- services:
-{{- range $service := .me.services }}
- - name: {{ $service.name }}
-{{ toYaml (omit $service "tls" "name") | indent 8 }}
-{{- if ne (int $service.servicePort) 0 }}
-{{- include "hpcc.addTLSServiceEntries" (dict "root" $root "service" $service "component" $component "visibility" $service.visibility "remoteClients" $service.remoteClients "trustClients" $service.trustClients "includeTrustedPeers" true "incluedRoxieAndEspServices" true) | indent 6 }}
-{{- end }}
-{{- end }}
-{{ toYaml ( omit .me "logging" "tracing" "topoServer" "encryptInTransit" "env" "services") | indent 6 }}
- numChannels: {{ .numChannels }}
- topologyServers: "{{ .toponame }}:{{ .topoport }}"
- heartbeatInterval: {{ .heartbeatInterval }}
- resolveLocally: false
-{{- $mtlsEnabled := (eq (include "hpcc.isMtlsEnabled" (dict "root" .root)) "true") -}}
-{{/* By default use encryption if local certificates are enabled, but allow it to be turned off via roxie .encryptInTransit value */}}
-{{- if (hasKey .me "encryptInTransit") -}}
-{{- if and (.me.encryptInTransit) (not $mtlsEnabled) -}}
-{{- $_ := fail (printf "Roxie %s encryptInTransit requires local cert-manager configuration." .me.name ) }}
-{{- end }}
- encryptInTransit: {{ .me.encryptInTransit }}
-{{ else }}
- encryptInTransit: {{ $mtlsEnabled }}
-{{ end -}}
-{{- include "hpcc.generateLoggingConfig" (dict "root" .root "me" .me) | indent 6 }}
-{{- include "hpcc.generateTracingConfig" (dict "root" .root "me" .me) | indent 6 }}
-{{ include "hpcc.generateVaultConfig" . | indent 6 }}
- global:
-{{ include "hpcc.generateGlobalConfigMap" .root | indent 6 }}
-{{- end -}}{{/*define "hpcc.roxieConfigMap"*/}}
-
-{{- define "hpcc.roxieTopoConfigMap" -}}
-apiVersion: v1
-metadata:
- name: {{ .toponame }}-configmap
-data:
- {{ .toponame }}.yaml:
- version: 1.0
- toposerver:
-{{ toYaml ( omit .toposerver "logging" "tracing" "env") | indent 6 }}
-{{- include "hpcc.generateLoggingConfig" (dict "root" .root "me" .toposerver) | indent 6 }}
-{{- include "hpcc.generateTracingConfig" (dict "root" .root "me" .toposerver) | indent 6 }}
- global:
-{{ include "hpcc.generateGlobalConfigMap" .root | indent 6 }}
-{{- end -}}{{/*define "hpcc.roxieConfigMap"*/}}
-
-{{ range $roxie := $.Values.roxie -}}
-{{- if not $roxie.disabled -}}
-{{- $env := concat ($.Values.global.env | default list) (.env | default list) -}}
-{{- $secretsCategories := list "system" "eclUser" "ecl" "storage" }}
-{{- $toposerver := ($roxie.topoServer | default dict) -}}
-{{- $enginePlaneDetails := dict -}}
-{{- $_ := include "hpcc.getEnginePlanes" (dict "root" $ "me" . "result" $enginePlaneDetails) -}}
-{{- $commonCtx := dict "root" $ "me" $roxie "includeCategories" $enginePlaneDetails.planeCategories "includeNames" $enginePlaneDetails.namedPlanes "secretsCategories" $secretsCategories "toposerver" $toposerver "env" $env }}
-{{- $_ := set $commonCtx "toponame" (printf "%s-toposerver" $roxie.name) -}}
-{{- $_ := set $commonCtx "numChannels" ($roxie.numChannels | int | default 1) -}}
-{{- $_ := set $commonCtx "topoport" ($toposerver.port | int | default 9004) -}}
-{{- $_ := set $commonCtx "heartbeatInterval" ($toposerver.heartbeatInterval | int | default 10000) -}}
-{{- $_ := set $toposerver "name" $commonCtx.toponame -}}
-{{- $configSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieConfigMap" "component" "roxie" "excludeKeys" "global")) }}
-{{- $topoconfigSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieTopoConfigMap" "component" "toposerver" "excludeKeys" "global")) }}
-{{- include "hpcc.checkDefaultStoragePlane" $commonCtx }}
-{{- $singleNode := (hasKey $roxie "singleNode") | ternary $roxie.singleNode ((hasKey $roxie "localAgent") | ternary $roxie.localAgent false) }}
-{{- if not $singleNode -}}
-{{- $servername := printf "%s-server" $roxie.name -}}
-{{- $udpkeyname := $roxie.name -}}
-{{- range $service := $roxie.services }}
-{{- range $remoteClient := $service.remoteClients }}
- {{ include "hpcc.addExternalRemoteClientCertificate" (dict "root" $ "client" $remoteClient.name "organization" $remoteClient.organization "instance" $service.name "component" "roxie" "visibility" $service.visibility "secretTemplate" $remoteClient.secretTemplate) }}
-{{- end }}
-{{- if ne (int $service.servicePort) 0 }}
-{{- $_ := set $service "port" $service.servicePort }}
-{{- end }}
-{{- end }}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ $commonCtx.toponame | quote }}
-spec:
- replicas: {{ $toposerver.replicas | default 1 }}
- selector:
- matchLabels:
- run: {{ $commonCtx.toponame | quote }}
- template:
- metadata:
- labels:
-{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }}
- run: {{ $commonCtx.toponame | quote }}
- roxie-cluster: {{ $roxie.name | quote }}
-<<<<<<< HEAD
- helmVersion: 9.0.115-closedown0
-{{- if hasKey $.Values.global "metrics" }}
-{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
-{{- end }}
-{{- if hasKey $toposerver "labels" }}
-{{ toYaml $toposerver.labels | indent 8 }}
-{{- end }}
-=======
- helmVersion: 9.0.115-closedown0
-{{- if hasKey $.Values.global "metrics" }}
- {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
-{{- end }}
-{{- if hasKey $toposerver "labels" }}
-{{ toYaml $toposerver.labels | indent 8 }}
-{{- end }}
->>>>>>> origin/candidate-9.6.x
- annotations:
- checksum/config: {{ $topoconfigSHA }}
-{{- include "hpcc.generateAnnotations" (dict "root" $commonCtx.root "me" $toposerver) | indent 8 }}
-{{- if hasKey $.Values.global "metrics" }}
-{{- include "hpcc.addPrometheusScrapeAnnotations" $.Values.global.metrics | nindent 8 }}
-{{- end }}
- spec:
-{{- include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $commonCtx.toponame "target" $roxie.name "type" "roxie") | indent 6 }}
- serviceAccountName: "hpcc-default"
-{{- include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}}
- containers:
- - name: {{ $commonCtx.toponame | quote }}
-{{ include "hpcc.addSentinelProbes" $toposerver | indent 8 }}
-{{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
-{{- $defaultResources := dict "cpu" "500m" "memory" "200Mi" }}
-{{- include "hpcc.addResources" (dict "me" .topoResources "defaults" $defaultResources "root" $) | indent 8 }}
-{{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
- workingDir: /var/lib/HPCCSystems
- command: [ {{ include "hpcc.componentCommand" (dict "me" $toposerver "root" $ "process" "toposerver") }} ]
- args: [ {{- include "hpcc.componentStartArgs" (dict "me" $toposerver "root" $ "process" "toposerver") | nindent 16 }}
- {{ include "hpcc.configArg" $toposerver }}
- ]
- env:
-{{ include "hpcc.mergeEnvironments" $env | indent 8 -}}
- - name: "SENTINEL"
- value: "/tmp/{{ $commonCtx.toponame }}.sentinel"
- volumeMounts:
-{{ include "hpcc.addConfigMapVolumeMount" $toposerver | indent 8 }}
-{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "topo" "name" $commonCtx.toponame "external" false) | indent 8 }}
- volumes:
-{{ include "hpcc.addConfigMapVolume" $toposerver | indent 6 }}
-{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "topo" "name" $commonCtx.toponame "external" false) | indent 6 }}
-
----
-{{ include "hpcc.addCertificate" (dict "root" $ "name" $commonCtx.toponame "servicename" $commonCtx.toponame "component" "topo" "external" false) }}
-{{ include "hpcc.addUDPCertificate" (dict "root" $ "name" $udpkeyname "component" "udpkey") }}
-
----
-{{- 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 }}
-
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ $commonCtx.toponame | quote }}
- labels:
-<<<<<<< HEAD
- helmVersion: 9.0.115-closedown0
-{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
-=======
- helmVersion: 9.0.115-closedown0
- {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
->>>>>>> origin/candidate-9.6.x
-spec:
- ports:
- - port: {{ $commonCtx.topoport }}
- protocol: TCP
- targetPort: {{ $commonCtx.topoport }}
- selector:
- run: {{ $commonCtx.toponame | quote }}
- clusterIP: None # Headless service
----
-
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
- name: {{ printf "%s-internal-traffic" $roxie.name }}
-spec:
- podSelector:
- matchLabels:
- roxie-cluster: {{ $roxie.name | quote }}
- policyTypes:
- - Ingress
- - Egress
- ingress:
- - from:
- - podSelector:
- matchLabels:
- roxie-cluster: {{ $roxie.name | quote }}
- egress:
- - to:
- - podSelector:
- matchLabels:
- roxie-cluster: {{ $roxie.name | quote }}
-
----
-kind: ConfigMap
-{{ include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieConfigMap")) }}
----
-kind: ConfigMap
-{{ include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieTopoConfigMap")) }}
----
-
-{{- $_ := set $commonCtx "instanceNames" list -}}
-{{ if $roxie.serverReplicas -}}
-{{ $_ := set $commonCtx "instanceNames" (list $servername) -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ $servername | quote }}
-spec:
- replicas: {{ $roxie.serverReplicas }}
- selector:
- matchLabels:
- run: {{ $servername | quote }}
- template:
- metadata:
- labels:
- run: {{ $servername | quote }}
- server: {{ $roxie.name | quote }}
- roxie-cluster: {{ $roxie.name | quote }}
- accessDali: "yes"
- accessEsp: "yes"
-<<<<<<< HEAD
- helmVersion: 9.0.115-closedown0
-{{- 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}}
-{{- end }}
-{{- if hasKey $roxie "labels" }}
-{{ toYaml $roxie.labels | indent 8 }}
-{{- end }}
-=======
- helmVersion: 9.0.115-closedown0
- {{- 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}}
-{{- end }}
-{{- if hasKey $roxie "labels" }}
-{{ toYaml $roxie.labels | indent 8 }}
-{{- end }}
->>>>>>> origin/candidate-9.6.x
- annotations:
- checksum/config: {{ $configSHA }}
-{{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }}
-{{- if hasKey $.Values.global "metrics" }}
-{{- include "hpcc.addPrometheusScrapeAnnotations" $.Values.global.metrics | nindent 8 }}
-{{- end }}
-{{- if hasKey $roxie "annotations" }}
-{{ toYaml $roxie.annotations | indent 8 }}
-{{- end }}
- spec:
-{{- include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $servername "target" $roxie.name "type" "roxie") | indent 6 }}
- serviceAccountName: "hpcc-default"
- initContainers:
-{{- include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }}
-{{- include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}}
- terminationGracePeriodSeconds: {{ add ($roxie.agentQueryReleaseDelaySeconds | default 60) 30 }}
- containers:
- - name: {{ $servername | 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.daliArg" (dict "root" $ "component" "Roxie" "optional" false) }},
- "--server=true"
- ]
- 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 }}
- lifecycle:
- preStop:
- exec:
- command: ["testsocket", ".", "control:closedown"]
-{{ include "hpcc.addSentinelProbes" ( $roxie | merge (dict "readyProbeName" ".ready" )) | indent 8 }}
-{{ include "hpcc.addSecurityContext" (dict "root" $ "me" .) | indent 8 }}
-{{- include "hpcc.addResources" (dict "me" ($roxie.serverResources | default $roxie.resources) "root" $) | indent 8 }}
-{{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
- volumeMounts:
-{{ include "hpcc.addConfigMapVolumeMount" $roxie | 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" $ "component" "roxie-server" "name" $servername "external" false) | indent 8 }}
-{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-server" "name" $servername "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 8 }}
-{{ include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "component" "udpkey" "name" $udpkeyname ) | indent 8 }}
- volumes:
-{{ include "hpcc.addConfigMapVolume" $roxie | 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" $ "component" "roxie-server" "name" $servername "external" false) | indent 6 }}
-{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-server" "name" $servername "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 6 }}
-{{ include "hpcc.addUDPCertificateVolume" (dict "root" $ "component" "udpkey" "name" $udpkeyname) | indent 6 }}
-
----
-{{ include "hpcc.addCertificate" (dict "root" $ "name" $servername "services" $roxie.services "component" "roxie-server" "external" false) }}
-{{ include "hpcc.addCertificate" (dict "root" $ "name" $servername "services" $roxie.services "component" "roxie-server" "external" true "includeRemote" true) }}
----
-{{ end -}}{{/* if serverReplicas */}}
-
-{{- $agentPublicCertName := printf "%s-agent" $roxie.name }}
-{{ include "hpcc.addCertificate" (dict "root" $ "name" $agentPublicCertName "services" $roxie.services "component" "roxie-agent" "external" true "includeRemote" true) }}
-
-{{ range $c, $e := until ($commonCtx.numChannels|int) -}}
-{{- $channel := add $c 1 -}}
-{{- $name := printf "%s-agent-%d" $roxie.name $channel }}
-{{- $_ := set $commonCtx "instanceNames" (append $commonCtx.instanceNames $name) }}
-
-{{ include "hpcc.addCertificate" (dict "root" $ "name" $name "services" $roxie.services "component" "roxie-agent" "external" false) }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ $name | quote}}
-spec:
- replicas: {{ (hasKey $roxie "replicas") | ternary $roxie.replicas 1 }}
- selector:
- matchLabels:
- run: {{ $name | quote}}
- template:
- metadata:
- labels:
-{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-agent" "name" "roxie" "instance" $name) | indent 8 }}
- run: {{ $name | quote}}
-{{- if not $roxie.serverReplicas }}
- server: {{ $servername | quote }}
-{{- end }}
- roxie-cluster: {{ $roxie.name | quote }}
- accessDali: "yes"
- accessEsp: "yes"
-<<<<<<< HEAD
- helmVersion: 9.0.115-closedown0
-{{- if hasKey $.Values.global "metrics" }}
-{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
-{{- end }}
-{{- if hasKey $roxie "labels" }}
-{{ toYaml $roxie.labels | indent 8 }}
-{{- end }}
-=======
- helmVersion: 9.0.115-closedown0
-{{- if hasKey $.Values.global "metrics" }}
- {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
-{{- end }}
-{{- if hasKey $roxie "labels" }}
-{{ toYaml $roxie.labels | indent 8 }}
-{{- end }}
->>>>>>> origin/candidate-9.6.x
- annotations:
- checksum/config: {{ $configSHA }}
-{{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }}
-{{- if hasKey $.Values.global "metrics" }}
-{{- include "hpcc.addPrometheusScrapeAnnotations" $.Values.global.metrics | nindent 8 }}
-{{- end }}
- spec:
-{{- include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $name "target" $roxie.name "type" "roxie") | indent 6 }}
- serviceAccountName: "hpcc-default"
- initContainers:
-{{- include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }}
-{{- include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}}
- terminationGracePeriodSeconds: {{ add ($roxie.agentQueryReleaseDelaySeconds | default 60) 30 }}
- containers:
- - name: {{ $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" "Roxie" "optional" false) }},
- "--channels={{ $channel }}",
- "--server={{ not $roxie.serverReplicas }}",
- ]
- env:
-{{ include "hpcc.mergeEnvironments" $env | indent 8 -}}
- - name: "SENTINEL"
- value: "/tmp/{{ $roxie.name }}.sentinel"
-{{- if not $roxie.serverReplicas }}
-{{- $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 }}
- lifecycle:
- preStop:
- exec:
- command: ["testsocket", ".", "control:closedown"]
-{{ include "hpcc.addSentinelProbes" ( $roxie | merge (dict "readyProbeName" ".ready" )) | indent 8 }}
-{{- end }}{{/* not serverReplicas */}}
-{{ include "hpcc.addSecurityContext" (dict "root" $ "me" .) | indent 8 }}
-{{- include "hpcc.addResources" (dict "me" ($roxie.channelResources | default $roxie.resources) "root" $) | indent 8 }}
-{{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
- volumeMounts:
-{{ include "hpcc.addConfigMapVolumeMount" $roxie | indent 8 }}
-{{ include "hpcc.addVolumeMounts" $commonCtx | indent 8 }}
-{{ include "hpcc.addSecretVolumeMounts" $commonCtx | indent 8 }}
-{{ include "hpcc.addVaultClientCertificateVolumeMounts" $commonCtx | indent 8 }}
-{{- if not $roxie.serverReplicas }}
-
-{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-agent" "name" $name "external" false) | indent 8 }}
-{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-agent" "name" $agentPublicCertName "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 8 }}
-{{ include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "component" "udpkey" "name" $udpkeyname ) | indent 8 }}
-{{- end }}{{/* not serverReplicas */}}
-
- volumes:
-{{ include "hpcc.addConfigMapVolume" $roxie | indent 6 }}
-{{ include "hpcc.addVolumes" $commonCtx | indent 6 }}
-{{ include "hpcc.addSecretVolumes" $commonCtx | indent 6 }}
-{{ include "hpcc.addVaultClientCertificateVolumes" $commonCtx | indent 6 }}
-{{- if not $roxie.serverReplicas }}
-{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-agent" "name" $name "external" false) | indent 6 }}
-{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-agent" "name" $agentPublicCertName "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 6 }}
-{{ include "hpcc.addUDPCertificateVolume" (dict "root" $ "component" "udpkey" "name" $udpkeyname) | indent 6 }}
-{{- end }}{{/* not serverReplicas */}}
----
-
-{{- end }}
-{{- end }}{{/* if not singlenode */}}
----
-{{ include "hpcc.addEgress" (dict "root" $ "me" $roxie "labels" $commonCtx.instanceNames) }}
-{{- if hasKey . "hpa" }}
-{{- include "hpcc.addHorizontalPodAutoscaler" (dict "name" $roxie.name "kind" "Deployment" "hpa" $roxie.hpa) }}
-{{- end }}
-{{- end }}{{/* if not disabled */}}
-{{- end }}{{/* range */}}
-
diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml
index f21fe53a9e3..0592ec984db 100644
--- a/helm/hpcc/templates/sasha.yaml
+++ b/helm/hpcc/templates/sasha.yaml
@@ -52,7 +52,7 @@ spec:
run: {{ $serviceName | quote }}
server: {{ $serviceName | quote }}
accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }}
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- 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 e889da23c4a..2ec4ae3ac40 100644
--- a/helm/hpcc/templates/thor.yaml
+++ b/helm/hpcc/templates/thor.yaml
@@ -82,7 +82,7 @@ data:
labels:
accessDali: "yes"
accessEsp: "yes"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
{{- 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 }}
@@ -147,7 +147,7 @@ data:
accessEsp: "yes"
app: "thor"
component: "thormanager"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
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 }}
@@ -214,7 +214,7 @@ data:
accessEsp: "yes"
app: "thor"
component: "thorworker"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
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 }}
@@ -347,7 +347,7 @@ spec:
accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }}
app: "thor"
component: "thor-eclagent"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
instance: {{ $commonCtx.eclAgentName | quote }}
{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }}
{{- if hasKey $commonCtx.me "labels" }}
@@ -412,7 +412,7 @@ spec:
accessEsp: "no"
app: "thor"
component: "thor-thoragent"
- helmVersion: 9.0.115-closedown0
+ helmVersion: 9.0.111-closedown0
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/system/jlib/jlzw.cpp b/system/jlib/jlzw.cpp
index 03f1344f510..2dbf48aca62 100644
--- a/system/jlib/jlzw.cpp
+++ b/system/jlib/jlzw.cpp
@@ -804,13 +804,10 @@ void decompressToBuffer(MemoryBuffer & out, const void * src)
void decompressToBuffer(MemoryBuffer & out, MemoryBuffer & in)
{
- unsigned char method;
+ bool compressed;
size32_t srcLen;
- in.read(method).read(srcLen);
- if (method > 1)
- throw makeStringException(-1, "New compression format is not supported in this version");
-
- if (method != 0)
+ in.read(compressed).read(srcLen);
+ if (compressed)
decompressToBuffer(out, in.readDirect(srcLen));
else
out.append(srcLen, in.readDirect(srcLen));
diff --git a/version.cmake b/version.cmake
index a4c5c3ed115..87c5c4c9492 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 0 )
-set ( HPCC_POINT 115 )
+set ( HPCC_POINT 111 )
set ( HPCC_MATURITY "closedown" )
set ( HPCC_SEQUENCE 0 )
-set ( HPCC_TAG_TIMESTAMP "2024-05-31T15:15:05Z" )
+set ( HPCC_TAG_TIMESTAMP "2024-05-17T17:04:28Z" )
###