diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-09-30 11:30:05 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-09-30 11:35:32 +0200 |
| commit | 925aa60e2f39143add389a2c64e1a3dfa41362dd (patch) | |
| tree | 1e73dc1649c025c159893ad767d2bfd5be7ef0c0 /docker | |
| parent | 3b9f703a67a39a54868cc5104ccea1071710dc7f (diff) | |
Get the right K8s e2e version
Change-Id: I4eaba8b410061e4d401319a020770d78b6990a85
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cnf/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 7e6c38f9..eafebba9 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,10 +1,11 @@ FROM opnfv/functest-kubernetes-core +ARG K8S_TAG=1.25 ARG CNF_TESTSUITE_TAG=v0.15.0 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ --output /usr/local/bin/kubectl && \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 0100d706..6c514901 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,7 +1,8 @@ FROM opnfv/functest-kubernetes-core +ARG K8S_TAG=1.25 RUN apk --no-cache add --update curl libc6-compat && \ - tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.txt) && \ + tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ -s --output /usr/local/bin/kubectl && \ |