From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 20 Nov 2020 11:13:45 +0000 (+0100)
Subject: Force Kubernetes 11.0 to please xrall_kubernetes
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=477049960a5e438e1ea89f4979090cf419c65a27;p=functest-kubernetes.git

Force Kubernetes 11.0 to please xrall_kubernetes

It will be reverted once xrally_kubernetes is ready.

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

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index fd7a40be..af4226ae 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -13,6 +13,7 @@ RUN apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi o
     (cd /src/requirements && \
         git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
         git checkout FETCH_HEAD) && \
+    sed -i -E /^kubernetes==+.*$/d /src/requirements/upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) \
         sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && \
         apk add --no-cache py3-pynacl ;; esac && \