From 51681ba53dde7f0b685053e664a357a51b601469 Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <bharat@stackhpc.com>
Date: Thu, 7 May 2020 08:05:29 +0000
Subject: [PATCH] [k8s-fedora-atomic] Build kube_tag v1.15.12

Despite the policy that Kubernetes project maintains release branches
for the most recent three minor releases (1.18, 1.17, 1.16) [0],
v1.15.12 has been released so this change partially restores the
builder for this tag as an alternative to completely reverting
26411c2970df4c939c63ff173ea66e53eba5aede.

[0] https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions

Story: 2005124
Task: 39686

Change-Id: Ia458c5a87ba2357f845eb095548403cc7a25b58c
---
 playbooks/container-builder-vars.yaml | 10 ++++++++++
 playbooks/container-builder.yaml      | 15 +++++++++++++++
 playbooks/container-publish.yaml      | 21 ++++-----------------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/playbooks/container-builder-vars.yaml b/playbooks/container-builder-vars.yaml
index f43ba7edaa..aec668a36b 100644
--- a/playbooks/container-builder-vars.yaml
+++ b/playbooks/container-builder-vars.yaml
@@ -6,6 +6,16 @@ magnum_images:
   - name: heat-container-agent
     tag: ussuri-dev
 
+kubernetes_versions:
+  - version: v1.15.12
+
+kubernetes_images:
+  - name: kubernetes-apiserver
+  - name: kubernetes-controller-manager
+  - name: kubernetes-kubelet
+  - name: kubernetes-scheduler
+  - name: kubernetes-proxy
+
 helm_versions:
   - version: v2.16.6
   - version: v3.2.0
diff --git a/playbooks/container-builder.yaml b/playbooks/container-builder.yaml
index ed1ab73bf9..d7747c19d0 100644
--- a/playbooks/container-builder.yaml
+++ b/playbooks/container-builder.yaml
@@ -13,6 +13,21 @@
           with_items: "{{ magnum_images }}"
           retries: 10
 
+    - name: "Build kubernetes images"
+      block:
+        - name: "Build {{ magnum_repository }}/{{ item[1].name }}:{{ item[0].version }} image"
+          docker_image:
+            path: "{{ magnum_src_dir }}/dockerfiles/{{ item[1].name }}"
+            name: "{{ magnum_repository }}/{{ item[1].name }}"
+            tag: "{{ item[0].version }}"
+            buildargs:
+              KUBE_VERSION: "{{ item[0].version }}"
+            push: no
+          with_nested:
+            - "{{ kubernetes_versions }}"
+            - "{{ kubernetes_images }}"
+          retries: 10
+
     - name: "Build helm-client image"
       block:
         - docker_image:
diff --git a/playbooks/container-publish.yaml b/playbooks/container-publish.yaml
index 368a9a68fa..17640f0ed4 100644
--- a/playbooks/container-publish.yaml
+++ b/playbooks/container-publish.yaml
@@ -10,23 +10,10 @@
         - command: docker push {{ magnum_repository }}/{{ item.name }}:{{ item.tag }}
           with_items: "{{ magnum_images }}"
           retries: 10
-        - command: docker push {{ magnum_repository }}/{{ item.name }}:{{ kubernetes_version_v1_11 }}
-          with_items: "{{ kubernetes_images }}"
-          retries: 10
-        - command: docker push {{ magnum_repository }}/{{ item.name }}:{{ kubernetes_version_v1_12 }}
-          with_items: "{{ kubernetes_images }}"
-          retries: 10
-        - command: docker push {{ magnum_repository }}/{{ item.name }}:{{ kubernetes_version_v1_13 }}
-          with_items: "{{ kubernetes_images }}"
-          retries: 10
-        - command: docker push {{ magnum_repository }}/{{ item.name }}:{{ kubernetes_version_v1_14 }}
-          with_items: "{{ kubernetes_images }}"
-          retries: 10
-        - command: docker push {{ magnum_repository }}/{{ item.name }}:{{ kubernetes_version_v1_15 }}
-          with_items: "{{ kubernetes_images }}"
-          retries: 10
-        - command: docker push {{ magnum_repository }}/{{ item.name }}:{{ kubernetes_version_v1_16 }}
-          with_items: "{{ kubernetes_images }}"
+        - command: docker push {{ magnum_repository }}/{{ item[1].name }}:{{ item[0].version }}
+          with_nested:
+            - "{{ kubernetes_versions }}"
+            - "{{ kubernetes_images }}"
           retries: 10
         - command: docker push {{ magnum_repository }}/helm-client:{{ helm_version }}
           retries: 10