Automated cherry pick of #205: Bump dependencies to v1.21.0 #308: Add tagging controller configuration #317: Fix version #334: Stop retrying failed workitem after a certain amount of

.gitignore

@@ -2,7 +2,8 @@
 /ecr-credential-provider
 /cloudconfig
 
-.vscode/
-
 docs/book/_book/
 site/
+.vscode/
+e2e.test
+.idea/

Dockerfile

@@ -14,41 +14,43 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.15.3
+ARG GOLANG_IMAGE=golang:1.18.1
 
 # The distroless image on which the CPI manager image is built.
 #
 # Please do not use "latest". Explicit tags should be used to provide
-# deterministic builds. This image doesn't have semantic version tags, but
-# the fully-qualified image can be obtained by entering
-# "gcr.io/distroless/static:latest" in a browser and then copying the
-# fully-qualified image from the web page.
-ARG DISTROLESS_IMAGE=gcr.io/distroless/static@sha256:c6d5981545ce1406d33e61434c61e9452dad93ecd8397c41e89036ef977a88f4
+# deterministic builds. Follow what kubernetes uses to build
+# kube-controller-manager, for example for 1.23.x:
+# https://github.com/kubernetes/kubernetes/blob/release-1.24/build/common.sh#L94
+ARG DISTROLESS_IMAGE=k8s.gcr.io/build-image/go-runner:v2.3.1-go1.18.1-bullseye.0
 
 ################################################################################
 ##                              BUILD STAGE                                   ##
 ################################################################################
 # Build the manager as a statically compiled binary so it has no dependencies
 # libc, muscl, etc.
-FROM ${GOLANG_IMAGE} as builder
+FROM --platform=linux/amd64 ${GOLANG_IMAGE} as builder
 
-ARG VERSION
 ARG GOPROXY=https://goproxy.io,direct
-ARG GOOS=linux
+ARG TARGETOS
+ARG TARGETARCH
+ARG VERSION
 
 WORKDIR /build
 COPY go.mod go.sum ./
 COPY cmd/ cmd/
 COPY pkg/ pkg/
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
-		-ldflags="-w -s -X 'main.version=${VERSION}'" \
+RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=${GOPROXY} \
+		go build \
+		-trimpath \
+		-ldflags="-w -s -X k8s.io/component-base/version.gitVersion=${VERSION}" \
 		-o=aws-cloud-controller-manager \
 		cmd/aws-cloud-controller-manager/main.go
 
 ################################################################################
 ##                               MAIN STAGE                                   ##
 ################################################################################
 # Copy the manager into the distroless image.
-FROM ${DISTROLESS_IMAGE}
+FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}
 COPY --from=builder /build/aws-cloud-controller-manager /bin/aws-cloud-controller-manager
 ENTRYPOINT [ "/bin/aws-cloud-controller-manager" ]

Makefile

@@ -13,33 +13,70 @@
 # limitations under the License.
 #
 
+.EXPORT_ALL_VARIABLES:
+
+SHELL := /bin/bash
 SOURCES := $(shell find . -name '*.go')
 GOOS ?= $(shell go env GOOS)
+GOARCH ?= $(shell go env GOARCH)
 GOPROXY ?= $(shell go env GOPROXY)
-GIT_VERSION := $(shell git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
+GIT_VERSION := $(shell git describe --dirty --tags --match='v*')
 VERSION ?= $(GIT_VERSION)
-IMAGE := amazon/cloud-controller-manager:$(VERSION)
+IMAGE ?= amazon/cloud-controller-manager:$(VERSION)
+OUTPUT ?= $(shell pwd)/_output
+INSTALL_PATH ?= $(OUTPUT)/bin
+LDFLAGS ?= -w -s -X k8s.io/component-base/version.gitVersion=$(VERSION)
 
 aws-cloud-controller-manager: $(SOURCES)
-	 GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOPROXY=$(GOPROXY) go build \
-		-ldflags="-w -s -X 'main.version=$(VERSION)'" \
+	 GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) GOPROXY=$(GOPROXY) go build \
+		-trimpath \
+		-ldflags="$(LDFLAGS)" \
 		-o=aws-cloud-controller-manager \
 		cmd/aws-cloud-controller-manager/main.go
 
