From 147370c1e9eb501db6b39880f8365244f15d2dd2 Mon Sep 17 00:00:00 2001
From: Jordan CARRIER <carrierjordan@gmail.com>
Date: Fri, 24 Jan 2025 15:37:50 +0100
Subject: [PATCH] fix: update image tags and namespace references in Armonik
 Helm charts

---
 .../charts/activemq/templates/certificat.yaml |  2 +-
 .../templates/compute-plane-deployment.yaml   |  6 ++--
 .../armonik/charts/compute-plane/values.yaml  | 31 ++++++++++---------
 .../control-plane/templates/certificat.yaml   |  8 ++---
 .../fluent-bit-configmap-armonik.yaml         |  2 +-
 .../charts/control-plane/templates/jobs.yaml  |  9 +++---
 .../templates/partition-metrics-exporter.yaml |  6 ++--
 .../armonik/charts/control-plane/values.yaml  |  2 +-
 .../ingress/templates/admin-gui-svc.yaml      |  2 +-
 .../charts/ingress/templates/admin-gui.yaml   |  6 ++--
 .../templates/ingress-nginx-configmap.yaml    |  2 +-
 .../charts/ingress/templates/ingress-svc.yaml |  2 +-
 .../charts/ingress/templates/ingress.yaml     |  4 +--
 charts/armonik/charts/ingress/values.yaml     | 11 +++----
 14 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/charts/armonik/charts/activemq/templates/certificat.yaml b/charts/armonik/charts/activemq/templates/certificat.yaml
index 823928f78..bd89d5da1 100644
--- a/charts/armonik/charts/activemq/templates/certificat.yaml
+++ b/charts/armonik/charts/activemq/templates/certificat.yaml
@@ -4,7 +4,7 @@ metadata:
   name: activemq-crt
   annotations:
     "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-weight": "10"
 spec:
   isCA: false
   usages:
diff --git a/charts/armonik/charts/compute-plane/templates/compute-plane-deployment.yaml b/charts/armonik/charts/compute-plane/templates/compute-plane-deployment.yaml
index 956910635..cc9c6080e 100644
--- a/charts/armonik/charts/compute-plane/templates/compute-plane-deployment.yaml
+++ b/charts/armonik/charts/compute-plane/templates/compute-plane-deployment.yaml
@@ -58,9 +58,9 @@ spec:
       containers:
       - name: {{ $.Values.pollingAgent.name }}
       {{- if (ne $config.pollingAgent.tag "") }}
-        image: {{ $config.pollingAgent.image }}:{{ $config.pollingAgent.tag }}
+        image: "{{ $.Values.registry }}/{{ $config.pollingAgent.image }}:{{ $config.pollingAgent.tag }}"
       {{- else }}
-        image: {{ $config.pollingAgent.image }}
+        image: {{ $.Values.registry }}/{{ $config.pollingAgent.image }}
       {{- end }}
         imagePullPolicy: {{ $config.pollingAgent.imagePullPolicy | quote}}
         resources:
@@ -117,7 +117,7 @@ spec:
         {{- end }}
       {{- range $index, $worker := $config.worker }}
       - name: "{{ $worker.name }}-{{ $index }}"
-        image: "{{ $worker.image }}:{{ $worker.tag | default "" }}"
+        image: "{{ $.Values.registry }}/{{ $worker.image }}:{{ $worker.tag | default "" }}"
         {{- range $config.worker}}
         imagePullPolicy: {{ .imagePullPolicy | quote }}
         {{- end }}
diff --git a/charts/armonik/charts/compute-plane/values.yaml b/charts/armonik/charts/compute-plane/values.yaml
index fab3bc58c..9ebf4958c 100644
--- a/charts/armonik/charts/compute-plane/values.yaml
+++ b/charts/armonik/charts/compute-plane/values.yaml
@@ -3,6 +3,7 @@ replicaCount: 1
 namespace: armonik
 shareProcessNamespace: false
 restartPolicy: Always
+registry: "dockerhubaneo"
 
 computePlane:
   metadata:
@@ -14,8 +15,8 @@ computePlane:
     default:
       replicas: 1
       pollingAgent:
-        image: "dockerhubaneo/armonik_pollingagent"
-        tag: "0.30.0"
+        image: "armonik_pollingagent"
+        tag: "0.31.0-jgprovidercheck.14.32d68938"
         imagePullPolicy: "IfNotPresent"
         limits:
           cpu: "500m"
