From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Mon, 7 Oct 2019 16:21:52 +0000 (+0000)
Subject: Merge "Switch back to 1.15 in k8s layer container"
X-Git-Tag: 2.0.0~19
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=ce060c9f65de5c231d2bf6c0e3bbdf9dce7ab7d4;hp=148dfe2fad4ce4907e15a9d9c923e324a9d4d8d7

Merge "Switch back to 1.15 in k8s layer container"
---

diff --git a/docker/README.rst b/docker/README.rst
index 0fff3ed..6e0cc7d 100644
--- a/docker/README.rst
+++ b/docker/README.rst
@@ -231,7 +231,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