Merge branch 'aws:master' into upgrade-branch

.github/workflows/build-multi-arch.yml

@@ -1,4 +1,4 @@
-name: Build x64 and ARM64 images 
+name: Build x86 and ARM64 images
 
 on:
   pull_request:
@@ -7,36 +7,42 @@ on:
       - 'release*'  
 
 jobs:
-  build_x64:
-    name: Build x64
-    runs-on: [self-hosted, linux, x64]
+  build_x86:
+    name: Build x86
+    runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.14
+    - name: Set up Go 1.16
       uses: actions/setup-go@v2
       with:
-        go-version: '1.14.3'
+        go-version: '1.16'
       id: go
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
+    - name: Clean up stale docker images
+      run: sudo docker image prune -f
+
     - name: Build
       run: make docker all
 
   build_arm:
     name: Build ARM64
-    runs-on: [self-hosted, linux, ARM64]
+    runs-on: [self-hosted, linux, arm64]
     steps:
 
-    - name: Set up Go 1.14
+    - name: Set up Go 1.16
       uses: actions/setup-go@v2
       with:
-        go-version: '1.14.3'
+        go-version: '1.16'
       id: go
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
+    - name: Clean up stale docker images
+      run: sudo docker image prune -f
+
     - name: Build
       run: make docker all

.github/workflows/cron-test.yml

@@ -10,12 +10,12 @@ permissions:
 jobs:
   # Run nightly e2e tests on self-hosted runner
   integration-cron:
-    runs-on: self-hosted
+    runs-on: [self-hosted, linux, x64]
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.14
+          go-version: '1.16'
         id: go
 
       - name: Check out code into the Go module directory
@@ -26,8 +26,8 @@ jobs:
 
       - name: Get dependencies
         run: |
-          go get -u golang.org/x/lint/golint
-          go get -u golang.org/x/tools/cmd/goimports
+          go install golang.org/x/lint/golint@latest
+          go install golang.org/x/tools/cmd/goimports@latest
 
       - name: Run e2e tests
         env:

.github/workflows/forked-pr-tests.yml

@@ -14,14 +14,14 @@ permissions:
 jobs:
   # Repo owner has triggered this run
   integration-fork:
-    runs-on: self-hosted
+    runs-on: [self-hosted, linux, x64]
     if:
       github.event.inputs.pull_request_number != ''
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.14
+          go-version: '1.16'
         id: go
 
       # Check out a merge commit
@@ -32,8 +32,8 @@ jobs:
 
       - name: Get dependencies
         run: |
-          go get -u golang.org/x/lint/golint
-          go get -u golang.org/x/tools/cmd/goimports
+          go install golang.org/x/lint/golint@latest
+          go install golang.org/x/tools/cmd/goimports@latest
 
       - name: Clean up stale docker images
         run: sudo docker image prune -f

.github/workflows/integration-tests.yml

@@ -12,21 +12,21 @@ permissions:
 
 jobs:
   integration-trusted:
-    runs-on: self-hosted
+    runs-on: [self-hosted, linux, x64]
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.14
+          go-version: '1.16'
         id: go
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
       - name: Get dependencies
         run: |
-          go get -u golang.org/x/lint/golint
-          go get -u golang.org/x/tools/cmd/goimports
+          go install golang.org/x/lint/golint@latest
+          go install golang.org/x/tools/cmd/goimports@latest
 
       - name: Clean up stale docker images
         run: sudo docker image prune -f

.github/workflows/release.yaml

@@ -1,6 +1,6 @@
 name: VPC CNI Release
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, workflow_dispatch]
 
 env:
   DEFAULT_GO_VERSION: ^1.15

.github/workflows/unit-tests.yml

@@ -8,23 +8,23 @@ on:
 
 jobs:
   build_x86_64:
-    name: Build
+    name: Unit-tests
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.14
+    - name: Set up Go 1.16
       uses: actions/setup-go@v2
       with:
-        go-version: '1.14.3'
+        go-version: '1.16'
       id: go
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
     - name: Get dependencies
       run: |
-        go get -u golang.org/x/lint/golint
-        go get -u golang.org/x/tools/cmd/goimports
+        go install golang.org/x/lint/golint@latest
+        go install golang.org/x/tools/cmd/goimports@latest
 
     - name: Run code checks
       run: |

