From e97c7385246d7df76e24c38aada711449f0e495b Mon Sep 17 00:00:00 2001
From: Micah Nagel <micah.nagel@gmail.com>
Date: Fri, 24 May 2024 08:40:28 -0600
Subject: [PATCH] fix: de-duplicate renovate matches

---
 .github/bundles/uds-bundle.yaml      | 1 -
 bundles/k3d-slim-dev/uds-bundle.yaml | 2 --
 bundles/k3d-standard/uds-bundle.yaml | 2 --
 renovate.json                        | 4 ++--
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/bundles/uds-bundle.yaml b/.github/bundles/uds-bundle.yaml
index a44dcabef..05ae8fae5 100644
--- a/.github/bundles/uds-bundle.yaml
+++ b/.github/bundles/uds-bundle.yaml
@@ -9,7 +9,6 @@ metadata:
 packages:
   - name: init
     repository: ghcr.io/defenseunicorns/packages/init
-    # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
     ref: v0.33.2
 
   - name: core
diff --git a/bundles/k3d-slim-dev/uds-bundle.yaml b/bundles/k3d-slim-dev/uds-bundle.yaml
index 15c7cb40d..bf0425cef 100644
--- a/bundles/k3d-slim-dev/uds-bundle.yaml
+++ b/bundles/k3d-slim-dev/uds-bundle.yaml
@@ -9,7 +9,6 @@ metadata:
 packages:
   - name: uds-k3d-dev
     repository: ghcr.io/defenseunicorns/packages/uds-k3d
-    # renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver
     ref: 0.6.0
     overrides:
       uds-dev-stack:
@@ -30,7 +29,6 @@ packages:
 
   - name: init
     repository: ghcr.io/defenseunicorns/packages/init
-    # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
     ref: v0.33.2
 
   - name: core-slim-dev
diff --git a/bundles/k3d-standard/uds-bundle.yaml b/bundles/k3d-standard/uds-bundle.yaml
index e17223658..f4428941f 100644
--- a/bundles/k3d-standard/uds-bundle.yaml
+++ b/bundles/k3d-standard/uds-bundle.yaml
@@ -9,7 +9,6 @@ metadata:
 packages:
   - name: uds-k3d-dev
     repository: ghcr.io/defenseunicorns/packages/uds-k3d
-    # renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver
     ref: 0.6.0
     overrides:
       uds-dev-stack:
@@ -30,7 +29,6 @@ packages:
 
   - name: init
     repository: ghcr.io/defenseunicorns/packages/init
-    # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
     ref: v0.33.2
 
   - name: core
diff --git a/renovate.json b/renovate.json
index 9c217e85c..2b17d5ced 100644
--- a/renovate.json
+++ b/renovate.json
@@ -94,7 +94,7 @@
       "commitMessageTopic": "grafana"
     },
     {
-      "matchPackageNames": ["defenseunicorns/zarf"],
+      "matchPackageNames": ["defenseunicorns/zarf", "ghcr.io/defenseunicorns/packages/init"],
       "groupName": "zarf",
       "commitMessageTopic": "zarf"
     },
@@ -104,7 +104,7 @@
       "commitMessageTopic": "uds"
     },
     {
-      "matchPackageNames": ["defenseunicorns/uds-k3d"],
+      "matchPackageNames": ["defenseunicorns/uds-k3d", "ghcr.io/defenseunicorns/packages/uds-k3d"],
       "groupName": "uds-k3d",
       "commitMessageTopic": "uds-k3d"
     },