Bump tests to 1.13 (#797)

aws · Jan 22, 2020 · 4bf10a0 · 4bf10a0
1 parent 7941783
commit 4bf10a0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -126,12 +126,12 @@ clean:
 files := $(shell find . -not -name 'mock_publisher.go' -not -name 'rpc.pb.go' -not -name 'integration_test.go' -name '*.go' -print)
 unformatted = $(shell goimports -l $(files))
 
-format :
+format:
 	@echo "== format"
 	@goimports -w $(files)
 	@sync
 
-check-format :
+check-format:
 	@echo "== check formatting"
 ifneq "$(unformatted)" ""
 	@echo "needs formatting: $(unformatted)"

diff --git a/README.md b/README.md
@@ -30,39 +30,41 @@ The default manifest expects `--cni-conf-dir=/etc/cni/net.d` and `--cni-bin-dir=
 L-IPAM requires following [IAM policy](https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html):
 
 ```
- {
-     "Effect": "Allow",
-     "Action": [
-         "ec2:CreateNetworkInterface",
-         "ec2:AttachNetworkInterface",
-         "ec2:DeleteNetworkInterface",
-         "ec2:DetachNetworkInterface",
-         "ec2:DescribeNetworkInterfaces",
-         "ec2:DescribeInstances",
-         "ec2:ModifyNetworkInterfaceAttribute",
-         "ec2:AssignPrivateIpAddresses",
-         "ec2:UnassignPrivateIpAddresses"
-     ],
-     "Resource": [
-         "*"
-     ]
- },
- {
-     "Effect": "Allow",
-     "Action": "ec2:CreateTags",
-     "Resource": "arn:aws:ec2:*:*:network-interface/*"
- },
+      {
+        "Effect": "Allow",
+        "Action": [
+          "ec2:AssignPrivateIpAddresses",
+          "ec2:AttachNetworkInterface",
+          "ec2:CreateNetworkInterface",
+          "ec2:DeleteNetworkInterface",
+          "ec2:DescribeInstances",
+          "ec2:DescribeInstanceTypes",
+          "ec2:DescribeTags",
+          "ec2:DescribeNetworkInterfaces",
+          "ec2:DetachNetworkInterface",
+          "ec2:ModifyNetworkInterfaceAttribute",
+          "ec2:UnassignPrivateIpAddresses"
+        ],
+        "Resource": "*"
+      },
+      {
+         "Effect": "Allow",
+         "Action": [
+            "ec2:CreateTags"
+          ],
+          "Resource": ["arn:aws:ec2:*:*:network-interface/*"]
+      }
 ```
 
 Alternatively there is also a [Helm](https://helm.sh/) chart: [eks/aws-vpc-cni](https://github.com/aws/eks-charts/tree/master/stable/aws-vpc-cni)
 
 ## Building
 
 * `make` defaults to `make build-linux` that builds the Linux binaries.
-* `unit-test`, `lint` and `vet` provide ways to run the respective tests/tools and should be run before submitting a PR.
+* `unit-test`, `format`,`lint` and `vet` provide ways to run the respective tests/tools and should be run before submitting a PR.
 * `make docker` will create a docker container using the docker-build with the finished binaries, with a tag of `amazon/amazon-k8s-cni:latest`
-* `make docker-build` uses a docker container (golang:1.12) to build the binaries.
-* `make docker-unit-tests` uses a docker container (golang:1.12) to run all unit tests.
+* `make docker-build` uses a docker container (golang:1.13) to build the binaries.
+* `make docker-unit-tests` uses a docker container (golang:1.13) to run all unit tests.
 
 ## Components
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/aws/amazon-vpc-cni-k8s
 
-go 1.12
+go 1.13
 
 require (
 	github.com/aws/aws-sdk-go v1.26.8

diff --git a/test/integration/go.mod b/test/integration/go.mod
@@ -1,6 +1,6 @@
 module github.com/aws/amazon-vpc-cni-k8s/test/integration
 
-go 1.12
+go 1.13
 
 replace k8s.io/api => k8s.io/api v0.0.0-20190819141258-3544db3b9e44