From 9296f594a57aac983d81f3b528f3580008e5ec0f Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <info@kjeldschouten.nl>
Date: Sun, 13 Oct 2024 13:09:00 +0200
Subject: [PATCH] some minor renovate tweaks for pin merging

---
 .github/renovate/kinds/astro.json5         |  2 +-
 .github/renovate/kinds/docker.json5        |  2 +-
 .github/renovate/kinds/githubactions.json5 |  2 +-
 .github/renovate/kinds/go.json5            |  2 +-
 .github/renovate/kinds/helm-values.json5   |  2 +-
 .github/renovate/special/automerge.json5   |  8 ++++----
 .github/renovate/updates/lockfile.json5    | 12 ++++++++++++
 .github/renovate/updates/pin.json5         | 12 ++++++++++++
 8 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 .github/renovate/updates/lockfile.json5
 create mode 100644 .github/renovate/updates/pin.json5

diff --git a/.github/renovate/kinds/astro.json5 b/.github/renovate/kinds/astro.json5
index 42b2265f6d6..59c2b43388d 100644
--- a/.github/renovate/kinds/astro.json5
+++ b/.github/renovate/kinds/astro.json5
@@ -7,7 +7,7 @@
     ],
     "branchPrefix": "astro-",
     "enabled": true, // Enable updates for website dependencies
-    "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types
+    "updateTypes": ["major", "minor", "patch", "digest", "pin", "lockfile"], // Allow updates for all version types
     "ignore": [
       // Specify any dependencies or versions to ignore
     ],
diff --git a/.github/renovate/kinds/docker.json5 b/.github/renovate/kinds/docker.json5
index d8e785a6773..7815d49461b 100644
--- a/.github/renovate/kinds/docker.json5
+++ b/.github/renovate/kinds/docker.json5
@@ -14,7 +14,7 @@
     ],
     "branchPrefix": "docker-",
     "enabled": true, // Enable Docker image updates
-    "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types
+    "updateTypes": ["major", "minor", "patch", "digest", "pin"], // Allow updates for all version types
     "semanticCommitScope": "container",
     "ignore": [
       "talconfig.yaml" // Exclude any file named talconfig.yaml
diff --git a/.github/renovate/kinds/githubactions.json5 b/.github/renovate/kinds/githubactions.json5
index e0861140f10..6514ebf29db 100644
--- a/.github/renovate/kinds/githubactions.json5
+++ b/.github/renovate/kinds/githubactions.json5
@@ -7,7 +7,7 @@
       "\\.github/workflows/.*\\.ya?ml\\.j2$" // Matches Jinja2 templated workflow files
     ],
     "enabled": true, // Enable GitHub Actions updates
-    "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types
+    "updateTypes": ["major", "minor", "patch", "digest", "pin"], // Allow updates for all version types
     "semanticCommitScope": "github-action",
     "ignore": [
       // Specify any actions or workflows to ignore
diff --git a/.github/renovate/kinds/go.json5 b/.github/renovate/kinds/go.json5
index 1008ac57332..bb74faea7cf 100644
--- a/.github/renovate/kinds/go.json5
+++ b/.github/renovate/kinds/go.json5
@@ -7,7 +7,7 @@
       "go\\.sum$"  // Matches Go sum files
     ],
     "enabled": true, // Enable Go module updates
-    "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types
+    "updateTypes": ["major", "minor", "patch",  "digest", "pin", "lockfile"], // Allow updates for all version types
     "ignore": [
       // Specify any modules or versions to ignore
     ],
diff --git a/.github/renovate/kinds/helm-values.json5 b/.github/renovate/kinds/helm-values.json5
index fd48dd6736c..363000193a1 100644
--- a/.github/renovate/kinds/helm-values.json5
+++ b/.github/renovate/kinds/helm-values.json5
@@ -9,7 +9,7 @@
       "(^|/)charts/.+\\.ya?ml(?:\\.j2)?$",
     ],
     "enabled": true, // Enable image reference updates in values.yaml
-    "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types
+    "updateTypes": ["major", "minor", "patch", "digest", "pin"], // Allow updates for all version types
     "semanticCommitScope": "container"
   },
   "branchPrefix": "helm-values-",
diff --git a/.github/renovate/special/automerge.json5 b/.github/renovate/special/automerge.json5
index 88c8656a39e..9c585491f6e 100644
--- a/.github/renovate/special/automerge.json5
+++ b/.github/renovate/special/automerge.json5
@@ -6,7 +6,7 @@
       "matchDatasources": ["docker"],
       "automerge": true,
       "automergeType": "pr",
-      "matchUpdateTypes": ["digest", "patch", "minor"],
+      "matchUpdateTypes": ["digest", "patch", "minor", "digest", "pin"],
       "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*" ],
       "branchPrefix": "docker-automerge-"
     },
@@ -15,7 +15,7 @@
       "matchDatasources": ["helm-values"],
       "automerge": true,
       "automergeType": "pr",
-      "matchUpdateTypes": ["digest", "patch", "minor"],
+      "matchUpdateTypes": ["digest", "patch", "minor", "digest", "pin"],
       "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*" ],
       "branchPrefix": "helm-values-automerge-"
     },
@@ -24,7 +24,7 @@
   "matchDatasources": ["helm"], // Use 'helm' datasource to match Helm charts
   "automerge": true,
   "automergeType": "pr",
-  "matchUpdateTypes": ["digest", "patch", "minor"], // Specify the types of updates to automate
+  "matchUpdateTypes": ["digest", "patch", "minor", "digest", "pin"], // Specify the types of updates to automate
   "matchPackagePatterns": ["tccr.io/truecharts/.*"], // Matches all OCI Helm charts under tccr.io/truecharts
   "branchPrefix": "helm-automerge-"
 },
@@ -34,7 +34,7 @@
       "matchDatasources": ["github-tags"],
       "automerge": true,
       "automergeType": "pr",
-      "matchUpdateTypes": ["minor", "patch"],
+      "matchUpdateTypes": ["minor", "patch", "digest", "pin"],
       "branchPrefix": "github-automerge-"
     }
   ]
diff --git a/.github/renovate/updates/lockfile.json5 b/.github/renovate/updates/lockfile.json5
new file mode 100644
index 00000000000..5cb364dfd0c
--- /dev/null
+++ b/.github/renovate/updates/lockfile.json5
@@ -0,0 +1,12 @@
+{
+      "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "packageRules": [
+    {
+      matchUpdateTypes: ["lockfile"],
+      automerge: true
+    }
+  ],
+  "ignore": [
+    // Add any paths or patterns to ignore specific digest updates, if necessary
+  ]
+}
\ No newline at end of file
diff --git a/.github/renovate/updates/pin.json5 b/.github/renovate/updates/pin.json5
new file mode 100644
index 00000000000..4f0e76496cd
--- /dev/null
+++ b/.github/renovate/updates/pin.json5
@@ -0,0 +1,12 @@
+{
+      "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "packageRules": [
+    {
+      matchUpdateTypes: ["pin"],
+      automerge: true
+    }
+  ],
+  "ignore": [
+    // Add any paths or patterns to ignore specific digest updates, if necessary
+  ]
+}
\ No newline at end of file