@@ -62,7 +63,7 @@ computePlane:
       # ArmoniK workers
       worker:
         - name: "worker"
-          image: "dockerhubaneo/armonik_worker_dll"
+          image: "armonik_worker_dll"
           tag: "0.18.0"
           imagePullPolicy: "IfNotPresent"
           limits:
@@ -91,8 +92,8 @@ computePlane:
     stream:
       replicas: 1
       pollingAgent:
-        image: "dockerhubaneo/armonik_pollingagent"
-        tag: "0.30.0"
+        image: "armonik_pollingagent"
+        tag: "0.31.0-jgprovidercheck.14.32d68938"
         imagePullPolicy: "IfNotPresent"
         limits:
           cpu: "500m"
@@ -141,8 +142,8 @@ computePlane:
       # ArmoniK workers
       worker:
         - name: "worker"
-          image: "dockerhubaneo/armonik_core_stream_test_worker"
-          tag: "0.30.0"
+          image: "armonik_core_stream_test_worker"
+          tag: "0.31.0-jgprovidercheck.14.32d68938"
           imagePullPolicy: "IfNotPresent"
           limits:
             cpu: "500m"
@@ -170,8 +171,8 @@ computePlane:
     htcmock:
       replicas: 1
       pollingAgent:
-        image: "dockerhubaneo/armonik_pollingagent"
-        tag: "0.30.0"
+        image: "armonik_pollingagent"
+        tag: "0.31.0-jgprovidercheck.14.32d68938"
         imagePullPolicy: "IfNotPresent"
         limits:
           cpu: "500m"
@@ -222,8 +223,8 @@ computePlane:
       # ArmoniK workers
       worker:
         - name: "worker"
-          image: "dockerhubaneo/armonik_core_htcmock_test_worker"
-          tag: "0.30.0"
+          image: "armonik_core_htcmock_test_worker"
+          tag: "0.31.0-jgprovidercheck.14.32d68938"
           imagePullPolicy: "IfNotPresent"
           limits:
             cpu: "500m"
@@ -251,8 +252,8 @@ computePlane:
     bench:
       replicas: 1
       pollingAgent:
-        image: "dockerhubaneo/armonik_pollingagent"
-        tag: "0.30.0"
+        image: "armonik_pollingagent"
+        tag: "0.31.0-jgprovidercheck.14.32d68938"
         imagePullPolicy: "IfNotPresent"
         limits:
           cpu: "500m"
@@ -301,8 +302,8 @@ computePlane:
       # ArmoniK workers
       worker:
         - name: "worker"
-          image: "dockerhubaneo/armonik_core_bench_test_worker"
-          tag: "0.30.0"
+          image: "armonik_core_bench_test_worker"
+          tag: "0.31.0-jgprovidercheck.14.32d68938"
           imagePullPolicy: "IfNotPresent"
           limits:
             cpu: "500m"
diff --git a/charts/armonik/charts/control-plane/templates/certificat.yaml b/charts/armonik/charts/control-plane/templates/certificat.yaml
index 11a898933..01a006d13 100644
--- a/charts/armonik/charts/control-plane/templates/certificat.yaml
+++ b/charts/armonik/charts/control-plane/templates/certificat.yaml
@@ -5,7 +5,7 @@ metadata:
   name: armonik-selfsigned-issuer
   annotations:
     "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-weight": "10"
 spec:
   selfSigned: {}
 ---
@@ -15,7 +15,7 @@ metadata:
   name: ingress-crt
   annotations:
     "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-weight": "10"
 spec:
   isCA: false
   usages:
@@ -46,7 +46,7 @@ metadata:
   name: mongodb-crt
   annotations:
     "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-weight": "10"
 spec:
   isCA: false
   usages:
@@ -77,7 +77,7 @@ metadata:
   name: redis-crt
   annotations:
     "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-weight": "10"
 spec:
   isCA: false
   usages:
diff --git a/charts/armonik/charts/control-plane/templates/fluent-bit-configmap-armonik.yaml b/charts/armonik/charts/control-plane/templates/fluent-bit-configmap-armonik.yaml
index 79d470763..85a09a659 100644
--- a/charts/armonik/charts/control-plane/templates/fluent-bit-configmap-armonik.yaml
+++ b/charts/armonik/charts/control-plane/templates/fluent-bit-configmap-armonik.yaml
@@ -5,7 +5,7 @@ metadata:
     app: armonik
     service: fluent-bit
     type: logs
