Update SDK Go version (#1542) (#1544)

* Update SDK Go version * missed mod file
aws · Jul 23, 2021 · 3765c0b · 3765c0b
1 parent 3fab411
commit 3765c0b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -72,7 +72,7 @@ export GOPROXY = direct
 
 VENDOR_OVERRIDE_FLAG =
 # aws-sdk-go override in case we need to build against a custom version
-EC2_SDK_OVERRIDE ?= "y"
+EC2_SDK_OVERRIDE ?= "n"
 
 ifeq ($(EC2_SDK_OVERRIDE), "y")
 VENDOR_OVERRIDE_FLAG = -mod=mod

diff --git a/charts/aws-vpc-cni/test.yaml b/charts/aws-vpc-cni/test.yaml
@@ -6,7 +6,7 @@ nameOverride: aws-node
 
 init:
   image:
-    tag: v1.7.5
+    tag: v1.9.0
     region: us-west-2
     pullPolicy: Always
     # Set to use custom image
@@ -18,7 +18,7 @@ init:
 
 image:
   region: us-west-2
-  tag: v1.7.5
+  tag: v1.9.0
   pullPolicy: Always
   # Set to use custom image
   # override: "repo/org/image:tag"

diff --git a/charts/aws-vpc-cni/values.yaml b/charts/aws-vpc-cni/values.yaml
@@ -8,7 +8,7 @@ nameOverride: aws-node
 
 init:
   image:
-    tag: v1.8.0
+    tag: v1.9.0
     region: us-west-2
     pullPolicy: Always
     # Set to use custom image
@@ -20,7 +20,7 @@ init:
 
 image:
   region: us-west-2
-  tag: v1.8.0
+  tag: v1.9.0
   pullPolicy: Always
   # Set to use custom image
   # override: "repo/org/image:tag"

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/amazon-vpc-cni-k8s
 go 1.14
 
 require (
-	github.com/aws/aws-sdk-go v1.37.23
+	github.com/aws/aws-sdk-go v1.40.6
 	github.com/containernetworking/cni v0.8.0
 	github.com/containernetworking/plugins v0.9.0
 	github.com/coreos/go-iptables v0.4.5
@@ -19,7 +19,7 @@ require (
 	github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
 	go.uber.org/zap v1.15.0
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
 	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
 	golang.org/x/tools v0.1.3 // indirect
 	google.golang.org/grpc v1.29.0

diff --git a/scripts/dockerfiles/Dockerfile.metrics b/scripts/dockerfiles/Dockerfile.metrics
@@ -11,7 +11,6 @@ ENV GOPROXY=direct
 # Copy modules in before the rest of the source to only expire cache on module
 # changes:
 COPY go.mod go.sum ./
-COPY vendor/ vendor/
 RUN go mod download
 
 COPY . ./

diff --git a/scripts/dockerfiles/Dockerfile.release b/scripts/dockerfiles/Dockerfile.release
@@ -10,7 +10,6 @@ ENV GOPROXY=direct
 
 # Copy modules in before the rest of the source to only expire cache on module changes:
 COPY go.mod go.sum ./
-COPY vendor/ vendor/
 RUN go mod download
 
 COPY Makefile ./

diff --git a/test/go.mod b/test/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/aws/amazon-vpc-cni-k8s v1.7.10
 	github.com/aws/amazon-vpc-cni-k8s/test/agent v0.0.0-20210519174950-4d1931b480a2
 	github.com/aws/amazon-vpc-resource-controller-k8s v1.0.7
-	github.com/aws/aws-sdk-go v1.37.23
+	github.com/aws/aws-sdk-go v1.40.6
 	github.com/onsi/ginkgo v1.12.1
 	github.com/onsi/gomega v1.11.0
 	github.com/pkg/errors v0.9.1