.github/workflows/weekly-cron-test.yml

@@ -2,20 +2,20 @@ name: Weekly CNI tests
 
 on:
   schedule:
-    - cron: "0 6 * * 6"  # every saturday
+    - cron: "0 16 * * 5"  # every friday
 
 permissions:
   contents: read
 
 jobs:
   # Run weekly tests on self-hosted runner
   weekly-cron:
-    runs-on: self-hosted
+    runs-on: [self-hosted, linux, x64]
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.14
+          go-version: '1.16'
         id: go
 
       - name: Check out code into the Go module directory
@@ -26,8 +26,8 @@ jobs:
 
       - name: Get dependencies
         run: |
-          go get -u golang.org/x/lint/golint
-          go get -u golang.org/x/tools/cmd/goimports
+          go install golang.org/x/lint/golint@latest
+          go install golang.org/x/tools/cmd/goimports@latest
 
       - name: Run perf tests
         env:

misc/eni-max-pods.txt

@@ -11,7 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 #
-# This file was generated at 2021-11-16T12:44:56-08:00
+# This file was generated at 2021-12-08T08:35:33+01:00
 #
 # Mapping is calculated from AWS EC2 API using the following formula:
 # * First IP on each ENI is not used for pods
@@ -116,6 +116,7 @@ c6i.32xlarge 737
 c6i.4xlarge 234
 c6i.8xlarge 234
 c6i.large 29
+c6i.metal 737
 c6i.xlarge 58
 cc2.8xlarge 234
 cr1.8xlarge 234
@@ -133,7 +134,7 @@ d3en.4xlarge 38
 d3en.6xlarge 58
 d3en.8xlarge 78
 d3en.xlarge 10
-dl1.24xlarge 2942
+dl1.24xlarge 737
 f1.16xlarge 394
 f1.2xlarge 58
 f1.4xlarge 234
@@ -187,10 +188,22 @@ i3en.6xlarge 234
 i3en.large 29
 i3en.metal 737
 i3en.xlarge 58
+im4gn.16xlarge 737
+im4gn.2xlarge 58
+im4gn.4xlarge 234
+im4gn.8xlarge 234
+im4gn.large 29
+im4gn.xlarge 58
 inf1.24xlarge 321
 inf1.2xlarge 38
 inf1.6xlarge 234
 inf1.xlarge 38
+is4gen.2xlarge 58
+is4gen.4xlarge 234
+is4gen.8xlarge 234
+is4gen.large 29
+is4gen.medium 8
+is4gen.xlarge 58
 m1.large 29
 m1.medium 12
 m1.small 8
@@ -258,7 +271,6 @@ m5n.2xlarge 58
 m5n.4xlarge 234
 m5n.8xlarge 234
 m5n.large 29
-m5n.metal 737
 m5n.xlarge 58
 m5zn.12xlarge 737
 m5zn.2xlarge 58
@@ -267,6 +279,16 @@ m5zn.6xlarge 234
 m5zn.large 29
 m5zn.metal 737
 m5zn.xlarge 58
+m6a.12xlarge 234
+m6a.16xlarge 737
+m6a.24xlarge 737
+m6a.2xlarge 58
+m6a.32xlarge 737
+m6a.48xlarge 737
+m6a.4xlarge 234
+m6a.8xlarge 234
+m6a.large 29
+m6a.xlarge 58
 m6g.12xlarge 234
 m6g.16xlarge 737
 m6g.2xlarge 58
@@ -293,6 +315,7 @@ m6i.32xlarge 737
 m6i.4xlarge 234
 m6i.8xlarge 234
 m6i.large 29
+m6i.metal 737
 m6i.xlarge 58
 mac1.metal 234
 p2.16xlarge 234
@@ -393,6 +416,16 @@ r6gd.large 29
 r6gd.medium 8
 r6gd.metal 737
 r6gd.xlarge 58
+r6i.12xlarge 234
+r6i.16xlarge 737
+r6i.24xlarge 737
+r6i.2xlarge 58
+r6i.32xlarge 737
+r6i.4xlarge 234
+r6i.8xlarge 234
+r6i.large 29
+r6i.metal 737
+r6i.xlarge 58
 t1.micro 4
 t2.2xlarge 44
 t2.large 35