dependencies: move dynamic common deps under a 'dynamic.common' key

This PS moves existing dynamic common dependencies under a
'dynamic.common' key to simplify the yaml tree.

Change-Id: I4332bcfdf11197488e7bd5d8cf4c25565ea1c7b6

tiller/templates/deployment-tiller.yaml

@@ -18,7 +18,7 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.tiller .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.tiller .Values.dependencies.dynamic.common.local_image_registry) -}}
 {{- else -}}
 {{- $_ := set .Values "pod_dependency" .Values.dependencies.static.tiller -}}
 {{- end -}}

tiller/values.yaml

@@ -48,6 +48,14 @@ pod:
           cpu: "2000m"
 
 dependencies:
+  dynamic:
+    common:
+      local_image_registry:
+        jobs:
+          - tiller-image-repo-sync
+        services:
+          - endpoint: node
+            service: local_image_registry
   static:
     image_repo_sync:
       services:
@@ -56,14 +64,6 @@ dependencies:
     tiller:
       services: null
 
-conditional_dependencies:
-  local_image_registry:
-    jobs:
-      - tiller-image-repo-sync
-    services:
-      - service: local_image_registry
-        endpoint: node
-
 endpoints:
   cluster_domain_suffix: cluster.local
   local_image_registry: