Merge branch 'main' into bugfix-elb-cleanup

eksctl-io · Oct 6, 2023 · 2aa7ac2 · 2aa7ac2
2 parents 05e32e4 + 761362c
commit 2aa7ac2
Show file tree

Hide file tree

Showing 118 changed files with 4,372 additions and 2,266 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -32,7 +32,7 @@ template: |
   Weaveworks would like to sincerely thank:
   $CONTRIBUTORS
 replacers:
-  - search: '/@(Himangini|TiberiuGC|A-Hilaly|yuxiang-zhang|cPu1|eksctl-bot|dependabot(?:\[bot\])?)(?:,| |$)/gm'
+  - search: '/@(Himangini|TiberiuGC|a-hilaly|yuxiang-zhang|cPu1|eksctl-bot|dependabot(?:\[bot\])?)(?:,| |$)/gm'
     replace: ''
 exclude-labels:
   - 'skip-release-notes'
diff --git a/.github/workflows/build-all-distros-nightly.yaml b/.github/workflows/build-all-distros-nightly.yaml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
           fetch-depth: 0
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
       - name: Setup deps
         run: |
           make install-build-deps

diff --git a/.github/workflows/cache-dependencies.yaml b/.github/workflows/cache-dependencies.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache Go modules
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/

diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
@@ -10,19 +10,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 #4.6.0
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #5.0.0
         with:
           images: weaveworks/eksctl
       - name: Log in to Docker Hub
-        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc #v2.2.0
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d #v3.0.0
         with:
           username: weaveworkseksctlci
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 #4.1.1
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #5.0.0
         with:
           context: .
           push: true

diff --git a/.github/workflows/ecr-publish-build.yaml b/.github/workflows/ecr-publish-build.yaml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # v3.0.1
+        uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 # v4.0.0
         with:
           aws-region: us-east-1
           role-duration-seconds: 7200
@@ -29,7 +29,7 @@ jobs:
           registry-type: public
 
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
 
       - name: Setup deps
         run: |

diff --git a/.github/workflows/ecr-publish.yaml b/.github/workflows/ecr-publish.yaml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # v3.0.1
+        uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 # v4.0.0
         with:
           aws-region: us-east-1
           role-duration-seconds: 7200
@@ -32,7 +32,7 @@ jobs:
 
       - name: Extract metadata (tags, labels)
         id: meta
-        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4.6.0
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #5.0.0
         env:
           REGISTRY: ${{ steps.login-ecr-public.outputs.registry }}
           REGISTRY_ALIAS: eksctl
@@ -41,7 +41,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.REGISTRY_ALIAS }}/${{ env.REPOSITORY }}
 
       - name: Build and push container image to ECR
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #5.0.0
         with:
           context: .
           push: true

diff --git a/.github/workflows/link-checker.yaml b/.github/workflows/link-checker.yaml
@@ -20,15 +20,15 @@ jobs:
       matrix:
         python-version: [3.9]
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 #v4.7.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
       - name: Install doc dependencies
         run: make install-site-deps
       - name: Build docs for link check

diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
           token: ${{ secrets.EKSCTLBOT_TOKEN }}
           fetch-depth: 0
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/

diff --git a/.github/workflows/publish-release-type.yaml b/.github/workflows/publish-release-type.yaml
@@ -28,9 +28,9 @@ jobs:
           echo "Available storage:"
           df -h
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
       - name: Setup deps
         run: |
           make install-build-deps

diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml
@@ -7,15 +7,15 @@ jobs:
   rc:
     name: Trigger release candidate build
     runs-on: ubuntu-latest
-    container: public.ecr.aws/eksctl/eksctl-build:3bc50a51eae54e2e768a06a6845de5da940549a4
+    container: public.ecr.aws/eksctl/eksctl-build:afe6db5efec79e26d6267f1e7b28ce4416644ca6
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
           token: ${{ secrets.EKSCTLBOT_TOKEN }}
           fetch-depth: 0
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/

diff --git a/.github/workflows/release-merge.yaml b/.github/workflows/release-merge.yaml
@@ -11,7 +11,7 @@ jobs:
     name: Merge release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
           fetch-depth: 0
       - name: Setup identity as eksctl-bot

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,15 +7,15 @@ jobs:
   rc:
     name: Trigger release build
     runs-on: ubuntu-latest
-    container: public.ecr.aws/eksctl/eksctl-build:3bc50a51eae54e2e768a06a6845de5da940549a4
+    container: public.ecr.aws/eksctl/eksctl-build:afe6db5efec79e26d6267f1e7b28ce4416644ca6
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
           token: ${{ secrets.EKSCTLBOT_TOKEN }}
           fetch-depth: 0
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/

diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
           fetch-depth: 0
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
       - name: Setup deps
         run: |
           make install-build-deps
