From 78c8cc298927eb3e9386e22d814c14a550c9828d Mon Sep 17 00:00:00 2001 From: Shlomo Heigh Date: Wed, 27 Oct 2021 16:37:52 -0400 Subject: [PATCH] Update to Go 1.16 Fixes build failing due to goconvey dependency change --- CHANGELOG.md | 3 +++ Dockerfile | 2 +- Dockerfile.junit | 2 +- Dockerfile.test | 2 +- go.mod | 2 +- pkg/authenticator/authenticator_test.go | 1 - 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24eb5728..be9c7f40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Changed +- The project Golang version is updated from the end-of-life v1.15 to version v1.16. [cyberark/conjur-authn-k8s-client#416](https://github.com/cyberark/conjur-authn-k8s-client/pull/416) + ## [0.22.0] - 2021-09-17 ### Added - Introduces the `conjur-config-cluster-prep.yaml` and `conjur-config-namespace-prep.yaml` raw Kubernetes manifests generated from their corresponding Helm charts. These manifests provide an alternative method of configuring a Kubernetes cluster for the deployment of Conjur-authenticated applications for users unable to use Helm in their environment. diff --git a/Dockerfile b/Dockerfile index b2f5c573..d96dddd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM goboring/golang:1.15.6b5 as authenticator-client-builder +FROM goboring/golang:1.16.7b7 as authenticator-client-builder MAINTAINER CyberArk Software Ltd. ENV GOOS=linux \ diff --git a/Dockerfile.junit b/Dockerfile.junit index 7371a958..ae65d4a0 100644 --- a/Dockerfile.junit +++ b/Dockerfile.junit @@ -1,4 +1,4 @@ -FROM golang:1.15-alpine +FROM golang:1.16-alpine MAINTAINER CyberArk Software Ltd. LABEL id="conjur-authn-k8s-client-junit-processor" diff --git a/Dockerfile.test b/Dockerfile.test index 3eadcf7f..4980083f 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -FROM golang:1.15-alpine +FROM golang:1.16-alpine MAINTAINER CyberArk Software Ltd. LABEL id="conjur-authn-k8s-client-test-runner" diff --git a/go.mod b/go.mod index 28ea3813..6a491d31 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cyberark/conjur-authn-k8s-client -go 1.15 +go 1.16 require ( github.com/cenkalti/backoff v2.2.1+incompatible diff --git a/pkg/authenticator/authenticator_test.go b/pkg/authenticator/authenticator_test.go index e5712589..1876645c 100644 --- a/pkg/authenticator/authenticator_test.go +++ b/pkg/authenticator/authenticator_test.go @@ -10,7 +10,6 @@ import ( "path/filepath" "testing" - . "github.com/smartystreets/goconvey/convey" "github.com/stretchr/testify/assert" "github.com/cyberark/conjur-authn-k8s-client/pkg/access_token/memory"