From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Fri, 4 Oct 2019 07:56:51 +0000 (+0300)
Subject: Set kube-conformance back to v1.15
X-Git-Tag: 2.0.0~22
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=6b3865b2f09ff3ac8588085f12ca3d8bfc16581e;p=validation.git

Set kube-conformance back to v1.15

The image was upgraded in [1].

The version must be in line with target deployment's version if
internal registry is used. REC is based on 1.15 and utilize internal
registry.

[1] https://gerrit.akraino.org/r/c/validation/+/1691

Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Change-Id: I42738c2845c874e457bf317aeb95465f93c4102b
---

diff --git a/docker/kube-conformance/Makefile b/docker/kube-conformance/Makefile
index ee7b40f..8e76e14 100644
--- a/docker/kube-conformance/Makefile
+++ b/docker/kube-conformance/Makefile
@@ -15,7 +15,7 @@
 ##############################################################################
 
 export WORK_DIR?=$(TAG_PRE)
-export KUBE_VERSION=1.16
+export KUBE_VERSION=1.15
 export TAG_VER?=v$(KUBE_VERSION)
 
 .PHONY: .build