Updates Kubernetes versions

Kubernetes client selected by OpenStack is too old compared to K8s
testing.

Change-Id: I453b9518251ae3c907c17eef17a41ecc0e23dd2c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index eab857d..61f0b75 100644 (file)
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -12,6 +12,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /#egg=tempest/d upper-constraints.txt && \
     sed -i -E /^ujson==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 9347021..03f50a5 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -12,6 +12,7 @@ RUN apk --no-cache add --update \
         openssl-dev libjpeg-turbo-dev && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /^ujson==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt  && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 1353805..0fb4506 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -11,6 +11,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev openssl-dev && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /#egg=tempest/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \

diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 8fbfa59..c8cb88b 100644 (file)
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -15,6 +15,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
     sed -i -E /^ujson==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 828afb5..1aaf0e0 100644 (file)
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -27,6 +27,7 @@ RUN apk --no-cache add --update \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
     sed -i -E /#egg=tempest/d upper-constraints.txt && \
     sed -i -E /^ujson==+.*$/d upper-constraints.txt && \
+    sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \
     sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 2b5272c..193004c 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -27,3 +27,4 @@ pylint===2.3.1;python_version=='3.6'
 sphinx===1.7.6
 sphinxcontrib-spelling===4.2.1
 ujson===2.0.3
+kubernetes===11.0.0