From bc1e412f80bdac98e37eb7e9ac1cbffbbfb1043b Mon Sep 17 00:00:00 2001
From: Zachary Sanders <sanders_zachary@bah.com>
Date: Tue, 25 May 2021 14:59:50 +0000
Subject: [PATCH] renovate-automerge

---
 renovate.json | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/renovate.json b/renovate.json
index 0b66c5f..823b11e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,10 +5,12 @@
   "baseBranches": [
     "development"
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "packageRules": [
     {
       "datasources": [
-        "github-releases"
+        "github-tags"
       ],
       "packageNames": [
         "kubernetes/kubernetes"
@@ -20,35 +22,16 @@
     }
   ],
   "regexManagers": [
-    {
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "kubernetes/kubernetes",
-      "datasourceTemplate": "github-releases"
-    },
-    {
-      "fileMatch": [
-        "^hardening_manifest.yaml$"
-      ],
-      "matchStrings": [
-        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
-      ],
-      "depNameTemplate": "kubernetes/kubernetes",
-      "datasourceTemplate": "github-releases"
-    },
     {
       "fileMatch": [
         "^hardening_manifest.yaml$"
       ],
       "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\"",
         "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "kubernetes/kubernetes",
-      "datasourceTemplate": "github-releases"
+      "datasourceTemplate": "github-tags"
     }
   ]
-}
\ No newline at end of file
+}
-- 
GitLab