Fix charts overrides for hyperkube 1.12

Promenade chart

The issue is that for joined nodes we will see hyperkube version
from Promenade chart which is not updated or different.

So, need to substitute hyperkube image directly in override to
align all hyperkube version in the cluster.

Tiller chart

Override image for tiller was defined under armada, so, need
to use appropriate place for source in substitution.

Removed placeholder to eliminate duplicates.

Change-Id: I01b8be41591f85fa962c0524bff75f0fdc97100d

global/profiles/kubernetes-host.yaml

@@ -38,6 +38,14 @@ metadata:
         path: .images.ucp.armada.helm
       dest:
         path: .images.helm.helm
+
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .images.kubernetes.hyperkube
+      dest:
+        path: .images.kubernetes.hyperkube
+
     - src:
         schema: pegleg/SoftwareVersions/v1
         name: software-versions

global/schemas/promenade/HostSystem/v1.yaml

@@ -113,11 +113,17 @@ data:
           required:
             - helm
           additionalProperties: false
+        kubernetes:
+          type: object
+          properties:
+            hyperkube:
+              $ref: '#/definitions/image'
         monitoring_image:
           $ref: '#/definitions/image'
       required:
         - haproxy
         - helm
+        - kubernetes
         - monitoring_image
       additionalProperties: false
 

global/software/charts/ucp/armada/tiller.yaml

@@ -22,9 +22,9 @@ metadata:
     - src:
         schema: pegleg/SoftwareVersions/v1
         name: software-versions
-        path: .images.ucp.tiller
+        path: .images.ucp.armada.tiller
       dest:
-        path: .values.images.tags
+        path: .values.images.tags.tiller
 
 data:
   chart_name: tiller

global/software/charts/ucp/promenade/promenade.yaml

@@ -26,6 +26,7 @@ metadata:
         path: .images.ucp.promenade
       dest:
         path: .values.images.tags
+
     - src:
         schema: pegleg/SoftwareVersions/v1
         name: software-versions
@@ -33,6 +34,13 @@ metadata:
       dest:
         path: .values.images.tags.monitoring_image
 
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .images.kubernetes.hyperkube
+      dest:
+        path: .values.images.tags.hyperkube
+
     # Files
     - src:
         schema: promenade/HostSystem/v1

global/software/config/versions.yaml

@@ -647,7 +647,6 @@ data:
         airflow_db_sync: quay.io/airshipit/airflow:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
         shipyard: quay.io/airshipit/shipyard:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
         shipyard_db_sync: quay.io/airshipit/shipyard:f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9-ubuntu_xenial
-      tiller: {}
   packages:
     gpgkey: |-
       -----BEGIN PGP PUBLIC KEY BLOCK-----