Rebase to pull in changes in common

common/templates/snippets/_k8s_init_dep_check.tpl

@@ -9,7 +9,7 @@
     {
       "name": "POD_NAME",
       {{- if $deps.pod -}}
-      "value": "{{-  $deps.pod . 1  -}}"
+      "value": "{{ index $deps.pod 0 }}"
       {{- else -}}
       "valueFrom": {
         "fieldRef": {
@@ -46,7 +46,7 @@
     },
     {
       "name": "DEPENDENCY_CONTAINER",
-      "value": "{{  include "joinListWithColon" $deps.container }}"
+      "value": "{{  include "joinListWithComma" $deps.container }}"
     },
     {
       "name": "COMMAND",

maas/values.yaml

@@ -14,7 +14,7 @@ database:
 
 dependencies:
   import_resources:
-    pod: 
+    pod:
     - maas-region-0
     container:
     - maas-region