From 0194ff960cac901324407aa97abc8c89cc2c7882 Mon Sep 17 00:00:00 2001
From: Boemeltrein <130394941+Boemeltrein@users.noreply.github.com>
Date: Mon, 7 Apr 2025 13:06:41 +0200
Subject: [PATCH] fix(clustertool): Adding namespaces to
 system-upgrade-controller-plans  (#34018)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
system-upgrade-controller-plans Flux Kustomization will not work ->
`Plan/talos namespace not specified: the server could not find the
requested resource (patch plans.upgrade.cattle.io talos)`

Adding both namespaces fixes the Kustomization directly:
`flux-system system-upgrade-controller-plans main@sha1:a963250b False
True Applied revision: main@sha1:a963250b`

⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [x] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code
- [ ] 📜 Documentation Changes

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->
On my own test cluster

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [x] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made changes to the documentation
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning
- [x] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):`, `chore(chart-name):`, `docs(chart-name):` or
`fix(docs):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
---
 .../core/system-upgrade-controller-plans/app/kubernetes.yaml     | 1 +
 .../core/system-upgrade-controller-plans/app/talos.yaml          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/clustertool/embed/generic/kubernetes/core/system-upgrade-controller-plans/app/kubernetes.yaml b/clustertool/embed/generic/kubernetes/core/system-upgrade-controller-plans/app/kubernetes.yaml
index e8dc8f5855c..7d7e67260a0 100644
--- a/clustertool/embed/generic/kubernetes/core/system-upgrade-controller-plans/app/kubernetes.yaml
+++ b/clustertool/embed/generic/kubernetes/core/system-upgrade-controller-plans/app/kubernetes.yaml
@@ -4,6 +4,7 @@ apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
   name: kubernetes
+  namespace: system-upgrade
 spec:
   version: ${KUBERNETES_VERSION}
   serviceAccountName: system-upgrade
diff --git a/clustertool/embed/generic/kubernetes/core/system-upgrade-controller-plans/app/talos.yaml b/clustertool/embed/generic/kubernetes/core/system-upgrade-controller-plans/app/talos.yaml
index 6d5f848fd78..aacdebeadfc 100644
--- a/clustertool/embed/generic/kubernetes/core/system-upgrade-controller-plans/app/talos.yaml
+++ b/clustertool/embed/generic/kubernetes/core/system-upgrade-controller-plans/app/talos.yaml
@@ -3,6 +3,7 @@ apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
   name: talos
+  namespace: system-upgrade
 spec:
   version: ${TALOS_VERSION}
   serviceAccountName: system-upgrade