Fully remove intermediate eksctl build image (#8341)

Author: cheeseandcereal

.dockerignore

@@ -3,6 +3,7 @@
 !.goreleaser*
 !.golangci*
 !.mockery.yaml
+!.requirements
 !build/scripts
 !cmd
 !examples

.github/workflows/ecr-publish-build.yaml

@@ -35,15 +35,3 @@ jobs:
         run: make check-schema
       - name: Lint
         run: make lint
-  image:
-    name: Build and check image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
-        with:
-          fetch-depth: 0
-      - name: Setup build environment
-        uses: ./.github/actions/setup-build
-      - name: build
-        run: make -f Makefile.docker check-build-image-manifest-up-to-date

.github/workflows/test-and-build.yaml

@@ -2,7 +2,7 @@ github.com/maxbrunsfeld/counterfeiter/v6
 github.com/cloudflare/cfssl/cmd/[email protected]
 github.com/cloudflare/cfssl/cmd/[email protected]
 github.com/golangci/golangci-lint/cmd/golangci-lint
-github.com/onsi/ginkgo/v2/ginkgo@v2.22.2
+github.com/onsi/ginkgo/v2/ginkgo
 github.com/vektra/mockery/v2
 github.com/github-release/github-release
 k8s.io/code-generator/cmd/client-gen

.requirements

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM public.ecr.aws/docker/library/golang:1.24.0 AS builder
+FROM public.ecr.aws/docker/library/golang:1.24.2 AS builder
 
 WORKDIR /src
 COPY . .
@@ -14,6 +14,6 @@ RUN <<EOT
     chown 65532 eksctl
 EOT
 
-FROM public.ecr.aws/eks-distro/kubernetes/go-runner:v0.16.4-eks-1-32-6 AS go-runner
+FROM public.ecr.aws/eks-distro/kubernetes/go-runner:v0.18.0-eks-1-32-10 AS go-runner
 COPY --from=builder /src/eksctl /eksctl
 ENTRYPOINT ["/eksctl"]

Dockerfile

@@ -4,17 +4,6 @@ export PATH := ./build/scripts:$(PATH)
 
 image_manifest_file = build/docker/build_image_manifest
 
-# We use git object hashes for determining the input files used for any given build image
-# E.g. given `public.ecr.aws/eksctl/eksctl-build:d94225a6dbb6dfab6dd185442ae554432f9365dc` one can
-# run `git show d94225a6dbb6dfab6dd185442ae554432f9365dc` to get contents of `.build_image_manifest`,
-# and `git show <hash>` for each of the hashes in the manifest to determine contents of each of the
-# files used in `$(build_image_input)` at the time.
-build_image_tag_file = build/docker/image_tag
-build_image_tag = $(shell cat $(build_image_tag_file))
-
-build_image = public.ecr.aws/eksctl/eksctl-build
-build_image_name = $(build_image):$(build_image_tag)
-
 eksctl_image = public.ecr.aws/eksctl/eksctl
 eksctl_image_name = "$(eksctl_image):$${EKSCTL_IMAGE_VERSION}"
 
@@ -33,55 +22,12 @@ endif
 authenticate-ecr-for-docker: ## Get ECR public registry credentials with AWS credentials
 	aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
 
-.PHONY: update-build-image-tag
-update-build-image-tag: ## Update the build image tag as referenced across the repo
-	build-image-manifest.sh > $(image_manifest_file)
-	git hash-object $(image_manifest_file) > $(build_image_tag_file)
-	sed $(sedi) -e "1s|\(BUILD_IMAGE=\).*|\1$(build_image):$$(cat $(build_image_tag_file))|" Dockerfile
-	find .github/workflows -type f | xargs sed $(sedi) -e "s|\($(build_image):\).*|\1$$(cat $(build_image_tag_file))|"
-
-.PHONY: check-build-image-manifest-up-to-date
-check-build-image-manifest-up-to-date: update-build-image-tag ## Update build image manifest and commits the changes
-	git diff --quiet -- $(image_manifest_file) \
-	  || (git --no-pager diff $(image_manifest_file); echo "HINT: to fix this, run 'make -f Makefile.docker update-build-image-tag' then 'commit-new-image-tag'"; exit 1)
-
-.PHONY: commit-new-image-tag
-commit-new-image-tag:  ## Update build image manifest and commits the changes
-	git add -u
-	git commit --message 'Update build image manifest, tag file and workflows'
-	@echo "Remember to run \"Publish ECR eksctl-build image\" GitHub workflow after merging these image tag changes"
-
-.PHONY: build-image
-build-image: check-build-image-manifest-up-to-date ## Build the build image that has all of external dependencies
-	-docker pull $(build_image_name)
-	cp .requirements build/scripts/install-build-deps.sh go.mod go.sum build/docker/
-	$(docker_build) \
-	  --cache-from=$(build_image_name) \
-	  --tag=$(build_image_name) \
-	  build/docker/
-
-.PHONY: push-build-image
-push-build-image: authenticate-ecr-for-docker build-image  ## Push the build image to the ECR public registry
-	docker push $(build_image_name)
-	@echo "Remember to commit the image_tag and build_image_manifest files"
-
 .PHONY: eksctl-image
 eksctl-image: ## Build the eksctl image that has release artefacts and no build dependencies
-	docker pull $(build_image_name)
 	$(docker_build) \
-	  --cache-from=$(build_image_name) \
 	  --tag=$(eksctl_image_name) \
-	  --build-arg=BUILD_IMAGE=$(build_image_name) \
 	  $(git_toplevel)
 
 .PHONY: eksctl-image
 push-eksctl-image: eksctl-image ## Push the eksctl image to the ECR public registry
 	docker push $(eksctl_image_name)
-
-.PHONY: build-test
-build-test: ## Run targets from Makefile using the build image
-	time docker run \
-	  --tty \
-	  --rm \
-	  --volume=$(git_toplevel):/src \
-	    $(build_image_name) make $@