Merge pull request hpcc-systems#19125 from rpastrana/HPCC-32670-Roxie…

…-applabel HPCC-32670 Roxie should report k8s app label Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com> Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
ghalliday · Sep 20, 2024 · 41aaec1 · 41aaec1
2 parents a74bdd8 + adcc892
commit 41aaec1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml
@@ -73,6 +73,7 @@ spec:
         server: {{ $servername | quote }}
         accessDali: "yes"
         accessEsp: "yes"
+        app: "roxie"
         {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }}
 {{-    if hasKey . "labels" }}

diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml
@@ -123,6 +123,7 @@ spec:
     metadata:
       labels:
 {{-    include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }}
+        app: "toposerver"
         run: {{ $commonCtx.toponame | quote }}
         roxie-cluster: {{ $roxie.name | quote }}
         {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
@@ -182,6 +183,7 @@ kind: Service
 metadata:
   name: {{ $commonCtx.toponame | quote }}
   labels:
+    app: "toposerver"
     {{- include "hpcc.generateHelmVersion" . | nindent 4 }}
     {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
 spec:
@@ -239,6 +241,7 @@ spec:
   template:
     metadata:
       labels:
+        app: "roxie"
         run: {{ $servername | quote }}
         server: {{ $roxie.name | quote }}
         roxie-cluster: {{ $roxie.name | quote }}
@@ -345,6 +348,7 @@ spec:
     metadata:
       labels:
 {{-     include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-agent" "name" "roxie" "instance" $name) | indent 8 }}
+        app: "roxie"
         run: {{ $name | quote}}
 {{-     if not $roxie.serverReplicas }}        
         server: {{ $servername | quote }}