From 34a4e161c6f389c834b14e2bcbb3084e79d5a3e9 Mon Sep 17 00:00:00 2001
From: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
Date: Mon, 17 Aug 2020 13:14:13 +0300
Subject: [PATCH] chore(*) migrate to go 1.15.0

Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
---
 .circleci/config.yml                            | 6 +++---
 mk/dev.mk                                       | 2 +-
 pkg/plugins/resources/k8s/native/Dockerfile     | 2 +-
 tools/releases/dockerfiles/Dockerfile.kuma-init | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4fdadbfe9dd3..3ea7e28e6248 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,11 +3,11 @@ version: 2.1 # Adds support for executors, parameterized jobs, etc
 reusable:
 
   constants:
-  - &go_version "1.14.6"
+  - &go_version "1.15.0"
 
   docker_images:
-  - &golang_image "golang:1.14.6"
-  - &circleci_golang_image "circleci/golang:1.14.6"
+  - &golang_image "golang:1.15.0"
+  - &circleci_golang_image "circleci/golang:1.15.0"
 
   vm_images:
   - &ubuntu_vm_image "ubuntu-1604:202004-01"
diff --git a/mk/dev.mk b/mk/dev.mk
index 749c4985674a..148e73401456 100644
--- a/mk/dev.mk
+++ b/mk/dev.mk
@@ -7,7 +7,7 @@ GINKGO_VERSION := v1.12.0
 CI_KUBEBUILDER_VERSION ?= 2.0.0
 CI_MINIKUBE_VERSION ?= v1.9.2
 CI_KUBECTL_VERSION ?= v1.18.2
-CI_TOOLS_IMAGE ?= circleci/golang:1.14.6
+CI_TOOLS_IMAGE ?= circleci/golang:1.15.0
 
 CI_TOOLS_DIR ?= $(HOME)/bin
 GOPATH_DIR := $(shell go env GOPATH | awk -F: '{print $$1}')
diff --git a/pkg/plugins/resources/k8s/native/Dockerfile b/pkg/plugins/resources/k8s/native/Dockerfile
index 718ed6301bc3..5b96eccfa212 100644
--- a/pkg/plugins/resources/k8s/native/Dockerfile
+++ b/pkg/plugins/resources/k8s/native/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.14.6 as builder
+FROM golang:1.15.0 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/tools/releases/dockerfiles/Dockerfile.kuma-init b/tools/releases/dockerfiles/Dockerfile.kuma-init
index 13474af55ed1..bb8eefbec03a 100644
--- a/tools/releases/dockerfiles/Dockerfile.kuma-init
+++ b/tools/releases/dockerfiles/Dockerfile.kuma-init
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic as builder
 
-ENV GOVERSION 1.14.6
+ENV GOVERSION 1.15.0
 ENV GOROOT /opt/go
 ENV GOPATH /root/.go
 
@@ -26,4 +26,4 @@ COPY $KUMA_ROOT/tools/releases/templates/LICENSE /kuma
 COPY $KUMA_ROOT/tools/releases/templates/NOTICE-kuma-init /kuma/NOTICE
 COPY $KUMA_ROOT/tools/releases/templates/README /kuma
 
-ENTRYPOINT ["./kuma-iptables"]
\ No newline at end of file
+ENTRYPOINT ["./kuma-iptables"]