Merge main into ipv6

.github/workflows/ci.yaml

@@ -10,7 +10,7 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:a6c29f81a85a7f438c60686b01d74bec7b0dfb82
+    container: weaveworks/eksctl-build:3007a819ae8c7ed967da6512c24c45407dd27358
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/release-candidate.yaml

@@ -1,39 +1,14 @@
 name: Release candidate
 
 on:
-  workflow_dispatch:
-    inputs:
-      skipIntegrationTests:
-        description: 'Skip check for successful integration tests:'
-        default: 'false'
+  workflow_dispatch: {}
 
 jobs:
   rc:
     name: Trigger release candidate build
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:a6c29f81a85a7f438c60686b01d74bec7b0dfb82
+    container: weaveworks/eksctl-build:3007a819ae8c7ed967da6512c24c45407dd27358
     steps:
-      - uses: actions/github-script@v3
-        name: Get integration tests status
-        id: it-status
-        with:
-          github-token: ${{ secrets.WEAVEWORKSBOT_TOKEN }}
-          script: |
-            // There's no other way to identify the integration test job
-            // GH branch protections are also just a string
-            // must be in sync with integration-tests.yaml
-            const integrationTestsCheckName = "Run integration tests";
-            const { data } = await github.checks.listForRef({
-              ...context.repo,
-              ref: "${{ github.sha }}",
-              check_name: integrationTestsCheckName,
-            });
-            return data.check_runs.some(cr =>
-              cr.status === "completed" && cr.conclusion === "success"
-            );
-      - name: Fail if integration tests not passed
-        if: "!fromJson(steps.it-status.outputs.result) && !fromJson(github.event.inputs.skipIntegrationTests)"
-        run: echo "Integration tests haven't passed yet!" && exit 1
       - name: Checkout
         uses: actions/checkout@v2
         with:

.github/workflows/release.yaml

@@ -7,7 +7,7 @@ jobs:
   rc:
     name: Trigger release build
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:a6c29f81a85a7f438c60686b01d74bec7b0dfb82
+    container: weaveworks/eksctl-build:3007a819ae8c7ed967da6512c24c45407dd27358
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/tag-release.yaml

@@ -18,7 +18,7 @@ jobs:
     name: Tag release from version
     environment: release
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:a6c29f81a85a7f438c60686b01d74bec7b0dfb82
+    container: weaveworks/eksctl-build:3007a819ae8c7ed967da6512c24c45407dd27358
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/update-generated.yaml

@@ -55,7 +55,7 @@ jobs:
   update_aws_node:
     name: Update aws-node and open PR
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:a6c29f81a85a7f438c60686b01d74bec7b0dfb82
+    container: weaveworks/eksctl-build:3007a819ae8c7ed967da6512c24c45407dd27358
     env:
       UPDATE_BRANCH: update-aws-node
       GOPRIVATE: ""

.golangci.yml

@@ -77,9 +77,30 @@ linters-settings:
     #  2. you use go >= 1.10
     #  3. you do repeated runs (false for CI) or cache $GOPATH/pkg or `go env GOCACHE` dir in CI.
     use-installed-packages: false
-  golint:
-    # minimal confidence for issues, default is 0.8
-    min-confidence: 0.8
+  revive:
+    confidence: 0.8
+    severity: warning
+    errorCode: 0
+    warningCode: 0
+    rules:
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: exported
+      - name: if-return
+      - name: increment-decrement
+      - name: var-naming
+      - name: var-declaration
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
     simplify: false
@@ -157,7 +178,7 @@ linters:
     - errcheck
     - gofmt
     - goimports
-    - golint
+    - revive
     - gosimple
     - govet
     - ineffassign

.requirements

@@ -3,7 +3,6 @@ github.com/cloudflare/cfssl/cmd/cfssl@v1.5.0
 github.com/cloudflare/cfssl/cmd/cfssljson@v1.5.0
 github.com/golangci/golangci-lint/cmd/golangci-lint
 github.com/goreleaser/goreleaser
-github.com/kevinburke/go-bindata/go-bindata
 github.com/onsi/ginkgo/ginkgo@v1.16.4
 github.com/vektra/mockery/cmd/mockery
 github.com/github-release/github-release

Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_IMAGE=/weaveworks/eksctl-build:a6c29f81a85a7f438c60686b01d74bec7b0dfb82
+ARG BUILD_IMAGE=/weaveworks/eksctl-build:3007a819ae8c7ed967da6512c24c45407dd27358
 FROM $BUILD_IMAGE as build
 
 WORKDIR /src

Makefile

