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 1/2] 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


From e1fe9fd4e6fe1d548c0e56f236c32f567bcdb6c2 Mon Sep 17 00:00:00 2001
From: renovate <renovate@support.dsop.io>
Date: Fri, 18 Jun 2021 03:06:43 +0000
Subject: [PATCH 2/2] Update dependency kubernetes/kubernetes to v1.18.20

---
 hardening_manifest.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index b6e6cd9..54dd768 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -8,7 +8,7 @@ name: "opensource/kubernetes-1.18/kube-proxy-1.18"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "v1.18.19"
+- "v1.18.20"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://kubernetes.io/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "opensource"
-  org.opencontainers.image.version: "v1.18.19"
+  org.opencontainers.image.version: "v1.18.20"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "kubernetes"
   ## This value can be "opensource" or "commercial"
@@ -37,11 +37,11 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- url: https://github.com/kubernetes/kubernetes/archive/v1.18.19.tar.gz
+- url: https://github.com/kubernetes/kubernetes/archive/v1.18.20.tar.gz
   filename: kubernetes.tar.gz
   validation:
     type: sha256
-    value: 2812e4c0b66fe5efe588c6affdb6c0e180e8649dadacb5144511feb398f2001e
+    value: 45bcf77fb5beb52aa2ecb22594193938cecf033b1e9409ad1cd0f7af15f32e3b
 - filename: texinfo.tar.gz
   url: "https://ftp.gnu.org/gnu/texinfo/texinfo-6.7.tar.gz"
   validation:
-- 
GitLab