From 215c4c4b5e4cbcdb8f41c38275bd2b4c9148b35e Mon Sep 17 00:00:00 2001
From: rajadoui <mehdijadoui22@gmail.com>
Date: Wed, 22 Jan 2025 14:39:39 +0100
Subject: [PATCH] fix: fix nodeSelector bug in metrics-exporter component in
 control-plane chart

---
 .../control-plane/templates/metrics-exporter.yaml      |  2 +-
 charts/armonik/charts/control-plane/values.yaml        |  2 +-
 charts/armonik/values-aws.yaml                         | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/charts/armonik/charts/control-plane/templates/metrics-exporter.yaml b/charts/armonik/charts/control-plane/templates/metrics-exporter.yaml
index f72c9ce28..701d59d3a 100644
--- a/charts/armonik/charts/control-plane/templates/metrics-exporter.yaml
+++ b/charts/armonik/charts/control-plane/templates/metrics-exporter.yaml
@@ -85,7 +85,7 @@ spec:
           defaultMode: 420
   {{- if .Values.nodeSelector }}
       nodeSelector:
-        {{- toYaml .Values.nodeSelector | nindent 8 }}
+        service: metrics
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
diff --git a/charts/armonik/charts/control-plane/values.yaml b/charts/armonik/charts/control-plane/values.yaml
index 1bb9fb432..fb2e7beae 100644
--- a/charts/armonik/charts/control-plane/values.yaml
+++ b/charts/armonik/charts/control-plane/values.yaml
@@ -1,5 +1,5 @@
 replicaCount: 1
-
+registry: "dockerhubaneo"
 image:
   repository: dockerhubaneo/armonik_control
   tag: 0.30.0
diff --git a/charts/armonik/values-aws.yaml b/charts/armonik/values-aws.yaml
index c5b98c225..3979f0f52 100644
--- a/charts/armonik/values-aws.yaml
+++ b/charts/armonik/values-aws.yaml
@@ -20,7 +20,7 @@ control-plane:
       operator: Equal
       value: control-plane
 compute-plane:
-  enabled: false
+  enabled: true
   nodeSelector:
     service: workers
   tolerations:
@@ -46,7 +46,8 @@ redis:
   enabled: true
   useStatefulSet: true
   replica:
-    replicaCount: 1
+    persistence:
+      enabled: false
   fullnameOverride: "redis"
   tls:
     enabled: false
@@ -64,9 +65,6 @@ redis:
       enabled: false
     containerPorts:
       redis: 6379
-  replica:
-    persistence:
-      enabled: false
 
 ################## ACTIVEMQ ##################
 activemq:
@@ -115,7 +113,7 @@ chaos-mesh:
 
 ################## KEDA ##################
 keda:
-  enabled: true
+  enabled: false
   certificates:
     certManager:
       enabled: true