NE-1807: Rebase to v2.8.2

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.18-openshift-4.12
+  tag: rhel-8-release-golang-1.22-openshift-4.17

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,7 +7,7 @@
 <!--
 Please explain the changes you made here.
 
-Help your reviewers my guiding them through your key changes,
+Help your reviewers by guiding them through your key changes,
 implementation decisions etc.
 You can even include snippets of output or screenshots.
 

.github/dependabot.yml

@@ -0,0 +1,7 @@
+# See https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#package-ecosystem
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/deprecated-api-detect.yaml

@@ -0,0 +1,21 @@
+name: Deprecated API detect
+on:
+  push:
+    branches: [main]
+permissions:
+  contents: read
+jobs:
+  deprecated-apigroups:
+    name: Detect deprecated apiGroups
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: |
+          version=$(curl -sL https://api.github.com/repos/FairwindsOps/pluto/releases/latest | jq -r ".tag_name")
+          number=${version:1}
+          wget https://github.com/FairwindsOps/pluto/releases/download/${version}/pluto_${number}_linux_amd64.tar.gz
+          sudo tar -C /usr/local -xzf pluto_${number}_linux_amd64.tar.gz
+      - run: |
+          rm -rf docs/install
+          rm -rf config/samples
+          /usr/local/pluto detect-files -d .

.github/workflows/deps.yml

@@ -0,0 +1,48 @@
+name: "Dependency Review"
+on:
+  push:
+    branches:
+      - main
+      - 'release-*'
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      head_ref:
+        description: 'HEAD git reference (tag/branch/commit) to analyze'
+        required: true
+        default: 'main'
+        type: string
+      base_ref:
+        description: 'Base git reference (tag/branch/commit) to compare against head_ref'
+        required: true
+        default: 'main'
+        type: string
+permissions:
+  contents: read
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout Repository"
+        uses: actions/checkout@v4
+        with:
+          show-progress: false
+      - name: "Dependency Review"
+        uses: actions/dependency-review-action@v4
+        with:
+          base-ref: ${{ inputs.base_ref || github.event.pull_request.base.sha || 'main' }}
+          head-ref: ${{ inputs.head_ref || github.event.pull_request.head.sha || github.ref }}
+  govulncheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout Repository"
+        uses: actions/checkout@v4
+        with:
+          show-progress: false
+      - name: Setup Go Version
+        run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+      - id: govulncheck
+        uses: golang/govulncheck-action@v1
+        with:
+          go-version-input: ${{ env.GO_VERSION }}
+          go-version-file: go.mod

.github/workflows/tag-release.yml

@@ -0,0 +1,25 @@
+name: tag-release
+
+on:
+  push:
+    branches:
+      - main
+      - 'release-*'
+    paths:
+      - version.txt
+
+jobs:
+  tag-release:
+    if: ${{ github.repository == 'kubernetes-sigs/aws-load-balancer-controller' }}
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - run: /usr/bin/git config --global user.email [email protected]
+      - run: /usr/bin/git config --global user.name 'GitHub Actions Release Tagger'
+      - run: hack/tag-release.sh

.github/workflows/test.yaml

@@ -1,28 +1,37 @@
 name: Unit Test
 on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+  - push
+  - pull_request
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
+    - name: Setup Go Version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.15
- 
+        go-version: ${{ env.GO_VERSION }}
+
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
     - name: Run unit tests
       run: |
         sudo snap install yq
         make test
-        
+
     - name: Codecov
       uses: codecov/codecov-action@v1
       with:
         file: ./cover.out # optional
+
+  verify:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: make quick-ci
+        run: |
+          make quick-ci

.gitignore

@@ -23,3 +23,4 @@ site
 *.swp
 *.swo
 *~
+*.bak

.go-version

@@ -0,0 +1 @@
+1.22.5

.ko.yaml

@@ -0,0 +1,13 @@
+defaultBaseImage: public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2024-04-01-1711929684.2
+builds:
+- env:
+  - CGO_ENABLED=0
+  flags:
+  - -mod=readonly
+  ldflags:
+  - -s
+  - -w
+  - -X sigs.k8s.io/aws-load-balancer-controller/pkg/version.GitVersion={{.Env.GIT_VERSION}}
+  - -X sigs.k8s.io/aws-load-balancer-controller/pkg/version.GitCommit={{.Env.GIT_COMMIT}}
+  - -X sigs.k8s.io/aws-load-balancer-controller/pkg/version.BuildDate={{.Env.BUILD_DATE}}
+

CONTRIBUTING.md

@@ -7,8 +7,14 @@ _As contributors and maintainers of this project, and in the interest of fosteri
 ## Getting Started
 
 ### Building the project
-[Controller developement documentation](/docs/controller-devel.md) has instructions on how to build the project and project specific expectations.
+[Controller development documentation](/docs/controller-devel.md) has instructions on how to build the project and project specific expectations.
 
+### Contributing to docs
+
+The [documentation](https://kubernetes-sigs.github.io/aws-load-balancer-controller/latest/) is generated using [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/). In order to generate and preview docs locally, use the steps below -
+
+- Install [pipenv](https://pipenv.pypa.io/en/latest/install/#installing-pipenv)
+- run `make docs-preview`. This will generate and serve docs locally at http://127.0.0.1:8000
 
 ### Contributing
 We also have more documentation on how to get started contributing here:
@@ -23,5 +29,5 @@ We also have more documentation on how to get started contributing here:
 
 ## Contact Information
 
-- [Slack channel](https://kubernetes.slack.com/messages/sig-aws)
+- [Slack channel](https://kubernetes.slack.com/messages/provider-aws)
 - [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-aws)

Dockerfile

@@ -1,6 +1,8 @@
 # syntax=docker/dockerfile:experimental
+ARG BASE_IMAGE
+ARG BUILD_IMAGE
 
-FROM --platform=${TARGETPLATFORM} public.ecr.aws/docker/library/golang:1.18.6 AS base
+FROM --platform=${TARGETPLATFORM} $BUILD_IMAGE AS base
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
@@ -24,7 +26,7 @@ RUN --mount=type=bind,target=. \
     CGO_LDFLAGS="-Wl,-z,relro,-z,now" \
     go build -buildmode=pie -tags 'osusergo,netgo,static_build' -ldflags="-s -w -linkmode=external -extldflags '-static-pie' -X ${VERSION_PKG}.GitVersion=${GIT_VERSION} -X ${VERSION_PKG}.GitCommit=${GIT_COMMIT} -X ${VERSION_PKG}.BuildDate=${BUILD_DATE}" -mod=readonly -a -o /out/controller main.go
 
-FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2022-07-27-1658910674.2 as bin-unix
+FROM $BASE_IMAGE as bin-unix
 
 COPY --from=build /out/controller /controller
 ENTRYPOINT ["/controller"]

Dockerfile.openshift

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 AS builder
 
 WORKDIR /opt/app-root/src
 

Makefile

@@ -2,7 +2,16 @@
 MAKEFILE_PATH = $(dir $(realpath -s $(firstword $(MAKEFILE_LIST))))
 
 # Image URL to use all building/pushing image targets
-IMG ?= amazon/aws-alb-ingress-controller:v2.4.4
+IMG ?= public.ecr.aws/eks/aws-load-balancer-controller:v2.8.2
+# Image URL to use for builder stage in Docker build
+GOLANG_VERSION ?= $(shell cat .go-version)
+BUILD_IMAGE ?= public.ecr.aws/docker/library/golang:$(GOLANG_VERSION)
+# Image URL to use for base layer in Docker build
+BASE_IMAGE ?= public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2024-04-01-1711929684.2
+IMG_PLATFORM ?= linux/amd64,linux/arm64
+# ECR doesn't appear to support SPDX SBOM
+IMG_SBOM ?= none
+
 
 CRD_OPTIONS ?= "crd:crdVersions=v1"
 
@@ -16,6 +25,9 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
+export GOSUMDB = sum.golang.org
+export GOTOOLCHAIN = go$(GOLANG_VERSION)
+
 all: controller
 
 # Run tests
@@ -64,8 +76,10 @@ helm-lint:
 	${MAKEFILE_PATH}/test/helm/helm-lint.sh
 
 # Generate code
-generate: aws-sdk-model-override controller-gen
+.PHONY: generate
+generate: aws-sdk-model-override controller-gen mockgen
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	MOCKGEN=$(MOCKGEN) ./scripts/gen_mocks.sh
 
 aws-sdk-model-override:
 	@if [ "$(AWS_SDK_MODEL_OVERRIDE)" = "y" ] ; then \
@@ -74,13 +88,25 @@ aws-sdk-model-override:
 		./scripts/aws_sdk_model_override/cleanup.sh ; \
 	fi
 
+.PHONY: docker-push
+docker-push: aws-load-balancer-controller-push
 
-# Push the docker image
-docker-push:
+.PHONY: aws-load-balancer-controller-push
+aws-load-balancer-controller-push: ko
+	KO_DOCKER_REPO=$(firstword $(subst :, ,${IMG})) \
+    GIT_VERSION=$(shell git describe --tags --dirty --always) \
+    GIT_COMMIT=$(shell git rev-parse HEAD)  \
+    BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%S%z) \
+    ko build --tags $(word 2,$(subst :, ,${IMG})) --platform=${IMG_PLATFORM} --bare --sbom ${IMG_SBOM} .
+
+# Push the docker image using docker buildx
+docker-push-w-buildx:
 	docker buildx build . --target bin \
         		--tag $(IMG) \
-        		--push \
-        		--platform linux/amd64,linux/arm64
+				--build-arg BASE_IMAGE=$(BASE_IMAGE) \
+				--build-arg BUILD_IMAGE=$(BUILD_IMAGE) \
+				--push \
+        		--platform ${IMG_PLATFORM}
 
 # find or download controller-gen
 # download controller-gen if necessary
@@ -91,14 +117,32 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)
 endif
 
+# find or download mockgen
+# download mockgen if necessary
+.PHONY: mockgen
+mockgen:
+ifeq (, $(shell which mockgen))
+	@{ \
+	set -e ;\
+	MOCKGEN_TMP_DIR=$$(mktemp -d) ;\
+	cd $$MOCKGEN_TMP_DIR ;\
+	go mod init tmp ;\
+	go install github.com/golang/mock/[email protected] ;\
+	rm -rf $$MOCKGEN_TMP_DIR ;\
+	}
+MOCKGEN=$(GOBIN)/mockgen
+else
+MOCKGEN=$(shell which mockgen)
+endif
+
 # install kustomize if not found
 kustomize:
 ifeq (, $(shell which kustomize))
@@ -115,13 +159,17 @@ else
 KUSTOMIZE=$(shell which kustomize)
 endif
 
+.PHONY: ko
+ko:
+	hack/install-ko.sh
+
 # preview docs
 docs-preview: docs-dependencies
 	pipenv run mkdocs serve
 
 # publish the versioned docs using mkdocs mike util
 docs-publish: docs-dependencies
-	pipenv run mike deploy v2.4 latest -p --update-aliases
+	pipenv run mike deploy v2.8 latest -p --update-aliases
 
 # install dependencies needed to preview and publish docs
 docs-dependencies:
@@ -130,6 +178,22 @@ docs-dependencies:
 lint:
 	echo "TODO"
 
+.PHONY: quick-ci
+quick-ci: verify-versions verify-generate verify-crds
+	echo "Done!"
+
+.PHONY: verify-generate
+verify-generate:
+	hack/verify-generate.sh
+
+.PHONY: verify-crds
+verify-crds:
+	hack/verify-crds.sh
+
+.PHONY: verify-versions
+verify-versions:
+	hack/verify-versions.sh
+
 unit-test:
 	./scripts/ci_unit_test.sh