From 8e1640ff42a05d8c848882f2d28df1243bb473d8 Mon Sep 17 00:00:00 2001
From: "Egorov, Stanislav" <segorov@mirantis.com>
Date: Thu, 26 Sep 2019 12:32:17 -0700
Subject: [PATCH] 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                | 8 ++++++++
 global/schemas/promenade/HostSystem/v1.yaml         | 6 ++++++
 global/software/charts/ucp/armada/tiller.yaml       | 4 ++--
 global/software/charts/ucp/promenade/promenade.yaml | 8 ++++++++
 global/software/config/versions.yaml                | 1 -
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/global/profiles/kubernetes-host.yaml b/global/profiles/kubernetes-host.yaml
index d4f1485f4..d539fc2f4 100644
--- a/global/profiles/kubernetes-host.yaml
+++ b/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
diff --git a/global/schemas/promenade/HostSystem/v1.yaml b/global/schemas/promenade/HostSystem/v1.yaml
index e04aefe4d..d5d018dcf 100644
--- a/global/schemas/promenade/HostSystem/v1.yaml
+++ b/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
 
diff --git a/global/software/charts/ucp/armada/tiller.yaml b/global/software/charts/ucp/armada/tiller.yaml
index 986609517..77f5c1474 100644
--- a/global/software/charts/ucp/armada/tiller.yaml
+++ b/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
diff --git a/global/software/charts/ucp/promenade/promenade.yaml b/global/software/charts/ucp/promenade/promenade.yaml
index 19697353e..93c7f65be 100644
--- a/global/software/charts/ucp/promenade/promenade.yaml
+++ b/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
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index f9f6b1957..379b9a10b 100644
--- a/global/software/config/versions.yaml
+++ b/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-----