Merge pull request kubernetes-sigs#223 from jsafrane/4.14-bump-golang…

…ci-lint

OCPBUGS-12297: UPSTREAM: 1505: bump go + golangci-lint

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.19-openshift-4.14
+  tag: rhel-8-release-golang-1.20-openshift-4.14

Dockerfile.openshift.rhel7

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.14 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
 COPY . .
 RUN make ARCH=$(go env GOARCH)

Makefile

@@ -142,7 +142,7 @@ bin/mockgen: | bin
 
 bin/golangci-lint: | bin
 	echo "Installing golangci-lint..."
-	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.50.1
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.51.1
 
 .PHONY: kubeval
 kubeval: bin/kubeval

pkg/cloud/cloud.go

@@ -252,7 +252,7 @@ func newEC2Cloud(region string, awsSdkDebugLog bool) (Cloud, error) {
 	endpoint := os.Getenv("AWS_EC2_ENDPOINT")
 	if endpoint != "" {
 		customResolver := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
-			if service == endpoints.Ec2ServiceID {
+			if service == ec2.EndpointsID {
 				return endpoints.ResolvedEndpoint{
 					URL:           endpoint,
 					SigningRegion: region,

tests/e2e/suite_test.go

@@ -33,7 +33,7 @@ import (
 const kubeconfigEnvVar = "KUBECONFIG"
 
 func init() {
-	rand.Seed(time.Now().UTC().UnixNano())
+	rand.New(rand.NewSource(time.Now().UnixNano()))
 	testing.Init()
 	// k8s.io/kubernetes/test/e2e/framework requires env KUBECONFIG to be set
 	// it does not fall back to defaults