-ecr-credential-provider:  $(shell find ./cmd/ecr-credential-provider -name '*.go')
-	 GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOPROXY=$(GOPROXY) go build \
-		-ldflags="-w -s -X 'main.version=$(VERSION)'" \
+ecr-credential-provider: $(shell find ./cmd/ecr-credential-provider -name '*.go')
+	 GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) GOPROXY=$(GOPROXY) go build \
+		-trimpath \
+		-ldflags="$(LDFLAGS)" \
 		-o=ecr-credential-provider \
 		cmd/ecr-credential-provider/*.go
 
+ecr-credential-provider.exe: $(wildcard ./cmd/ecr-credential-provider/*.go)
+	 GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOPROXY=$(GOPROXY) go build \
+		-trimpath \
+		-ldflags="$(LDFLAGS)" \
+		-o=ecr-credential-provider.exe \
+		cmd/ecr-credential-provider/*.go
+
+.PHONY: docker-build-amd64
+docker-build-amd64:
+	docker buildx build --output=type=docker \
+		--build-arg VERSION=$(VERSION) \
+		--build-arg GOPROXY=$(GOPROXY) \
+		--platform linux/amd64 \
+		--tag $(IMAGE) .
+
+.PHONY: docker-build-arm64
+docker-build-arm64:
+	docker buildx build --output=type=docker \
+		--build-arg VERSION=$(VERSION) \
+		--build-arg GOPROXY=$(GOPROXY) \
+		--platform linux/arm64 \
+		--tag $(IMAGE) .
+
 .PHONY: docker-build
 docker-build:
-	docker build \
-		--build-arg VERSION=$(VERSION) \
-		--build-arg GOOS=$(GOOS) \
+	docker buildx build --output=type=registry \
+		--build-arg LDFLAGS=$(LDFLAGS) \
 		--build-arg GOPROXY=$(GOPROXY) \
+		--platform linux/amd64,linux/arm64 \
 		--tag $(IMAGE) .
 
+e2e.test:
+	pushd tests/e2e > /dev/null && \
+		go test -c && popd
+	mv tests/e2e/e2e.test e2e.test
+
 .PHONY: check
 check: verify-fmt verify-lint vet
 
@@ -53,7 +90,7 @@ verify-fmt:
 
 .PHONY: verify-lint
 verify-lint:
-	which golint 2>&1 >/dev/null || go get golang.org/x/lint/golint
+	which golint 2>&1 >/dev/null || go install golang.org/x/lint/golint@latest
 	golint -set_exit_status $(shell go list ./...)
 
 .PHONY: verify-codegen
@@ -75,3 +112,30 @@ docs:
 .PHONY: publish-docs
 publish-docs:
 	./hack/publish-docs.sh
+
+.PHONY: kops-example
+kops-example:
+	./hack/kops-example.sh
+
+.PHONY: test-e2e
+test-e2e: e2e.test docker-build-amd64 install-e2e-tools
+	AWS_REGION=us-west-2 \
+	TEST_PATH=./tests/e2e/... \
+	BUILD_IMAGE=$(IMAGE) \
+	BUILD_VERSION=$(VERSION) \
+	INSTALL_PATH=$(INSTALL_PATH) \
+	GINKGO_FOCUS="\[cloud-provider-aws-e2e\]" \
+	./hack/e2e/run.sh
+
+# Use `make install-e2e-tools KOPS_ROOT=<local-kops-installation>`
+# to skip the kops download, test local changes to the kubetest2-kops
+# deployer, etc.
+.PHONY: install-e2e-tools
+install-e2e-tools:
+	mkdir -p $(INSTALL_PATH)
+	INSTALL_PATH=$(INSTALL_PATH) \
+	./hack/install-e2e-tools.sh
+
+.PHONY: print-image-tag
+print-image-tag:
+	@echo $(IMAGE)