-  name: fluent-bit-config
+  name: fluent-bit-configmap-armonik
   namespace: {{ .Values.namespace }}
 data:
   filter-kubernetes.conf: |
diff --git a/charts/armonik/charts/control-plane/templates/jobs.yaml b/charts/armonik/charts/control-plane/templates/jobs.yaml
index f633b1f9e..85b35dddf 100644
--- a/charts/armonik/charts/control-plane/templates/jobs.yaml
+++ b/charts/armonik/charts/control-plane/templates/jobs.yaml
@@ -29,11 +29,12 @@ spec:
       - name: job-partitions-in-database
         image: rtsp/mongosh:2.3.8
         imagePullPolicy: IfNotPresent
-        command: ["mongosh"]
-        args:
+        command:
           - |
-            -u $MongoDB__User -p $MongoDB__Password mongodb://$MongoDB__Host:$MongoDB__Port/database?authSource=$MongoDB__AuthSource --eval "db.PartitionData.drop()"
-            -u $MongoDB__User -p $MongoDB__Password mongodb://$MongoDB__Host:$MongoDB__Port/database?authSource=$MongoDB__AuthSource --eval "db.PartitionData.insertMany([{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'bench'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'default'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'htcmock'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'stream'}])"
+            <<EOF
+            mongosh -u $MongoDB__User -p $MongoDB__Password mongodb://$MongoDB__Host:$MongoDB__Port/database?authSource=$MongoDB__AuthSource --eval "db.PartitionData.drop()"
+            mongosh -u $MongoDB__User -p $MongoDB__Password mongodb://$MongoDB__Host:$MongoDB__Port/database?authSource=$MongoDB__AuthSource --eval "db.PartitionData.insertMany([{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'bench'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'default'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'htcmock'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'stream'}])"
+            EOF
         env:
         - name: MongoDB__Password
           valueFrom:
diff --git a/charts/armonik/charts/control-plane/templates/partition-metrics-exporter.yaml b/charts/armonik/charts/control-plane/templates/partition-metrics-exporter.yaml
index 778d57a62..7e83b4a67 100644
--- a/charts/armonik/charts/control-plane/templates/partition-metrics-exporter.yaml
+++ b/charts/armonik/charts/control-plane/templates/partition-metrics-exporter.yaml
@@ -7,7 +7,7 @@ metadata:
     service: partition-metrics-exporter
     type: monitoring
   name: partition-metrics-exporter
-  namespace: {{ .Values.global.namespace }}
+  namespace: {{ .Values.namespace }}
 spec:
   selector:
     matchLabels:
@@ -21,11 +21,11 @@ spec:
         service: partition-metrics-exporter
         type: monitoring
       name: partition-metrics-exporter
-      namespace: {{ .Values.global.namespace }}
+      namespace: {{ .Values.namespace }}
     spec:
       automountServiceAccountToken: true
       containers:
-      - image: {{ .Values.global.registry }}/armonik_control_partition_metrics:{{ .Values.image.tag }}
+      - image: {{ .Values.registry }}/armonik_control_partition_metrics:{{ .Values.image.tag }}
         imagePullPolicy: IfNotPresent
         name: partition-metrics-exporter
         ports:
diff --git a/charts/armonik/charts/control-plane/values.yaml b/charts/armonik/charts/control-plane/values.yaml
index 9e20a319b..a5e85a29e 100644
--- a/charts/armonik/charts/control-plane/values.yaml
+++ b/charts/armonik/charts/control-plane/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 registry: "dockerhubaneo"
 image:
   repository: dockerhubaneo/armonik_control
-  tag: 0.30.0
+  tag: "0.31.0-jgprovidercheck.14.32d68938"
   pullPolicy: IfNotPresent
 
 grafanaDashboard: 
diff --git a/charts/armonik/charts/ingress/templates/admin-gui-svc.yaml b/charts/armonik/charts/ingress/templates/admin-gui-svc.yaml
index 77aef2170..359ffc60c 100644
--- a/charts/armonik/charts/ingress/templates/admin-gui-svc.yaml
+++ b/charts/armonik/charts/ingress/templates/admin-gui-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: armonik
     service: admin-gui
   name: admin-gui
