From 86d717dd854b6128fcdee35f90119e33af3c5873 Mon Sep 17 00:00:00 2001 From: Akram Ben Aissi Date: Wed, 13 May 2020 19:35:51 +0200 Subject: [PATCH] Move to golang 1.14 --- .travis.yml | 2 +- Makefile | 2 +- build/Dockerfile | 2 +- cicd/pipelines/k8s.jenkins | 2 +- config.base.env | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbd486e1..9a1e0965 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: - KUBECONFIG=$HOME/.kube/config go: - - 1.13.x + - 1.14.x before_install: - | diff --git a/Makefile b/Makefile index b569b8ce..62ec3441 100644 --- a/Makefile +++ b/Makefile @@ -212,7 +212,7 @@ PLATFORM = $(shell echo $(UNAME_S) | tr A-Z a-z) staticcheck: ## Verifies `staticcheck` passes @echo "+ $@" ifndef HAS_STATICCHECK - wget -O staticcheck_$(PLATFORM)_amd64.tar.gz https://github.com/dominikh/go-tools/releases/download/2019.2.3/staticcheck_$(PLATFORM)_amd64.tar.gz + wget -O staticcheck_$(PLATFORM)_amd64.tar.gz https://github.com/dominikh/go-tools/releases/download/2020.1.3/staticcheck_$(PLATFORM)_amd64.tar.gz tar zxvf staticcheck_$(PLATFORM)_amd64.tar.gz mkdir -p $(GOPATH)/bin mv staticcheck/staticcheck $(GOPATH)/bin diff --git a/build/Dockerfile b/build/Dockerfile index 13ead864..1615bd64 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,7 +1,7 @@ ARG GO_VERSION # build stage -FROM golang:$GO_VERSION-alpine3.10 AS build-stage +FROM golang:$GO_VERSION-alpine3.11 AS build-stage ARG OPERATOR_SDK_VERSION ENV GO111MODULE=on RUN apk --no-cache add git curl make \ diff --git a/cicd/pipelines/k8s.jenkins b/cicd/pipelines/k8s.jenkins index 5df55672..75cb81da 100644 --- a/cicd/pipelines/k8s.jenkins +++ b/cicd/pipelines/k8s.jenkins @@ -7,7 +7,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/" podTemplate(label: label, containers: [ - containerTemplate(name: 'alpine', image: 'alpine:3.10.2', ttyEnabled: true, command: 'cat'), + containerTemplate(name: 'alpine', image: 'alpine:3.11', ttyEnabled: true, command: 'cat'), ], ) { node(label) { diff --git a/config.base.env b/config.base.env index 95db80a5..f86c6d55 100644 --- a/config.base.env +++ b/config.base.env @@ -1,7 +1,7 @@ # Setup variables for the Makefile NAME=kubernetes-operator OPERATOR_SDK_VERSION=0.17.0 -GO_VERSION=1.13.1 +GO_VERSION=1.14.2 PKG=github.com/jenkinsci/kubernetes-operator DOCKER_ORGANIZATION=virtuslab DOCKER_REGISTRY=jenkins-operator