From 2ad37e95d9a6519d9ecf983f840db8d2020ad450 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Thu, 17 Nov 2022 15:22:32 +0100 Subject: [PATCH] ci: have renovate update Makefile dependencies (#431) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Florian Bacher Fixes https://github.com/keptn/lifecycle-toolkit/issues/314 --- {.ci => .github}/mlc_config.json | 0 .github/workflows/check-links.yaml | 2 +- Makefile | 2 ++ examples/argo/Makefile | 5 ++++- examples/flux/Makefile | 3 +-- examples/kubecon-na-22-demo/Makefile | 3 ++- examples/observability/Makefile | 5 ++++- operator/Makefile | 12 +++++++----- renovate.json | 16 ++++++++++++++++ scheduler/Makefile | 1 + 10 files changed, 38 insertions(+), 11 deletions(-) rename {.ci => .github}/mlc_config.json (100%) diff --git a/.ci/mlc_config.json b/.github/mlc_config.json similarity index 100% rename from .ci/mlc_config.json rename to .github/mlc_config.json diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml index cd7e20df8d..7cfbfd1b05 100644 --- a/.github/workflows/check-links.yaml +++ b/.github/workflows/check-links.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: - config-file: '.ci/mlc_config.json' + config-file: '.github/mlc_config.json' use-verbose-mode: true use-quiet-mode: true folder-path: 'examples' diff --git a/Makefile b/Makefile index bdf039ae97..8c9df59024 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ # Image URL to use all building/pushing image targets + +# renovate: datasource=github-releases depName=cert-manager/cert-manager CERT_MANAGER_VERSION ?= v1.8.0 TAG ?= "$(shell date +%Y%m%d%s)" TAG := $(TAG) diff --git a/examples/argo/Makefile b/examples/argo/Makefile index 27d3492991..b701eeca09 100644 --- a/examples/argo/Makefile +++ b/examples/argo/Makefile @@ -1,7 +1,10 @@ LFC_NAMESPACE ?= keptn-lifecycle-toolkit-system PODTATO_NAMESPACE ?= podtato-kubectl ARGO_NAMESPACE ?= argocd +# renovate: datasource=github-tags depName=argoproj/argo-cd ARGO_VERSION ?= 2.4.14 +# renovate: datasource=github-tags depName=cert-manager/cert-manager +CERT_MANAGER_VERSION ?= v1.10.0 ARGO_SECRET = $(shell kubectl -n ${ARGO_NAMESPACE} get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d; echo) .PHONY: install @@ -9,7 +12,7 @@ install: @echo "-----------------------------------" @echo "Create Namespace and install Keptn-lifecycle-toolkit" @echo "-----------------------------------" - kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.10.0/cert-manager.yaml + kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml kubectl wait --for=condition=available deployment/cert-manager -n cert-manager --timeout=300s kubectl apply -f https://github.com/keptn/lifecycle-toolkit/releases/download/v0.4.0/manifest.yaml #x-release-please-version kubectl wait --for=condition=available deployment/klc-controller-manager -n keptn-lifecycle-toolkit-system --timeout=300s diff --git a/examples/flux/Makefile b/examples/flux/Makefile index ee37c2d4fa..026307ef16 100644 --- a/examples/flux/Makefile +++ b/examples/flux/Makefile @@ -1,4 +1,3 @@ -JAEGER_VERSION ?= v1.38.0 LFC_NAMESPACE ?= keptn-lifecycle-toolkit-system PODTATO_NAMESPACE ?= podtato-kubectl REPO_PATH ?= flux-demo @@ -67,4 +66,4 @@ uninstall: check-flux-binary @echo "----------------------------------------" @echo "Uninstalling flux" @echo "----------------------------------------" - flux uninstall \ No newline at end of file + flux uninstall diff --git a/examples/kubecon-na-22-demo/Makefile b/examples/kubecon-na-22-demo/Makefile index 7a7485f13c..a4e726f5f1 100644 --- a/examples/kubecon-na-22-demo/Makefile +++ b/examples/kubecon-na-22-demo/Makefile @@ -1,3 +1,4 @@ +# renovate: datasource=github-tags depName=jaegertracing/jaeger JAEGER_VERSION ?= v1.38.0 LFC_NAMESPACE ?= keptn-lifecycle-controller-system PODTATO_NAMESPACE ?= podtato-kubectl @@ -40,4 +41,4 @@ undeploy-podtatohead: .PHONY: uninstall uninstall: undeploy-podtatohead - make -C ../observability uninstall \ No newline at end of file + make -C ../observability uninstall diff --git a/examples/observability/Makefile b/examples/observability/Makefile index 592733016d..839fe648ea 100644 --- a/examples/observability/Makefile +++ b/examples/observability/Makefile @@ -1,4 +1,7 @@ +# renovate: datasource=github-tags depName=jaegertracing/jaeger JAEGER_VERSION ?= v1.38.0 +# renovate: datasource=github-tags depName=cert-manager/cert-manager +CERT_MANAGER_VERSION ?= v1.10.0 TOOLKIT_NAMESPACE ?= keptn-lifecycle-toolkit-system PODTATO_NAMESPACE ?= podtato-kubectl GRAFANA_PORT_FORWARD ?= 3000 @@ -8,7 +11,7 @@ install:undeploy-podtatohead @echo "-----------------------------------" @echo "Create Namespace and install Keptn-lifecycle-toolkit" @echo "-----------------------------------" - kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.10.0/cert-manager.yaml + kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml kubectl wait --for=condition=available deployment/cert-manager -n cert-manager --timeout=300s kubectl apply -f https://github.com/keptn/lifecycle-toolkit/releases/download/v0.4.0/manifest.yaml #x-release-please-version kubectl wait --for=condition=available deployment/klc-controller-manager -n keptn-lifecycle-toolkit-system --timeout=300s diff --git a/operator/Makefile b/operator/Makefile index 19fdc0db7d..e50fb61f08 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -20,7 +20,13 @@ BUILDENVVAR=CGO_ENABLED=0 VERSION=$(shell echo $(RELEASE_VERSION) | awk -F - '{print $$2}') # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -ENVTEST_K8S_VERSION = 1.24.2 +ENVTEST_K8S_VERSION=1.24.2 + +## Tool Versions +# renovate: datasource=github-tags depName=kubernetes-sigs/kustomize +KUSTOMIZE_VERSION?=v4.2.0 +# renovate: datasource=github-tags depName=kubernetes-sigs/controller-tools +CONTROLLER_TOOLS_VERSION?=v0.9.2 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -144,10 +150,6 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest -## Tool Versions -KUSTOMIZE_VERSION ?= v4.2.0 -CONTROLLER_TOOLS_VERSION ?= v0.9.2 - KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. diff --git a/renovate.json b/renovate.json index 46968d5fc3..688f60ce61 100644 --- a/renovate.json +++ b/renovate.json @@ -18,6 +18,10 @@ "gomodTidy", "gomodMassage" ], + "ignorePaths": [ + "**/test/**", + "**/tests/**" + ], "packageRules": [ { "matchManagers": ["gomod"], @@ -30,6 +34,18 @@ { "matchManagers": ["dockerfile"], "addLabels": ["docker"] + }, + { + "matchPackageNames": ["kubernetes-sigs/kustomize"], + "extractVersion": "^kustomize/(?.*)$" + } + ], + "regexManagers": [ + { + "fileMatch": ["(^|\\/)Makefile$"], + "matchStrings": [ + "# renovate: datasource=(?.+?) depName=(?.+?)\\s.*?_VERSION ?\\??= ?(?.+?)?\\s" + ] } ] } diff --git a/scheduler/Makefile b/scheduler/Makefile index c9194fce6e..80af54a507 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -44,6 +44,7 @@ $(LOCALBIN): mkdir -p $(LOCALBIN) ## Tool Versions +# renovate: datasource=github-tags depName=kubernetes-sigs/kustomize KUSTOMIZE_VERSION ?= v4.2.0 ## Tool Binaries