From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Mon, 7 Oct 2019 12:48:38 +0000 (+0300)
Subject: Switch back to 1.15 in k8s layer container
X-Git-Tag: 2.0.0~19^2
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F1741%2F1;p=validation.git

Switch back to 1.15 in k8s layer container

Verification needed before version upgrade.

JIRA: VAL-65

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

diff --git a/docker/README.rst b/docker/README.rst
index 1708db1..848f00a 100644
--- a/docker/README.rst
+++ b/docker/README.rst
@@ -232,7 +232,7 @@ Example:
 
 .. code-block:: console
 
-    docker run -ti akraino/validation:kube-conformance-v1.16
+    docker run -ti akraino/validation:kube-conformance-v1.15
 
 By default, the container will run the `run_e2e.sh` script. If you want to
 enter the container, add */bin/sh* at the end of the command above
diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile
index 43c6d80..925ac3d 100644
--- a/docker/k8s/Dockerfile
+++ b/docker/k8s/Dockerfile
@@ -19,9 +19,9 @@ FROM golang:alpine3.9 as build
 
 # Sonobuoy supports 3 Kubernetes minor versions: the current release and 2
 # minor versions before.
-ARG SB_TAG=v0.16.1
+ARG SB_TAG=v0.15.1
 # Determine the latest stable git tag at build time based on stable major version
-ARG K8S_VER=1.16
+ARG K8S_VER=1.15
 
 # Install dependencies
 COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt