eksctl-io · aclevername · Oct 28, 2021 · Oct 26, 2021 · Oct 26, 2021 · Oct 27, 2021
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:ff2eff428ff2b334c713fd07916a10db37f60d29
+    container: weaveworks/eksctl-build:83999a3391d78ed18a2e6093328d1122c927956f
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
@@ -10,7 +10,7 @@ jobs:
     name: Run integration tests
     environment: "Integration tests"
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:ff2eff428ff2b334c713fd07916a10db37f60d29
+    container: weaveworks/eksctl-build:83999a3391d78ed18a2e6093328d1122c927956f
     env:
       SSH: "/root/.ssh"
     steps:

diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml
@@ -11,7 +11,7 @@ jobs:
   rc:
     name: Trigger release candidate build
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:ff2eff428ff2b334c713fd07916a10db37f60d29
+    container: weaveworks/eksctl-build:83999a3391d78ed18a2e6093328d1122c927956f
     steps:
       - uses: actions/github-script@v3
         name: Get integration tests status

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,7 +7,7 @@ jobs:
   rc:
     name: Trigger release build
     runs-on: ubuntu-latest
-    container: weaveworks/eksctl-build:ff2eff428ff2b334c713fd07916a10db37f60d29
+    container: weaveworks/eksctl-build:83999a3391d78ed18a2e6093328d1122c927956f
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/tag-release.yaml b/.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:ff2eff428ff2b334c713fd07916a10db37f60d29
+    container: weaveworks/eksctl-build:83999a3391d78ed18a2e6093328d1122c927956f
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/update-generated.yaml b/.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:ff2eff428ff2b334c713fd07916a10db37f60d29
+    container: weaveworks/eksctl-build:83999a3391d78ed18a2e6093328d1122c927956f
     env:
       UPDATE_BRANCH: update-aws-node
       GOPRIVATE: ""

diff --git a/.requirements b/.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

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_IMAGE=/weaveworks/eksctl-build:ff2eff428ff2b334c713fd07916a10db37f60d29
+ARG BUILD_IMAGE=/weaveworks/eksctl-build:83999a3391d78ed18a2e6093328d1122c927956f
 FROM $BUILD_IMAGE as build
 
 WORKDIR /src

diff --git a/Makefile b/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
@@ -172,10 +164,6 @@ delete-integration-test-dev-cluster: build ## Delete the test cluster for use wh
 ## 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
@@ -193,7 +181,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

diff --git a/build/docker/build_image_manifest b/build/docker/build_image_manifest
@@ -3,7 +3,6 @@
 "github.com/cloudflare/cfssl v1.6.1"
 "github.com/golangci/golangci-lint v1.42.0"
 "github.com/goreleaser/goreleaser v0.182.1"
-"github.com/kevinburke/go-bindata v3.22.0+incompatible"
 "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
diff --git a/build/docker/image_tag b/build/docker/image_tag
@@ -1 +1 @@
-ff2eff428ff2b334c713fd07916a10db37f60d29
+83999a3391d78ed18a2e6093328d1122c927956f
diff --git a/go.mod b/go.mod
@@ -185,7 +185,6 @@ require (
 	github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d // indirect
 	github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20200904152830-b575325c1855
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/kevinburke/go-bindata v3.22.0+incompatible
 	github.com/kevinburke/rest v0.0.0-20210106114233-22cd0577e450 // indirect
 	github.com/kevinburke/ssh_config v1.1.0 // indirect
 	github.com/kisielk/errcheck v1.6.0 // indirect

diff --git a/go.sum b/go.sum
@@ -1132,8 +1132,6 @@ github.com/k0kubun/pp v2.3.0+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3t
 github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/kevinburke/go-bindata v3.22.0+incompatible h1:/JmqEhIWQ7GRScV0WjX/0tqBrC5D21ALg0H0U/KZ/ts=
-github.com/kevinburke/go-bindata v3.22.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM=
 github.com/kevinburke/rest v0.0.0-20210106114233-22cd0577e450 h1:Lr2sEj5wWzk82b/L8LsLzsCxywQaOpcr0ti/qcfzCOk=
 github.com/kevinburke/rest v0.0.0-20210106114233-22cd0577e450/go.mod h1:pD+iEcdAGVXld5foVN4e24zb/6fnb60tgZPZ3P/3T/I=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ff2eff428ff2b334c713fd07916a10db37f60d29
		83999a3391d78ed18a2e6093328d1122c927956f