.github/dependabot.yml

@@ -17,6 +17,9 @@ updates:
         update-types:
           - "minor"
           - "patch"
+    commit-message:
+      prefix: "chore"
+      include: "scope"
 
   - package-ecosystem: "github-actions"
     directory: "/"

.github/workflows/e2e.yaml

@@ -7,9 +7,12 @@ on:
   pull_request:
     branches:
       - main
-
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   e2e:
+    name: Run end-2-end Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/go.yml

@@ -5,10 +5,12 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
-  golangci:
-    name: lint
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -21,9 +23,10 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          skip-pkg-cache: true
+          skip-cache: true
 
-  build:
+  test:
+    name: Test Code
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -41,12 +44,8 @@ jobs:
         with:
           path-to-profile: cover.out
 
-      - name: Test GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          version: latest
-          args: --skip-publish --snapshot --rm-dist
   helm:
+    name: Test Helm Chart
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -73,3 +72,18 @@ jobs:
           sed -i '/!\[Version\:/d' helm/README.md.old
           diff helm/README.md.old helm/README.md
 
+  test-release:
+    name: Test Release
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
+
+      - name: Run GoReleaser
+        run: make test-release

.github/workflows/publish.yml

@@ -29,7 +29,7 @@ jobs:
           password: ${{ secrets.REGISTRY_PASSWORD }}
       - name: Build and push ${{github.event.release.tag_name }}
         id: docker_build_release
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: ${{ github.event.release.tag_name != '' }}
         with:
           push: true
@@ -40,7 +40,7 @@ jobs:
 
       - name: Build and push main
         id: docker_build_main
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: ${{ github.event.release.tag_name == '' }}
         with:
           push: true

.golangci.yaml

@@ -9,7 +9,6 @@ linters:
   - durationcheck
   - errcheck
   - errorlint
-  - exportloopref
   - gci
   - gofmt
   - gofumpt

.goreleaser.yml

@@ -6,7 +6,7 @@ builds:
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ .Tag }}-next"
+  version_template: "{{ .Tag }}-next"
 changelog:
   sort: asc
   filters:

.toolbox.mk

@@ -0,0 +1,102 @@
+## toolbox - start
+## Generated with https://github.com/bakito/toolbox
+
+## Current working directory
+TB_LOCALDIR ?= $(shell which cygpath > /dev/null 2>&1 && cygpath -m $$(pwd) || pwd)
+## Location to install dependencies to
+TB_LOCALBIN ?= $(TB_LOCALDIR)/bin
+$(TB_LOCALBIN):
+	mkdir -p $(TB_LOCALBIN)
+
+## Tool Binaries
+TB_CONTROLLER_GEN ?= $(TB_LOCALBIN)/controller-gen
+TB_DEEPCOPY_GEN ?= $(TB_LOCALBIN)/deepcopy-gen
+TB_GINKGO ?= $(TB_LOCALBIN)/ginkgo
+TB_GOFUMPT ?= $(TB_LOCALBIN)/gofumpt
+TB_GOLANGCI_LINT ?= $(TB_LOCALBIN)/golangci-lint
+TB_GOLINES ?= $(TB_LOCALBIN)/golines
+TB_GORELEASER ?= $(TB_LOCALBIN)/goreleaser
+TB_HELM_DOCS ?= $(TB_LOCALBIN)/helm-docs
+TB_MOCKGEN ?= $(TB_LOCALBIN)/mockgen
+TB_SEMVER ?= $(TB_LOCALBIN)/semver
+
+## Tool Versions
+TB_CONTROLLER_GEN_VERSION ?= v0.16.5
+TB_DEEPCOPY_GEN_VERSION ?= v0.32.0
+TB_GOFUMPT_VERSION ?= v0.7.0
+TB_GOLANGCI_LINT_VERSION ?= v1.62.2
+TB_GOLINES_VERSION ?= v0.12.2
+TB_GORELEASER_VERSION ?= v2.5.0
+TB_HELM_DOCS_VERSION ?= v1.14.2
+TB_SEMVER_VERSION ?= v1.1.3
+
+## Tool Installer
+.PHONY: tb.controller-gen
+tb.controller-gen: $(TB_CONTROLLER_GEN) ## Download controller-gen locally if necessary.
+$(TB_CONTROLLER_GEN): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/controller-gen || GOBIN=$(TB_LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(TB_CONTROLLER_GEN_VERSION)
+.PHONY: tb.deepcopy-gen
+tb.deepcopy-gen: $(TB_DEEPCOPY_GEN) ## Download deepcopy-gen locally if necessary.
+$(TB_DEEPCOPY_GEN): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/deepcopy-gen || GOBIN=$(TB_LOCALBIN) go install k8s.io/code-generator/cmd/deepcopy-gen@$(TB_DEEPCOPY_GEN_VERSION)
+.PHONY: tb.ginkgo
+tb.ginkgo: $(TB_GINKGO) ## Download ginkgo locally if necessary.
+$(TB_GINKGO): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/ginkgo || GOBIN=$(TB_LOCALBIN) go install github.com/onsi/ginkgo/v2/ginkgo
+.PHONY: tb.gofumpt
+tb.gofumpt: $(TB_GOFUMPT) ## Download gofumpt locally if necessary.
+$(TB_GOFUMPT): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/gofumpt || GOBIN=$(TB_LOCALBIN) go install mvdan.cc/gofumpt@$(TB_GOFUMPT_VERSION)
+.PHONY: tb.golangci-lint
+tb.golangci-lint: $(TB_GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
+$(TB_GOLANGCI_LINT): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/golangci-lint || GOBIN=$(TB_LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(TB_GOLANGCI_LINT_VERSION)
+.PHONY: tb.golines
+tb.golines: $(TB_GOLINES) ## Download golines locally if necessary.
+$(TB_GOLINES): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/golines || GOBIN=$(TB_LOCALBIN) go install github.com/segmentio/golines@$(TB_GOLINES_VERSION)
+.PHONY: tb.goreleaser
+tb.goreleaser: $(TB_GORELEASER) ## Download goreleaser locally if necessary.
+$(TB_GORELEASER): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/goreleaser || GOBIN=$(TB_LOCALBIN) go install github.com/goreleaser/goreleaser/v2@$(TB_GORELEASER_VERSION)
+.PHONY: tb.helm-docs
+tb.helm-docs: $(TB_HELM_DOCS) ## Download helm-docs locally if necessary.
+$(TB_HELM_DOCS): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/helm-docs || GOBIN=$(TB_LOCALBIN) go install github.com/norwoodj/helm-docs/cmd/helm-docs@$(TB_HELM_DOCS_VERSION)
+.PHONY: tb.mockgen
+tb.mockgen: $(TB_MOCKGEN) ## Download mockgen locally if necessary.
+$(TB_MOCKGEN): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/mockgen || GOBIN=$(TB_LOCALBIN) go install go.uber.org/mock/mockgen
+.PHONY: tb.semver
+tb.semver: $(TB_SEMVER) ## Download semver locally if necessary.
+$(TB_SEMVER): $(TB_LOCALBIN)
+	test -s $(TB_LOCALBIN)/semver || GOBIN=$(TB_LOCALBIN) go install github.com/bakito/semver@$(TB_SEMVER_VERSION)
+
+## Reset Tools
+.PHONY: tb.reset
+tb.reset:
+	@rm -f \
+		$(TB_LOCALBIN)/controller-gen \
+		$(TB_LOCALBIN)/deepcopy-gen \
+		$(TB_LOCALBIN)/ginkgo \
+		$(TB_LOCALBIN)/gofumpt \
+		$(TB_LOCALBIN)/golangci-lint \
+		$(TB_LOCALBIN)/golines \
+		$(TB_LOCALBIN)/goreleaser \
+		$(TB_LOCALBIN)/helm-docs \
+		$(TB_LOCALBIN)/mockgen \
+		$(TB_LOCALBIN)/semver
+
+## Update Tools
+.PHONY: tb.update
+tb.update: tb.reset
+	toolbox makefile -f $(TB_LOCALDIR)/Makefile \
+		sigs.k8s.io/controller-tools/cmd/controller-gen@github.com/kubernetes-sigs/controller-tools \
+		k8s.io/code-generator/cmd/deepcopy-gen@github.com/kubernetes/code-generator \
+		mvdan.cc/gofumpt@github.com/mvdan/gofumpt \
+		github.com/golangci/golangci-lint/cmd/golangci-lint \
+		github.com/segmentio/golines \
+		github.com/goreleaser/goreleaser/v2 \
+		github.com/norwoodj/helm-docs/cmd/helm-docs \
+		github.com/bakito/semver
+## toolbox - end

Dockerfile

@@ -1,14 +1,13 @@
-FROM golang:1.22-bullseye as builder
+FROM golang:1.24-alpine AS builder
 
 WORKDIR /build
 
-RUN apt-get update && apt-get install -y upx
+RUN apk update && apk add upx
 
 ARG VERSION=main
 ENV GO111MODULE=on \
     CGO_ENABLED=0 \
-    GOOS=linux \
-    GOARCH=amd64
+    GOOS=linux
 COPY . .
 
 RUN go build -a -installsuffix cgo -ldflags="-w -s -X github.com/bakito/k8s-event-logger-operator/version.Version=${VERSION}" -o k8s-event-logger && \