From 24a9f62bee835af94ee5fbca2a4b2418e03a36f4 Mon Sep 17 00:00:00 2001
From: Itxaka <igarcia@suse.com>
Date: Thu, 16 May 2019 15:05:11 +0200
Subject: [PATCH] ceph: bump kubernetes version for ceph images

Make sure we are in sync with the kube version used on openstack-helm-infra

Change-Id: Ibeae5d8389bb1f90d9871273c016d476d2ddd50c
task: 30390
---
 ceph-config-helper/Dockerfile.suse_15       | 2 +-
 ceph-config-helper/Dockerfile.ubuntu_xenial | 2 +-
 ceph-daemon/Dockerfile.ubuntu_xenial        | 2 +-
 ceph-utility/Dockerfile.ubuntu_xenial       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ceph-config-helper/Dockerfile.suse_15 b/ceph-config-helper/Dockerfile.suse_15
index f567f2a3..daaf6f5a 100644
--- a/ceph-config-helper/Dockerfile.suse_15
+++ b/ceph-config-helper/Dockerfile.suse_15
@@ -2,7 +2,7 @@ ARG FROM=docker.io/opensuse/leap:15
 FROM ${FROM}
 LABEL maintainers=stephane@alum.mit.edu
 
-ARG KUBE_VERSION=v1.10.3
+ARG KUBE_VERSION=v1.13.4
 ARG CEPH_RELEASE=mimic
  RUN set -ex ;\
     TMP_DIR=$(mktemp --directory) ;\
diff --git a/ceph-config-helper/Dockerfile.ubuntu_xenial b/ceph-config-helper/Dockerfile.ubuntu_xenial
index 2d89c59a..801241ee 100644
--- a/ceph-config-helper/Dockerfile.ubuntu_xenial
+++ b/ceph-config-helper/Dockerfile.ubuntu_xenial
@@ -1,7 +1,7 @@
 ARG FROM=docker.io/ubuntu:xenial
 FROM ${FROM}
 
-ARG KUBE_VERSION=v1.10.3
+ARG KUBE_VERSION=v1.13.4
 ARG CEPH_RELEASE=mimic
 
 ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
diff --git a/ceph-daemon/Dockerfile.ubuntu_xenial b/ceph-daemon/Dockerfile.ubuntu_xenial
index cc5b8298..daa8f089 100644
--- a/ceph-daemon/Dockerfile.ubuntu_xenial
+++ b/ceph-daemon/Dockerfile.ubuntu_xenial
@@ -2,7 +2,7 @@ ARG FROM=docker.io/ubuntu:xenial
 FROM ${FROM}
 MAINTAINER matthew.heler@hotmail.com
 
-ARG KUBE_VERSION=1.12.2
+ARG KUBE_VERSION=1.13.4
 ARG CEPH_RELEASE=mimic
 ARG ETCDCTL_VERSION=3.2.18
 ARG CONFD_VERSION=0.16.0
diff --git a/ceph-utility/Dockerfile.ubuntu_xenial b/ceph-utility/Dockerfile.ubuntu_xenial
index 21747f0a..d90db979 100644
--- a/ceph-utility/Dockerfile.ubuntu_xenial
+++ b/ceph-utility/Dockerfile.ubuntu_xenial
@@ -2,7 +2,7 @@ ARG FROM=docker.io/ubuntu:xenial
 FROM ${FROM}
 
 ARG CEPH_RELEASE=mimic
-ARG KUBE_VERSION=1.12.2
+ARG KUBE_VERSION=1.13.4
 
 ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
 ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key