Merge c6428a1 into 5fe8b74

keikoproj · Feb 11, 2021 · f502207 · f502207
2 parents 5fe8b74 + c6428a1
commit f502207
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.14 as builder
+FROM golang:1.15 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 export GO111MODULE=on
 
 CONTROLLER_GEN_VERSION := v0.4.1
-GO_MIN_VERSION := 11100 # go1.11
+GO_MIN_VERSION := 11500 # go1.15
 
 define generate_int_from_semver
   echo $(1) |cut -dv -f2 |awk '{split($$0,a,"."); print  a[3]+(100*a[2])+(10000* a[1])}'

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/keikoproj/instance-manager
 
-go 1.14
+go 1.15
 
 require (
 	github.com/Masterminds/semver v1.5.0