From d96d4f84d10a6f7484e4779449d46dd29df6a4ef Mon Sep 17 00:00:00 2001
From: Filipe Forattini <filipe@vitta.me>
Date: Sat, 18 Jun 2022 13:40:32 -0300
Subject: [PATCH] fix: node selector turnaround

---
 deploy/as-k8s/dependencies.schema.yml | 14 ++++++++------
 deploy/as-k8s/dependencies.yml        | 18 +++++++++++++++++-
 test/concerns/dependencies-full.yml   | 10 ++++++++++
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/deploy/as-k8s/dependencies.schema.yml b/deploy/as-k8s/dependencies.schema.yml
index 54ddc738..de88ca6b 100644
--- a/deploy/as-k8s/dependencies.schema.yml
+++ b/deploy/as-k8s/dependencies.schema.yml
@@ -20,8 +20,8 @@ mysql:
       #@schema/type any=True
       extraEnvVars: []
     primary:
-      affinity: {}
-      nodeSelector: {}
+      #@schema/type any=True
+      nodeSelector: []
       #@schema/type any=True
       extraEnvVars: []
       persistence:
@@ -29,8 +29,10 @@ mysql:
         size: 2Gi
         storageClass: ""
       resources:
-        limits: {}
-        requests: {}
+        #@schema/type any=True
+        limits: []
+        #@schema/type any=True
+        requests: []
 
 #! POSTGRES
 postgres:
@@ -50,8 +52,8 @@ postgres:
       #@schema/type any=True
       extraEnvVars: []
     primary:
-      affinity: {}
-      nodeSelector: {}
+      #@schema/type any=True
+      nodeSelector: []
       #@schema/type any=True
       extraEnvVars: []
       persistence:
diff --git a/deploy/as-k8s/dependencies.yml b/deploy/as-k8s/dependencies.yml
index a949845e..757afa6b 100644
--- a/deploy/as-k8s/dependencies.yml
+++ b/deploy/as-k8s/dependencies.yml
@@ -3,6 +3,14 @@
 #@ load("@ytt:base64", "base64")
 #@ load("@ytt:sha256", "sha256")
 
+#@ def ListToMap (listOfMaps):
+#@    newMap = {}
+#@    for i in range(len(listOfMaps)):
+#@        newMap.update({ listOfMaps[i].name: listOfMaps[i].value })
+#@    end
+#@    return newMap
+#@ end
+
 ---
 #@ dependencies = []
 #@ if data.values.mysql.enabled:
@@ -49,13 +57,21 @@ mysql:
       username: #@ data.values.repository
       database: #@ "/{}".format(data.values.repository)
       secret: mysql-password
+      
   #@ mysqlValues = {}
   #@ mysqlValues.update(data.values.mysql.values)
   #@ mysqlValues.update({ 
   #@    "auth": {
   #@      "database": data.values.repository,
   #@      "username": data.values.repository
-  #@    }
+  #@    },
+  #@    "primary": {
+  #@      "nodeSelector": ListToMap(data.values.mysql.values.primary.nodeSelector),
+  #@      "resources": {
+  #@        "limits": ListToMap(data.values.mysql.values.primary.resources.limits),
+  #@        "requests": ListToMap(data.values.mysql.values.primary.resources.requests),
+  #@      }
+  #@     }
   #@ })
   values: #@ mysqlValues
 
diff --git a/test/concerns/dependencies-full.yml b/test/concerns/dependencies-full.yml
index f6a0aa27..0cc3f183 100644
--- a/test/concerns/dependencies-full.yml
+++ b/test/concerns/dependencies-full.yml
@@ -4,14 +4,24 @@ mysql:
   enabled: true
   values:
     primary:
+      nodeSelector:
+        - name: arch
+          value: amd64
       persistence:
         size: 2Gi
         storageClass: longhorn
+      resources:
+        requests:
+          - name: cpu
+            value: 0.2
 
 postgres:
   enabled: true  
   values:
     primary:
+      nodeSelector:
+        - name: arch
+          value: amd64
       persistence:
         size: 2Gi	
         storageClass: longhorn