From 5b51f1550433b5b90eba77a2a4922232de705fb3 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 17 Dec 2019 15:26:22 +0100
Subject: Update go for Kubernetes v1.17
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Kubernetes v1.17 requires go1.13.4 or greater.
It completes "Update to K8S_TAG v1.17.0" [1].

[1] https://git.opnfv.org/functest-kubernetes/commit/?h=stable/jerma&id=6013753b39971c5d246f7e39574a8176065a5aaf

Change-Id: Ia247930811c20526a157d61f3a86f7abf558f68c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 ansible/site.yml       | 2 +-
 build.sh               | 6 +++---
 docker/core/Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/site.yml b/ansible/site.yml
index 8caf6059..2c10b4d4 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -13,7 +13,7 @@
           - repo: _
             dport:
             container: golang
-            tag: 1.12-alpine3.10
+            tag: 1.13-alpine3.10
         steps:
           - name: build opnfv/functest-kubernetes-core
             containers:
diff --git a/build.sh b/build.sh
index 6da96aac..dc9d407f 100644
--- a/build.sh
+++ b/build.sh
@@ -28,11 +28,11 @@ done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
         "${repo}/functest-kubernetes-core:amd64-jerma" \
-        golang:1.12-alpine3.10 || true)
+        golang:1.13-alpine3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.12-alpine3.10|arm64v8/golang:1.12-alpine3.10|g" {} +
+    -e "s|golang:1.13-alpine3.10|arm64v8/golang:1.13-alpine3.10|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core:jerma|\
 ${repo}/functest-kubernetes-core:arm64-jerma|g" {} +
@@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do
 done
 [ ! -z "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm64-jerma" \
-        arm64v8/golang:1.12-alpine3.10 || true)
+        arm64v8/golang:1.13-alpine3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index ecbbe32d..9326efc1 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine3.10
+FROM golang:1.13-alpine3.10
 
 ARG BRANCH=stable/jerma
 ARG OPENSTACK_TAG=stable/train
-- 
cgit