From 275d04f4d7fd5aaa06e0c6b113667eab3795e731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfred=20G=C3=B6ppel?=
 <43101280+alfi0812@users.noreply.github.com>
Date: Wed, 9 Apr 2025 18:05:16 +0200
Subject: [PATCH] fix(clustertool): update deprecated charts & remove topolvm
 labels (#34172)
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.
-->
⚒️ 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
-->

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

**✔️ Checklist:**

- [x] ⚖️ 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._
---
 .../kubernetes/apps/kubernetes-dashboard/app/namespace.yaml   | 1 -
 .../embed/generic/kubernetes/core/blocky/app/namespace.yaml   | 2 --
 .../generic/kubernetes/core/clusterissuer/app/namespace.yaml  | 2 --
 .../generic/kubernetes/core/metallb-config/app/namespace.yaml | 1 -
 .../embed/generic/kubernetes/flux-system/flux/namespace.yaml  | 1 -
 .../kube-system/metrics-server/app/helm-release.yaml          | 4 ++--
 .../embed/generic/kubernetes/kube-system/namespace.yaml       | 1 -
 .../kube-system/node-feature-discovery/app/helm-release.yaml  | 4 ++--
 .../generic/kubernetes/system/longhorn/app/namespace.yaml     | 1 -
 .../generic/kubernetes/system/metallb/app/namespace.yaml      | 1 -
 .../generic/kubernetes/system/openebs/app/namespace.yaml      | 1 -
 .../embed/generic/kubernetes/system/spegel/app/namespace.yaml | 1 -
 .../generic/kubernetes/system/volsync/app/namespace.yaml      | 1 -
 13 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/clustertool/embed/generic/kubernetes/apps/kubernetes-dashboard/app/namespace.yaml b/clustertool/embed/generic/kubernetes/apps/kubernetes-dashboard/app/namespace.yaml
index 267bf0e47ba..0b826bad3a6 100644
--- a/clustertool/embed/generic/kubernetes/apps/kubernetes-dashboard/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/apps/kubernetes-dashboard/app/namespace.yaml
@@ -4,4 +4,3 @@ metadata:
   name: kubernetes-dashboard
   labels:
     pod-security.kubernetes.io/enforce: privileged
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/core/blocky/app/namespace.yaml b/clustertool/embed/generic/kubernetes/core/blocky/app/namespace.yaml
index 63d3a1b664b..778fc549d3b 100644
--- a/clustertool/embed/generic/kubernetes/core/blocky/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/core/blocky/app/namespace.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: blocky
-  labels:
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/core/clusterissuer/app/namespace.yaml b/clustertool/embed/generic/kubernetes/core/clusterissuer/app/namespace.yaml
index 53d7de6b4eb..81088dddd9f 100644
--- a/clustertool/embed/generic/kubernetes/core/clusterissuer/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/core/clusterissuer/app/namespace.yaml
@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: clusterissuer
-  labels:
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/core/metallb-config/app/namespace.yaml b/clustertool/embed/generic/kubernetes/core/metallb-config/app/namespace.yaml
index 00e85a747a4..f8fec45e49f 100644
--- a/clustertool/embed/generic/kubernetes/core/metallb-config/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/core/metallb-config/app/namespace.yaml
@@ -4,4 +4,3 @@ metadata:
   name: metallb-config
   labels:
     pod-security.kubernetes.io/enforce: privileged
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/flux-system/flux/namespace.yaml b/clustertool/embed/generic/kubernetes/flux-system/flux/namespace.yaml
index 2dcf8620170..2bece064051 100644
--- a/clustertool/embed/generic/kubernetes/flux-system/flux/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/flux-system/flux/namespace.yaml
@@ -5,4 +5,3 @@ metadata:
     name: flux-system
     labels:
         pod-security.kubernetes.io/enforce: privileged
-        topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/kube-system/metrics-server/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/kube-system/metrics-server/app/helm-release.yaml
index aa622865d5f..590fdfa4a1d 100644
--- a/clustertool/embed/generic/kubernetes/kube-system/metrics-server/app/helm-release.yaml
+++ b/clustertool/embed/generic/kubernetes/kube-system/metrics-server/app/helm-release.yaml
@@ -9,10 +9,10 @@ spec:
   chart:
     spec:
       chart: metrics-server
-      version: 0.1.0
+      version: 3.12.2
       sourceRef:
         kind: HelmRepository
-        name: truecharts
+        name: metrics-server
         namespace: flux-system
       interval: 15m
   timeout: 20m
diff --git a/clustertool/embed/generic/kubernetes/kube-system/namespace.yaml b/clustertool/embed/generic/kubernetes/kube-system/namespace.yaml
index 258a7b91438..bb74eac0de1 100644
--- a/clustertool/embed/generic/kubernetes/kube-system/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/kube-system/namespace.yaml
@@ -4,4 +4,3 @@ metadata:
   name: kube-system
   labels:
     pod-security.kubernetes.io/enforce: privileged
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/kube-system/node-feature-discovery/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/kube-system/node-feature-discovery/app/helm-release.yaml
index de233f5bb06..6e81e45d104 100644
--- a/clustertool/embed/generic/kubernetes/kube-system/node-feature-discovery/app/helm-release.yaml
+++ b/clustertool/embed/generic/kubernetes/kube-system/node-feature-discovery/app/helm-release.yaml
@@ -10,10 +10,10 @@ spec:
   chart:
     spec:
       chart: node-feature-discovery
-      version: 0.1.0
+      version: 0.17.2
       sourceRef:
         kind: HelmRepository
-        name: truecharts
+        name: node-feature-discovery
         namespace: flux-system
   install:
     crds: CreateReplace
diff --git a/clustertool/embed/generic/kubernetes/system/longhorn/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/longhorn/app/namespace.yaml
index c9700242081..809aa113a30 100644
--- a/clustertool/embed/generic/kubernetes/system/longhorn/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/system/longhorn/app/namespace.yaml
@@ -4,4 +4,3 @@ metadata:
   name: longhorn-system
   labels:
     pod-security.kubernetes.io/enforce: privileged
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/system/metallb/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/metallb/app/namespace.yaml
index 7d3f5315e25..9a1d0a1fb01 100644
--- a/clustertool/embed/generic/kubernetes/system/metallb/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/system/metallb/app/namespace.yaml
@@ -4,4 +4,3 @@ metadata:
   name: metallb
   labels:
     pod-security.kubernetes.io/enforce: privileged
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/system/openebs/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/openebs/app/namespace.yaml
index a7c84fed8dc..8b03243706a 100644
--- a/clustertool/embed/generic/kubernetes/system/openebs/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/system/openebs/app/namespace.yaml
@@ -4,4 +4,3 @@ metadata:
   name: openebs
   labels:
     pod-security.kubernetes.io/enforce: privileged
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/system/spegel/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/spegel/app/namespace.yaml
index 975731fc07c..870a6b30033 100644
--- a/clustertool/embed/generic/kubernetes/system/spegel/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/system/spegel/app/namespace.yaml
@@ -4,4 +4,3 @@ metadata:
   name: spegel
   labels:
     pod-security.kubernetes.io/enforce: privileged
-    topolvm.io/webhook: ignore
diff --git a/clustertool/embed/generic/kubernetes/system/volsync/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/volsync/app/namespace.yaml
index ba5549b0ffa..7887bf0ba82 100644
--- a/clustertool/embed/generic/kubernetes/system/volsync/app/namespace.yaml
+++ b/clustertool/embed/generic/kubernetes/system/volsync/app/namespace.yaml
@@ -4,4 +4,3 @@ metadata:
   name: volsync
   labels:
     pod-security.kubernetes.io/enforce: privileged
-    topolvm.io/webhook: ignore