@@ -16,16 +16,8 @@ generated_code_deep_copy_helper := pkg/apis/eksctl.io/v1alpha5/zz_generated.deep
 generated_code_aws_sdk_mocks := $(wildcard pkg/eks/mocks/*API.go)
 
 conditionally_generated_files := \
-  userdocs/src/usage/schema.json \
   $(generated_code_deep_copy_helper) $(generated_code_aws_sdk_mocks)
 
-all_generated_files := \
-  pkg/nodebootstrap/bindata/assets.go \
-  pkg/addons/default/assets.go \
-  pkg/addons/assets.go \
-  pkg/apis/eksctl.io/v1alpha5 \
-  $(conditionally_generated_files)
-
 .DEFAULT_GOAL := help
 
 ##@ Utility
@@ -168,17 +160,10 @@ delete-integration-test-dev-cluster: build ## Delete the test cluster for use wh
 
 ##@ Code Generation
 
-## Important: pkg/addons/default/generate.go depends on pkg/addons/default/assets/aws-node.yaml If this file is
-## not present, the generation of assets will not fail but will not contain it.
 .PHONY: generate-always
 generate-always: pkg/addons/default/assets/aws-node.yaml ## Generate code (required for every build)
-	@# go-bindata targets must run every time, as dependencies are too complex to declare in make:
-	@# - deleting an asset is breaks the dependencies
-	@# - different version of go-bindata generate different code
-	@go-bindata -v
 	go generate ./pkg/apis/eksctl.io/v1alpha5/generate.go
 	go generate ./pkg/nodebootstrap
-	go generate ./pkg/addons/default/generate.go
 	go generate ./pkg/addons
 	go generate ./pkg/authconfigmap
 	go generate ./pkg/eks
@@ -193,7 +178,7 @@ generate-all: generate-always $(conditionally_generated_files) ## Re-generate al
 
 .PHONY: check-all-generated-files-up-to-date
 check-all-generated-files-up-to-date: generate-all ## Run the generate all command and verify there is no new diff
-	git diff --quiet -- $(all_generated_files) || (git --no-pager diff $(all_generated_files); echo "HINT: to fix this, run 'git commit $(all_generated_files) --message \"Update generated files\"'"; exit 1)
+	git diff --quiet -- $(conditionally_generated_files) || (git --no-pager diff $(conditionally_generated_files); echo "HINT: to fix this, run 'git commit $(conditionally_generated_files) --message \"Update generated files\"'"; exit 1)
 
 ### Update maxpods.go from AWS
 .PHONY: update-maxpods
@@ -207,7 +192,6 @@ pkg/addons/default/assets/aws-node.yaml:
 .PHONY: update-aws-node
 update-aws-node: ## Re-download the aws-node manifests from AWS
 	go generate ./pkg/addons/default/aws_node_generate.go
-	go generate ./pkg/addons/default/generate.go
 
 deep_copy_helper_input = $(shell $(call godeps_cmd,./pkg/apis/...) | sed 's|$(generated_code_deep_copy_helper)||' )
 $(generated_code_deep_copy_helper): $(deep_copy_helper_input) ## Generate Kubernetes API helpers

build/docker/build_image_manifest

@@ -2,8 +2,7 @@
 "github.com/cloudflare/cfssl v1.6.1"
 "github.com/cloudflare/cfssl v1.6.1"
 "github.com/golangci/golangci-lint v1.42.0"
-"github.com/goreleaser/goreleaser v0.177.0"
-"github.com/kevinburke/go-bindata v3.22.0+incompatible"
+"github.com/goreleaser/goreleaser v1.0.0"
 "github.com/onsi/ginkgo v1.16.4"
 "github.com/vektra/mockery v1.1.2"
 "github.com/github-release/github-release v0.10.0"
@@ -15,5 +14,5 @@
 "k8s.io/code-generator v0.21.2"
 "sigs.k8s.io/mdtoc v1.0.1"
 100644 blob a73dcb54fd6215c023ffea7f781e313b41841135	build/docker/Dockerfile
-100644 blob e02e5f2ad4516bd586dd870006e14a8a5a168093	.requirements
+100644 blob 5683496f7ee0443658a663785d87e404096459d6	.requirements
 100755 blob c1129ff1ff85ac2c53f908a577675ea59a9325a7	build/scripts/install-build-deps.sh

build/docker/image_tag

@@ -1 +1 @@
-a6c29f81a85a7f438c60686b01d74bec7b0dfb82
+3007a819ae8c7ed967da6512c24c45407dd27358

cmd/eksctl/main.go

@@ -18,7 +18,6 @@ import (
 	"github.com/weaveworks/eksctl/pkg/ctl/disassociate"
 	"github.com/weaveworks/eksctl/pkg/ctl/drain"
 	"github.com/weaveworks/eksctl/pkg/ctl/enable"
-	"github.com/weaveworks/eksctl/pkg/ctl/generate"
 	"github.com/weaveworks/eksctl/pkg/ctl/get"
 	"github.com/weaveworks/eksctl/pkg/ctl/scale"
 	"github.com/weaveworks/eksctl/pkg/ctl/set"
@@ -40,7 +39,6 @@ func addCommands(rootCmd *cobra.Command, flagGrouping *cmdutils.FlagGrouping) {
 	rootCmd.AddCommand(unset.Command(flagGrouping))
 	rootCmd.AddCommand(scale.Command(flagGrouping))
 	rootCmd.AddCommand(drain.Command(flagGrouping))
-	rootCmd.AddCommand(generate.Command(flagGrouping))
 	rootCmd.AddCommand(enable.Command(flagGrouping))
 	rootCmd.AddCommand(register.Command(flagGrouping))
 	rootCmd.AddCommand(deregister.Command(flagGrouping))

cmd/schema/generate.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -48,7 +47,7 @@ func main() {
 		panic(err)
 	}
 	fmt.Println("Writing docs schema to " + outputFile)
-	if err := ioutil.WriteFile(outputFile, bytes, 0755); err != nil {
+	if err := os.WriteFile(outputFile, bytes, 0755); err != nil {
 		panic(err)
 	}
 }