From 387d7efb25d3df6da8b9fb3a8acf022268392f8e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:24:30 +0000 Subject: [PATCH 1/7] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..5db72dd6 --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ] +} From e46605e5c8b7c2aace199c2e6ac6cd4b44e6e228 Mon Sep 17 00:00:00 2001 From: Hidden Marten Date: Wed, 10 Apr 2024 12:26:52 +0200 Subject: [PATCH 2/7] [106] Add rules for Makefile --- Makefile | 8 ++++++++ renovate.json | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/Makefile b/Makefile index 5e02b2b2..dae74577 100644 --- a/Makefile +++ b/Makefile @@ -221,14 +221,22 @@ HELM_DOCS ?= $(LOCALBIN)/helm-docs YQ = $(LOCALBIN)/yq ## Tool Versions +# renovate: datasource=github-tags depName=kubernetes-sigs/kustomize KUSTOMIZE_VERSION ?= v5.3.0 +# renovate: datasource=github-tags depName=kubernetes-sigs/controller-tools CONTROLLER_TOOLS_VERSION ?= v0.14.0 ENVTEST_VERSION ?= latest +# renovate: datasource=github-tags depName=golangci/golangci-lint GOLANGCI_LINT_VERSION ?= v1.54.2 +# renovate: datasource=github-tags depName=kubernetes-sigs/kind KIND_VERSION ?= v0.22.0 +# renovate: datasource=github-tags depName=helm/helm HELM_VERSION ?= v3.14.3 +# renovate: datasource=github-tags depName=losisin/helm-values-schema-json HELM_SCHEMA_VERSION ?= v1.2.2 +# renovate: datasource=github-tags depName=norwoodj/helm-docs HELM_DOCS_VERSION ?= v1.13.1 +# renovate: datasource=github-tags depName=mikefarah/yq YQ_VERSION ?= v4.42.1 ## Tool install scripts diff --git a/renovate.json b/renovate.json index 5db72dd6..733125f7 100644 --- a/renovate.json +++ b/renovate.json @@ -2,5 +2,15 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:recommended" + ], + "customManagers": [ + { + "customType": "regex", + "fileMatch": ["^Makefile$"], + "matchStrings": [ + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( registryUrl=(?.*?))?\\s.*?_VERSION \\?= (?.*)\\s" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}" + } ] } From 75e34aa65495949caa0415d27edb5dbe881f9b91 Mon Sep 17 00:00:00 2001 From: Hidden Marten Date: Wed, 10 Apr 2024 12:30:59 +0200 Subject: [PATCH 3/7] [106] Add rules for operators and kubernetes --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index dae74577..a2d4ce5b 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ # Image URL to use all building/pushing image targets IMG ?= ghcr.io/aenix-io/etcd-operator:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. +# renovate: datasource=github-tags depName=kubernetes/kubernetes ENVTEST_K8S_VERSION ?= 1.29.0 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) @@ -145,7 +146,9 @@ build-installer: manifests generate kustomize ## Generate a consolidated YAML wi KIND_CLUSTER_NAME ?= etcd-operator-kind NAMESPACE ?= etcd-operator-system +# renovate: datasource=github-tags depName=prometheus-operator/prometheus-operator PROMETHEUS_OPERATOR_VERSION ?= v0.72.0 +# renovate: datasource=github-tags depName=jetstack/cert-manager CERT_MANAGER_VERSION ?= v1.14.4 ifndef ignore-not-found From 301b8d4bd37d5b78e5abc3606e7cdda755fc8f8d Mon Sep 17 00:00:00 2001 From: Hidden Marten Date: Wed, 10 Apr 2024 12:38:10 +0200 Subject: [PATCH 4/7] Update versioning for kubernetes in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a2d4ce5b..6ea65d61 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Image URL to use all building/pushing image targets IMG ?= ghcr.io/aenix-io/etcd-operator:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -# renovate: datasource=github-tags depName=kubernetes/kubernetes +# renovate: datasource=github-tags depName=kubernetes/kubernetes versioning=regex:^(?\\d+)(\\.(?\\d+))?(\\.(?\\d+))?$ ENVTEST_K8S_VERSION ?= 1.29.0 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) From dc8aecf9cf6940efc8b251844a774970fb74c857 Mon Sep 17 00:00:00 2001 From: Hidden Marten Date: Wed, 10 Apr 2024 12:57:46 +0200 Subject: [PATCH 5/7] [106] Use single escaping symbol --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6ea65d61..f6a53106 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Image URL to use all building/pushing image targets IMG ?= ghcr.io/aenix-io/etcd-operator:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -# renovate: datasource=github-tags depName=kubernetes/kubernetes versioning=regex:^(?\\d+)(\\.(?\\d+))?(\\.(?\\d+))?$ +# renovate: datasource=github-tags depName=kubernetes/kubernetes versioning=regex:^(?\d+)(\.(?\d+))?(\.(?\d+))?$ ENVTEST_K8S_VERSION ?= 1.29.0 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) From 452c6e6c10efe76777e45fa0c8f165cee702d671 Mon Sep 17 00:00:00 2001 From: Hidden Marten Date: Wed, 10 Apr 2024 13:14:21 +0200 Subject: [PATCH 6/7] [106] Proceed with updated version, using classic semver --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f6a53106..12ab321e 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,9 @@ # Image URL to use all building/pushing image targets IMG ?= ghcr.io/aenix-io/etcd-operator:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -# renovate: datasource=github-tags depName=kubernetes/kubernetes versioning=regex:^(?\d+)(\.(?\d+))?(\.(?\d+))?$ -ENVTEST_K8S_VERSION ?= 1.29.0 +# renovate: datasource=github-tags depName=kubernetes/kubernetes +ENVTEST_K8S_VERSION ?= v1.29.0 +ENVTEST_K8S_VERSION_TRIMMED_V = $(subst v,,$(ENVTEST_K8S_VERSION)) # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -63,7 +64,7 @@ vet: ## Run go vet against code. .PHONY: test test: manifests generate fmt vet envtest ## Run tests. - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION_TRIMMED_V) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out # Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors. .PHONY: test-e2e # Run the e2e tests against a Kind k8s instance that is spun up. From b47d453e36a225d73deb3e29bfb8b70792192d58 Mon Sep 17 00:00:00 2001 From: Hidden Marten Date: Wed, 10 Apr 2024 13:22:55 +0200 Subject: [PATCH 7/7] [106] Use correct versions in gh workflows --- .github/workflows/docker-publish.yaml | 2 +- .github/workflows/hugo.yaml | 10 +++++----- .github/workflows/make-test-e2e.yaml | 4 ++-- .github/workflows/make-test.yaml | 4 ++-- .github/workflows/pre-commit.yaml | 4 ++-- .github/workflows/release-drafter.yml | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 0769667a..ae600a99 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v3.6.0 # Install the cosign tool except on PR # https://github.com/sigstore/cosign-installer diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml index 7bc01658..fd4d92e1 100644 --- a/.github/workflows/hugo.yaml +++ b/.github/workflows/hugo.yaml @@ -30,7 +30,7 @@ defaults: jobs: # Build job build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: HUGO_VERSION: 0.123.8 steps: @@ -41,13 +41,13 @@ jobs: - name: Install Dart Sass run: sudo snap install dart-sass - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 with: submodules: recursive fetch-depth: 0 - name: Setup Pages id: pages - uses: actions/configure-pages@v4 + uses: actions/configure-pages@v4.0.0 - name: Install Node.js dependencies working-directory: ./site run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true" @@ -63,7 +63,7 @@ jobs: --minify \ --baseURL "${{ steps.pages.outputs.base_url }}/" - name: Upload artifact - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@v2.0.0 with: path: ./site/public @@ -77,4 +77,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v3 + uses: actions/deploy-pages@v3.0.1 diff --git a/.github/workflows/make-test-e2e.yaml b/.github/workflows/make-test-e2e.yaml index 82087ad7..9621b427 100644 --- a/.github/workflows/make-test-e2e.yaml +++ b/.github/workflows/make-test-e2e.yaml @@ -13,8 +13,8 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'ok-to-test') || contains(fromJSON('["COLLABORATOR", "MEMBER", "OWNER"]'), github.event.pull_request.author_association) runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 + - uses: actions/checkout@v4.1.1 + - uses: actions/setup-go@v5.0.0 with: go-version: 1.22.1 - uses: helm/kind-action@v1.9.0 diff --git a/.github/workflows/make-test.yaml b/.github/workflows/make-test.yaml index 8adc7c80..7e06b424 100644 --- a/.github/workflows/make-test.yaml +++ b/.github/workflows/make-test.yaml @@ -16,8 +16,8 @@ jobs: k8s_version: [1.27.1,1.28.0,1.29.0] runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 + - uses: actions/checkout@v4.1.1 + - uses: actions/setup-go@v5.0.0 with: go-version: 1.22.1 - run: ENVTEST_K8S_VERSION=${{ matrix.k8s_version }} make test diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml index 1c49ebce..9d9a6167 100644 --- a/.github/workflows/pre-commit.yaml +++ b/.github/workflows/pre-commit.yaml @@ -7,8 +7,8 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 + - uses: actions/checkout@v4.1.1 + - uses: actions/setup-go@v5.0.0 with: go-version: 1.22.1 - uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 2b186857..4901e518 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -12,9 +12,9 @@ permissions: jobs: update_release_draft: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - - uses: release-drafter/release-drafter@v6 + - uses: release-drafter/release-drafter@v6.0.0 with: disable-releaser: github.ref != 'refs/heads/main' config-name: release-drafter.yml