From 68c0e86a464d90b9d904ed6e63b08bf4b74e22e8 Mon Sep 17 00:00:00 2001
From: Spyros Trigazis <spyridon.trigazis@cern.ch>
Date: Wed, 21 Aug 2019 11:34:39 +0200
Subject: [PATCH] kubernetes builds for v1.{13,14,15,16}.x

kubernetes_version_v1_13: v1.13.10
kubernetes_version_v1_14: v1.14.6
kubernetes_version_v1_15: v1.15.3
kubernetes_version_v1_16: v1.16.0-beta.1

story: 2005124
task: 36320

Change-Id: I35617f67af1157cb39d22a17f10defa26bce2f09
Signed-off-by: Spyros Trigazis <spyridon.trigazis@cern.ch>
---
 playbooks/container-builder-vars.yaml |  7 ++++---
 playbooks/container-builder.yaml      | 13 +++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/playbooks/container-builder-vars.yaml b/playbooks/container-builder-vars.yaml
index c810ddd302..d4f397a572 100644
--- a/playbooks/container-builder-vars.yaml
+++ b/playbooks/container-builder-vars.yaml
@@ -3,9 +3,10 @@ magnum_src_dir: "src/opendev.org/openstack/magnum"
 magnum_repository: openstackmagnum
 kubernetes_version_v1_11: v1.11.10
 kubernetes_version_v1_12: v1.12.10
-kubernetes_version_v1_13: v1.13.9
-kubernetes_version_v1_14: v1.14.5
-kubernetes_version_v1_15: v1.15.2
+kubernetes_version_v1_13: v1.13.10
+kubernetes_version_v1_14: v1.14.6
+kubernetes_version_v1_15: v1.15.3
+kubernetes_version_v1_16: v1.16.0-beta.1
 kubernetes_images:
   - name: kubernetes-apiserver
   - name: kubernetes-controller-manager
diff --git a/playbooks/container-builder.yaml b/playbooks/container-builder.yaml
index 2f747b7b62..37e1bdd4e9 100644
--- a/playbooks/container-builder.yaml
+++ b/playbooks/container-builder.yaml
@@ -82,6 +82,19 @@
           with_items: "{{ kubernetes_images }}"
           retries: 10
 
+    - name: "Build kubernetes images v1.16"
+      block:
+        - name: "Build {{ magnum_repository }}/{{ item.name }}:{{ item.tag }} image"
+          docker_image:
+            path: "{{ magnum_src_dir }}/dockerfiles/{{ item.name }}"
+            name: "{{ magnum_repository }}/{{ item.name }}"
+            tag: "{{kubernetes_version_v1_16}}"
+            buildargs:
+              KUBE_VERSION: "{{kubernetes_version_v1_16}}"
+            push: no
+          with_items: "{{ kubernetes_images }}"
+          retries: 10
+
     - name: "Build helm-client image"
       block:
         - docker_image: