Merge branch 'main' into chore/allow-easier-nap-agent-updates

Author: AlexFenlon

.github/dependabot.yml

@@ -29,7 +29,7 @@ documentation:
   - head-branch: ['^docs?/']
 
 dependencies:
-  - head-branch: ['^deps?/', '^dependabot/', '^renovate/', 'pre-commit-ci-update-config']
+  - head-branch: ['^deps?/', '^dependabot/', '^renovate/', '^mend/', 'pre-commit-ci-update-config']
 
 helm_chart:
   - head-branch: ['^helm/', '^chart/']

.github/labeler.yml

@@ -6,8 +6,12 @@ set -eo pipefail
 export ROOTDIR=$(git rev-parse --show-toplevel || echo ".")
 
 SKOPEO_BIN=skopeo
+
 if [ -n "$CI" ]; then
-    SKOPEO_BIN="docker run --rm -v $HOME/.docker/config.json:/tmp/auth.json $(grep skopeo "${ROOTDIR}/tests/Dockerfile" | grep FROM | cut -d ' ' -f 2)"
+    SKOPEO_IMAGE=quay.io/skopeo/stable
+    # renovate: datasource=docker depName=quay.io/skopeo/stable
+    SKOPEO_VERSION=v1.20.0-immutable
+    SKOPEO_BIN="docker run --rm -v $HOME/.docker/config.json:/tmp/auth.json ${SKOPEO_IMAGE}:${SKOPEO_VERSION}"
 fi
 
 ## Setup inputs

.github/scripts/copy-images.sh

@@ -1,5 +1,4 @@
 .github/actionlint.yaml
-.github/dependabot.yml
 .github/labeler.yml
 .github/PULL_REQUEST_TEMPLATE.md
 .github/release.yml
@@ -26,8 +25,6 @@
 .github/workflows/cherry-pick.yml
 .github/workflows/codeql-analysis.yml
 .github/workflows/create-release-branch.yml
-.github/workflows/dependabot-auto-merge.yml
-.github/workflows/dependabot-hugo.yml
 .github/workflows/dependency-review.yml
 .github/workflows/dockerhub-description.yml
 .github/workflows/docs-build-push.yml

.github/scripts/exclude_ci_files.txt

@@ -43,7 +43,7 @@ jobs:
           remote-repository-name: "f5-cla-data"
           path-to-signatures: "signatures/beta/signatures.json"
           # Comma separated list of usernames for maintainers or any other individuals who should not be prompted for a CLA.
-          allowlist: bot*
+          allowlist: bot*,renovate,mend
           # Do not lock PRs after a merge.
           lock-pullrequest-aftermerge: false
         env:

.github/workflows/dependabot-auto-merge.yml

@@ -18,6 +18,8 @@ override DOCKER_BUILD_OPTIONS += --build-arg IC_VERSION=$(VERSION) --build-arg P
 ARCH                          ?= amd64 ## The architecture of the image or binary. For example: amd64, arm64, ppc64le, s390x. Not all architectures are supported for all targets
 GOOS                          ?= linux ## The OS of the binary. For example linux, darwin
 TELEMETRY_ENDPOINT            ?= oss.edge.df.f5.com:443
+# renovate: datasource=docker depName=golangci/golangci-lint
+GOLANGCI_LINT_VERSION         ?= v2.5.0 ## The version of golangci-lint to use
 
 # Additional flags added here can be accessed in main.go.
 # e.g. `main.version` maps to `var version` in main.go
@@ -51,7 +53,7 @@ all: test lint verify-codegen update-crds debian-image
 .PHONY: lint
 lint: ## Run linter
 	@git fetch
-	docker run --pull always --rm -v $(shell pwd):/kubernetes-ingress -w /kubernetes-ingress -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest git diff -p origin/main > /tmp/diff.patch && golangci-lint --color always run -v --new-from-patch=/tmp/diff.patch
+	docker run --pull always --rm -v $(shell pwd):/kubernetes-ingress -w /kubernetes-ingress -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) git diff -p origin/main > /tmp/diff.patch && golangci-lint --color always run -v --new-from-patch=/tmp/diff.patch
 
 .PHONY: lint-python
 lint-python: ## Run linter for python tests