-  namespace: {{ .Values.global.namespace }}
+  namespace: {{ .Values.namespace }}
 spec:
   internalTrafficPolicy: Cluster
   ipFamilies:
diff --git a/charts/armonik/charts/ingress/templates/admin-gui.yaml b/charts/armonik/charts/ingress/templates/admin-gui.yaml
index cb0c8ab69..894dcfb9b 100644
--- a/charts/armonik/charts/ingress/templates/admin-gui.yaml
+++ b/charts/armonik/charts/ingress/templates/admin-gui.yaml
@@ -5,7 +5,7 @@ metadata:
     app: "armonik"
     service: "admin-gui"
   name: admin-gui
-  namespace: {{ .Values.global.namespace }}
+  namespace: {{ .Values.namespace }}
 spec:
   selector:
     matchLabels:
@@ -22,11 +22,11 @@ spec:
         app: "armonik"
         service: "admin-gui"
       name: admin-gui
-      namespace: {{ .Values.global.namespace }}
+      namespace: {{ .Values.namespace }}
     spec:
       automountServiceAccountToken: true
       containers:
-      - image: {{ .Values.global.registry }}/{{ .Values.adminGui.image }}
+      - image: {{ .Values.registry }}/{{ .Values.adminGui.image }}
         imagePullPolicy: {{ .Values.adminGui.imagePullPolicy }}
         name: admin-app
         ports:
diff --git a/charts/armonik/charts/ingress/templates/ingress-nginx-configmap.yaml b/charts/armonik/charts/ingress/templates/ingress-nginx-configmap.yaml
index 07c8c84e1..75e8f8531 100644
--- a/charts/armonik/charts/ingress/templates/ingress-nginx-configmap.yaml
+++ b/charts/armonik/charts/ingress/templates/ingress-nginx-configmap.yaml
@@ -6,4 +6,4 @@ immutable: false
 kind: ConfigMap
 metadata:
   name: ingress-nginx
-  namespace: {{ .Values.global.namespace }}
+  namespace: {{ .Values.namespace }}
diff --git a/charts/armonik/charts/ingress/templates/ingress-svc.yaml b/charts/armonik/charts/ingress/templates/ingress-svc.yaml
index 098ffbf55..5944ef624 100644
--- a/charts/armonik/charts/ingress/templates/ingress-svc.yaml
+++ b/charts/armonik/charts/ingress/templates/ingress-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: "armonik"
     service: "ingress"
   name: ingress
-  namespace: {{ .Values.global.namespace }}
+  namespace: {{ .Values.namespace }}
 spec:
   allocateLoadBalancerNodePorts: {{ .Values.ingress.service.allocateLoadBalancerNodePorts }}
   externalTrafficPolicy: {{ .Values.ingress.service.externalTrafficPolicy }}
diff --git a/charts/armonik/charts/ingress/templates/ingress.yaml b/charts/armonik/charts/ingress/templates/ingress.yaml
index cd5946f96..800c5de42 100644
--- a/charts/armonik/charts/ingress/templates/ingress.yaml
+++ b/charts/armonik/charts/ingress/templates/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
     app: armonik
     service: ingress
   name: ingress
-  namespace: {{ .Values.global.namespace }}
+  namespace: {{ .Values.namespace }}
 spec:
   progressDeadlineSeconds: {{ .Values.ingress.progressDeadlineSeconds }}
   replicas: {{ .Values.ingress.replicaCount }}
@@ -25,7 +25,7 @@ spec:
         app: "armonik"
         service: "ingress"
       name: ingress
-      namespace: {{ .Values.global.namespace }}
+      namespace: {{ .Values.namespace }}
     spec:
       automountServiceAccountToken: true
       containers:
diff --git a/charts/armonik/charts/ingress/values.yaml b/charts/armonik/charts/ingress/values.yaml
index eb0eb4a45..fa4cd2944 100644
--- a/charts/armonik/charts/ingress/values.yaml
+++ b/charts/armonik/charts/ingress/values.yaml
@@ -1,9 +1,8 @@
-global:
-  registry: dockerhubaneo
-  namespace: "armonik"
-  app:
-    name: my-app
-    version: 1.0.0
+registry: dockerhubaneo
+namespace: "armonik"
+app:
+  name: my-app
+  version: 1.0.0
 
 imagePullSecrets: []
 nameOverride: ""