@@ -38,11 +38,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
           fetch-depth: 0
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/
@@ -53,7 +53,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
       - name: Setup deps
         run: |
           make install-build-deps
@@ -65,11 +65,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
           fetch-depth: 0
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/
@@ -80,7 +80,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
         with:
-          go-version: 1.18.x
+          go-version: 1.20.x
       - name: Setup deps
         run: |
           make install-build-deps

diff --git a/.github/workflows/update-generated.yaml b/.github/workflows/update-generated.yaml
@@ -12,20 +12,21 @@ jobs:
   update_aws_node:
     name: Update aws-node and open PR
     runs-on: ubuntu-latest
-    container: public.ecr.aws/eksctl/eksctl-build:3bc50a51eae54e2e768a06a6845de5da940549a4
+    container: public.ecr.aws/eksctl/eksctl-build:afe6db5efec79e26d6267f1e7b28ce4416644ca6
     env:
       GOPRIVATE: ""
     steps:
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
         with:
+          token: ${{ secrets.EKSCTLBOT_TOKEN }}
           fetch-depth: 0
       - name: Setup identity as eksctl-bot
         uses: ./.github/actions/setup-identity
         with:
           token: "${{ secrets.EKSCTLBOT_TOKEN }}"
       - name: Cache go-build and mod
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: |
             ~/.cache/go-build/
@@ -50,7 +51,7 @@ jobs:
           git push --force-with-lease origin HEAD
       - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
         name: Open PR to ${{env.DEFAULT_BRANCH}}
-        if: ${{ steps.commit.outputs.changes }} == 'true'
+        if: steps.commit.outputs.changes == 'true'
         with:
           github-token: ${{ secrets.EKSCTLBOT_TOKEN }}
           script: |

diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,6 @@ dist/
 # Debug logs
 logs/*
 .DS_Store
+
+# Ignore social cards cache
+userdocs/.cache/*
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,6 @@
 # options for analysis running
 run:
-  go: '1.18'
+  go: '1.20'
 
   # default concurrency is a available CPU number
   concurrency: 4

diff --git a/.requirements b/.requirements
@@ -1,9 +1,9 @@
 github.com/maxbrunsfeld/counterfeiter/v6
-github.com/cloudflare/cfssl/cmd/cfssl@v1.5.0
-github.com/cloudflare/cfssl/cmd/cfssljson@v1.5.0
+github.com/cloudflare/cfssl/cmd/cfssl@v1.6.4
+github.com/cloudflare/cfssl/cmd/cfssljson@v1.6.4
 github.com/golangci/golangci-lint/cmd/golangci-lint
 github.com/goreleaser/goreleaser
-github.com/onsi/ginkgo/v2/[email protected].0
+github.com/onsi/ginkgo/v2/[email protected].1
 github.com/vektra/mockery/v2
 github.com/github-release/github-release
 golang.org/x/tools/cmd/stringer

diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
@@ -81,7 +81,6 @@ License version 2.0, we include the full text of the package's License below.
 * `github.com/vburenin/ifacemaker`
 * `github.com/vektra/mockery/v2`
 * `github.com/weaveworks/goformation/v4`
-* `github.com/weaveworks/launcher`
 * `github.com/weaveworks/schemer`
 * `github.com/xgfone/netaddr`
 * `golang.org/x/crypto`

diff --git a/COMMUNITY.md b/COMMUNITY.md
@@ -16,7 +16,7 @@ Ready to start contributing? Head over to our [contribution docs](CONTRIBUTING.m
 
 The core team of maintainers are Chetan Patwal ([@cPu1](https://github.com/cPu1)),
 Tiberiu Copaciu ([@TiberiuGC](https://github.com/TiberiuGC)),
-Amine Hilaly ([@A-Hilaly](https://github.com/a-hilaly)),
+Amine Hilaly ([@a-hilaly](https://github.com/a-hilaly)),
 Yu Xiang Zhang ([@yuxiang-zhang](https://github.com/yuxiang-zhang))
 and Himangini Daware ([@Himangini](https://github.com/Himangini)).
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:3bc50a51eae54e2e768a06a6845de5da940549a4
+ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:afe6db5efec79e26d6267f1e7b28ce4416644ca6
 FROM $BUILD_IMAGE as build
 
 WORKDIR /src

diff --git a/Makefile.docs b/Makefile.docs
@@ -7,6 +7,7 @@ userdocs/src/usage/schema.json: pkg/apis/eksctl.io/v1alpha5/assets/schema.json
 .PHONY: install-site-deps
 install-site-deps: ## Install dependencies for user docs
 	pip3 install -r userdocs/requirements.txt
+	sudo apt-get install libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev pngquant
 
 .PHONY: serve-pages
 serve-pages: ## Serve the site locally