From 79d390dca6c9f60a575e9db5a8edd62461de269f Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Date: Tue, 21 Nov 2023 01:11:40 +0100
Subject: [PATCH] Update renovate.json5

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
---
 .github/renovate.json5 | 60 +++++-------------------------------------
 1 file changed, 6 insertions(+), 54 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index ccffc5f0e3b..9200ebb195c 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -33,16 +33,6 @@
       "commitMessageTopic": "Helm chart {{depName}}"
     },
     // global docker datasource settings
-    {
-      "datasources": ["docker"],
-      "matchManagers": ["helm-values"],
-      "enabled": true,
-      "pinDigests": true,
-      "automerge": false,
-      "commitMessageTopic": "container image {{depName}}",
-      "commitMessageExtra": "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}",
-      "matchUpdateTypes": ["major", "minor", "patch", "digest"],
-    },
     {
       "datasources": ["docker"],
       "enabled": true,
@@ -50,7 +40,7 @@
       "automerge": false,
       "separateMinorPatch": true,
       "commitMessageTopic": "container image {{depName}}",
-      "commitMessageExtra": "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}",
+      "commitMessageExtra": "to {{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}@{{newDigestShort}}",
     },
     // Setup datasources for github actions
     {
@@ -185,7 +175,7 @@
       "updateTypes": ["major"],
       "enabled": true,
       "bumpVersion": "major",
-      "labels": ["update/docker/enterprise/major"],
+      "labels": ["update/docker/major"],
       "matchPaths": ["charts/enterprise/**", "charts/operators/**"],
     },
     {
@@ -196,7 +186,7 @@
       ],
       "enabled": true,
       "bumpVersion": "minor",
-      "labels": ["update/docker/enterprise/minor"],
+      "labels": ["update/docker/minor"],
       "matchPaths": ["charts/enterprise/**", "charts/operators/**"],
     },
     {
@@ -209,21 +199,8 @@
       ],
       "bumpVersion": "patch",
       "enabled": true,
-      "labels": ["update/docker/enterprise/patch", "automerge"],
-      "matchPaths": ["charts/enterprise/**"],
-    },
-    {
-      "matchDatasources": ["docker"],
-      "automerge": true,
-      "matchUpdateTypes": [
-        "patch",
-        "digest",
-        "pin",
-      ],
-      "bumpVersion": "patch",
-      "enabled": true,
-      "labels": ["update/docker/operator/patch"],
-      "matchPaths": ["charts/operator/**"],
+      "labels": ["update/docker/patch", "automerge"],
+      "matchPaths": ["charts/enterprise/**", "charts/operator/**"],
     },
     //
     // Tag updates for semantic tags on incubator and dev charts
@@ -256,7 +233,7 @@
         "pin",
       ],
       "bumpVersion": "patch",
-      "enabled": true,
+      "enabled": false,
       "labels": ["update/docker/incubator/non-major", "automerge"],
       "matchPaths": ["charts/incubator/**", "charts/dev/**"],
     },
@@ -295,31 +272,6 @@
       "labels": ["update/docker/general/non-major", "automerge"],
       "matchPaths": ["charts/dependency/**", "charts/SCALE/**", "charts/library/**", "charts/stable/**", "templates/app/**"],
     },
-
-    {
-      "matchDatasources": ["docker"],
-      "matchUpdateTypes": ["major"],
-      "commitMessagePrefix": "feat(images)!: ",
-      "labels": ["renovate/image", "dep/major"],
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchUpdateTypes": ["minor"],
-      "semanticCommitType": "feat",
-      "labels": ["renovate/image", "dep/minor"],
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchUpdateTypes": ["patch"],
-      "semanticCommitType": "fix",
-      "labels": ["renovate/image", "dep/patch"],
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchUpdateTypes": ["digest"],
-      "semanticCommitType": "fix",
-      "labels": ["renovate/image", "dep/digest"],
-    },
     //
     // Tag semantic version type based on regex
     //