From ece70f1a376835308f18f7b45f02c18e6f7dc855 Mon Sep 17 00:00:00 2001
From: Alexandre Peixoto Ferreira <alexandref75@gmail.com>
Date: Mon, 7 Nov 2022 12:42:38 -0600
Subject: [PATCH] Remove namespace so helm install it (#4)

* Remove namespace so helm install it

Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com>

* Fix nodeSelector (Bug #9027 helm)

Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com>

Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com>
---
 chart/Chart.yaml               | 2 +-
 chart/templates/common.yaml    | 7 +++++--
 chart/templates/configmap.yaml | 1 -
 chart/values.yaml              | 5 -----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index d0f56a4..96a8866 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: smarter-device-manager
 description: smarter-device-manager chart for SMARTER edge devices
 home: https://gitlab.com/smarter-project/smarter-device-manager/helm
-version: 0.0.2
+version: 0.0.3
 appVersion: v1.20.11
 kubeVersion: ">=1.16.0-0"
 keywords:
diff --git a/chart/templates/common.yaml b/chart/templates/common.yaml
index bfb4a74..5dc3fef 100644
--- a/chart/templates/common.yaml
+++ b/chart/templates/common.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ .Values.application.appName }}
-  namespace: {{ .Values.application.namespace }}
   labels:
     name: {{ .Values.application.appName }}
     role: agent
@@ -20,7 +19,11 @@ spec:
         node.kubernetes.io/bootstrap-checkpoint: "true"
     spec: 
       nodeSelector:
-        {{- toYaml .Values.configuration.nodeSelector | nindent 8 }}
+        {{- if .Values.nodeSelector }}
+        {{- toYaml .Values.nodeSelector | nindent 8 }}
+        {{- else }}
+        smarter.device-manager: enabled
+        {{- end }}
       tolerations:
       - key: "smarter.type"
         operator: "Equal"
diff --git a/chart/templates/configmap.yaml b/chart/templates/configmap.yaml
index d17a4a1..af44769 100644
--- a/chart/templates/configmap.yaml
+++ b/chart/templates/configmap.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Values.application.appName }}
-  namespace: {{ .Values.application.namespace }}
 data:
   conf.yaml: |
   {{- toYaml .Values.config | nindent 4 }}
diff --git a/chart/values.yaml b/chart/values.yaml
index eb4de54..3099b0b 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,7 +1,6 @@
 #
 
 application:
-  namespace: smarter
   appName: smarter-device-manager
 
 image:
@@ -10,10 +9,6 @@ image:
   tag: ""
   pullPolicy: IfNotPresent
 
-configuration:
-  nodeSelector:
-    smarter.device-manager: enabled
-
 # If a specific configurations is used it can be provided by uncommenting this lines
 # config:
 #   - devicematch: ^snd$