From 6ed399d381725f092d25450d7f56b2321492fb20 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 1 Feb 2022 09:39:30 -0500 Subject: [PATCH] feat(cluster): use the native flux renovate integration Signed-off-by: Devin Buhl --- .github/renovate.json5 | 24 ++++++++----- .github/workflows/renovate-schedule.yaml | 36 ------------------- .../apps/default/hajimari/helm-release.yaml | 1 - .../metrics-server/helm-release.yaml | 1 - .../kube-system/reflector/helm-release.yaml | 1 - .../kube-system/reloader/helm-release.yaml | 1 - .../apps/networking/traefik/helm-release.yaml | 1 - cluster/core/cert-manager/helm-release.yaml | 1 - cluster/core/metallb-system/helm-release.yaml | 1 - 9 files changed, 16 insertions(+), 51 deletions(-) delete mode 100644 .github/workflows/renovate-schedule.yaml diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 96fde175..2fb06a1a 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -5,24 +5,32 @@ "dependencyDashboardTitle": "Renovate Dashboard", "suppressNotifications": ["prIgnoreNotification"], "rebaseWhen": "conflicted", + "flux": { + "fileMatch": [ + "cluster/.+\\.ya?ml$" + ], + "ignorePaths": [ + "cluster/base/" + ] + }, "helm-values": { "fileMatch": [ - "cluster/.+/helm-release\\.yaml$" + "cluster/.+/helm-release\\.ya?ml$" ] }, "kubernetes": { "fileMatch": [ - "cluster/.+\\.yaml$" + "cluster/.+\\.ya?ml$" ], "ignorePaths": [ "cluster/base/" - ], + ] }, "regexManagers": [ // regexManager to read and process HelmRelease files { "fileMatch": [ - "cluster/.+\\.yaml$" + "cluster/.+\\.ya?ml$" ], "matchStrings": [ // helm releases @@ -33,7 +41,7 @@ // regexManager to read and process cert-manager CRD's { "fileMatch": [ - "cluster/crds/cert-manager/.+\\.yaml$" + "cluster/crds/cert-manager/.+\\.ya?ml$" ], "matchStrings": [ "registryUrl=(?.*?) chart=(?.*?)\n.*\\/(?.*?)\\/" @@ -43,13 +51,13 @@ // regexManager to read and process Traefik CRD's { "fileMatch": [ - "cluster/crds/traefik/.+\\.yaml$" + "cluster/crds/traefik/.+\\.ya?ml$" ], "matchStrings": [ "registryUrl=(?.*?) chart=(?.*?)\n *tag: v(?.*)\n" ], "datasourceTemplate": "helm" - }, + } ], "packageRules": [ // setup datasources @@ -64,7 +72,7 @@ "enabled": true, "commitMessageTopic": "container image {{depName}}", "commitMessageExtra": "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}", - "matchUpdateTypes": ["major", "minor", "patch"], + "matchUpdateTypes": ["major", "minor", "patch"] }, // add labels according to package and update types { diff --git a/.github/workflows/renovate-schedule.yaml b/.github/workflows/renovate-schedule.yaml deleted file mode 100644 index 7edc5020..00000000 --- a/.github/workflows/renovate-schedule.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -name: Schedule - Renovate Helm Releases - -on: # yamllint disable-line rule:truthy - workflow_dispatch: - schedule: - - cron: "0 */12 * * *" - -jobs: - renovate-helm-releases: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - fetch-depth: 1 - - - name: Renovate Helm Releases - uses: k8s-at-home/renovate-helm-releases@v1 - with: - cluster-path: "./cluster" - - - name: Create pull request for renovatebot helm-release annotations - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - branch: renovate-annotations - delete-branch: true - title: "chore(deps): update renovate annotations" - signoff: false - committer: GitHub - author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - commit-message: "chore(deps): update renovate annotations" - body: | - Update HelmReleases inorder for Renovate to pick up new versions of Helm charts - labels: renovate/annotations diff --git a/cluster/apps/default/hajimari/helm-release.yaml b/cluster/apps/default/hajimari/helm-release.yaml index 4694c8f5..4d6fea8f 100644 --- a/cluster/apps/default/hajimari/helm-release.yaml +++ b/cluster/apps/default/hajimari/helm-release.yaml @@ -8,7 +8,6 @@ spec: interval: 5m chart: spec: - # renovate: registryUrl=https://hajimari.io chart: hajimari version: 1.2.0 sourceRef: diff --git a/cluster/apps/kube-system/metrics-server/helm-release.yaml b/cluster/apps/kube-system/metrics-server/helm-release.yaml index 920d5732..d8540fcd 100644 --- a/cluster/apps/kube-system/metrics-server/helm-release.yaml +++ b/cluster/apps/kube-system/metrics-server/helm-release.yaml @@ -8,7 +8,6 @@ spec: interval: 5m chart: spec: - # renovate: registryUrl=https://kubernetes-sigs.github.io/metrics-server chart: metrics-server version: 3.7.0 sourceRef: diff --git a/cluster/apps/kube-system/reflector/helm-release.yaml b/cluster/apps/kube-system/reflector/helm-release.yaml index 3920cf3a..0f58fbdf 100644 --- a/cluster/apps/kube-system/reflector/helm-release.yaml +++ b/cluster/apps/kube-system/reflector/helm-release.yaml @@ -8,7 +8,6 @@ spec: interval: 5m chart: spec: - # renovate: registryUrl=https://emberstack.github.io/helm-charts/ chart: reflector version: 6.1.23 sourceRef: diff --git a/cluster/apps/kube-system/reloader/helm-release.yaml b/cluster/apps/kube-system/reloader/helm-release.yaml index adb5db63..63a787a3 100644 --- a/cluster/apps/kube-system/reloader/helm-release.yaml +++ b/cluster/apps/kube-system/reloader/helm-release.yaml @@ -8,7 +8,6 @@ spec: interval: 5m chart: spec: - # renovate: registryUrl=https://stakater.github.io/stakater-charts chart: reloader version: v0.0.104 sourceRef: diff --git a/cluster/apps/networking/traefik/helm-release.yaml b/cluster/apps/networking/traefik/helm-release.yaml index dbb4bcb5..25aa4c1a 100644 --- a/cluster/apps/networking/traefik/helm-release.yaml +++ b/cluster/apps/networking/traefik/helm-release.yaml @@ -8,7 +8,6 @@ spec: interval: 5m chart: spec: - # renovate: registryUrl=https://helm.traefik.io/traefik chart: traefik version: 10.13.0 sourceRef: diff --git a/cluster/core/cert-manager/helm-release.yaml b/cluster/core/cert-manager/helm-release.yaml index 57cf88c0..f40ff9cb 100644 --- a/cluster/core/cert-manager/helm-release.yaml +++ b/cluster/core/cert-manager/helm-release.yaml @@ -8,7 +8,6 @@ spec: interval: 5m chart: spec: - # renovate: registryUrl=https://charts.jetstack.io/ chart: cert-manager version: v1.7.0 sourceRef: diff --git a/cluster/core/metallb-system/helm-release.yaml b/cluster/core/metallb-system/helm-release.yaml index 8e7e56a0..8fc4a54c 100644 --- a/cluster/core/metallb-system/helm-release.yaml +++ b/cluster/core/metallb-system/helm-release.yaml @@ -8,7 +8,6 @@ spec: interval: 5m chart: spec: - # renovate: registryUrl=https://metallb.github.io/metallb chart: metallb version: 0.11.0 sourceRef: