Merge pull request #13 from projectsyn/fix_parameter_hierarchy

Fixing parameter hierarchy

Author: psy-q

Makefile

@@ -63,7 +63,7 @@ test-default: runtest
 test: test-default
 
 .PHONY: runtest
-runtest: commodore_args += -f tests/$(instance).yml
+runtest: commodore_args += -f tests/$(instance).yml -a maxscale-$(instance)
 runtest: .compile ## Compile the component
 
 .PHONY: clean

tests/defaults.yml

@@ -18,9 +18,8 @@ parameters:
     db3_port: 3307
     service_user: maxscale-testservice
     monitor_user: maxscale-testmonitor
-    service_pwd: testservicepwd
-    monitor_pwd: testmonitorpwd
-  containers:
+    service_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/service_pwd}
+    monitor_pwd: ?{vaultkv:${customer:name}/${cluster:name}/${_instance}/monitor_pwd}
     resources:
       limits:
         memory: 512Mi

tests/no_container_limits.yml

@@ -5,7 +5,7 @@
 parameters:
   _instance: maxscale-nolimits
   maxscale:
-    namespace: maxscale-test
+    namespace: maxscale-test-nolimits
     master_only_listen_address: 127.0.0.1
     read_write_listen_address: 127.0.0.1
     db1_address: db1.mygalera.test.example.org