From 6ea0c81ff7955d8cd6646246984a4617bc789ec5 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Tue, 14 Jan 2025 00:33:25 +0800
Subject: [PATCH] fix(ingress-nginx): cleanup unused kustomizeconfig
 nameReference

was causing 'unknown field name' flux build ks errors in flux-local
---
 .mise.toml                                                 | 2 +-
 kube/clusters/biohazard/flux/kustomization.yaml            | 2 +-
 .../core/ingress/ingress-nginx/app/default-backend.yaml    | 1 +
 .../deploy/core/ingress/ingress-nginx/app/hr-external.yaml | 1 +
 .../deploy/core/ingress/ingress-nginx/app/hr-internal.yaml | 1 +
 kube/deploy/core/ingress/ingress-nginx/app/hr-public.yaml  | 1 +
 .../core/ingress/ingress-nginx/app/kustomizeconfig.yaml    | 7 -------
 kube/deploy/core/ingress/ingress-nginx/ks.yaml             | 2 --
 8 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.mise.toml b/.mise.toml
index d2101ccc..9bbf5b77 100644
--- a/.mise.toml
+++ b/.mise.toml
@@ -25,7 +25,7 @@ pipx_uvx = true
 "aqua:junegunn/fzf" = ["0.52.1"] # used by kubectx interactive mode
 "aqua:kubernetes-sigs/kustomize" = ["5.3.0"]
 helm = ["3.16.3"]
-"aqua:fluxcd/flux2" = ["2.2.3"]
+"aqua:fluxcd/flux2" = ["2.4.0"]
 "aqua:siderolabs/talos" = ["1.9.1"]
 "aqua:budimanjojo/talhelper" = ["3.0.12"]
 "aqua:go-task/task" = ["3.39.2"]
diff --git a/kube/clusters/biohazard/flux/kustomization.yaml b/kube/clusters/biohazard/flux/kustomization.yaml
index 7e4592cf..49cbcdd4 100644
--- a/kube/clusters/biohazard/flux/kustomization.yaml
+++ b/kube/clusters/biohazard/flux/kustomization.yaml
@@ -41,7 +41,7 @@ resources:
   - ../../../deploy/core/dns/external-dns/
   - ../../../deploy/core/ingress/_deps/
   - ../../../deploy/core/ingress/secrets-sync/
-  # - ../../../deploy/core/ingress/ingress-nginx/
+  - ../../../deploy/core/ingress/ingress-nginx/
   - ../../../deploy/core/ingress/cloudflare/
   - ../../../deploy/core/ingress/external-proxy-x/
   - ../../../deploy/core/db/pg/
diff --git a/kube/deploy/core/ingress/ingress-nginx/app/default-backend.yaml b/kube/deploy/core/ingress/ingress-nginx/app/default-backend.yaml
index ab23b00e..c91d97b5 100644
--- a/kube/deploy/core/ingress/ingress-nginx/app/default-backend.yaml
+++ b/kube/deploy/core/ingress/ingress-nginx/app/default-backend.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://flux.jank.ing/helmrelease-helm-v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
diff --git a/kube/deploy/core/ingress/ingress-nginx/app/hr-external.yaml b/kube/deploy/core/ingress/ingress-nginx/app/hr-external.yaml
index ecff27ad..1d950fee 100644
--- a/kube/deploy/core/ingress/ingress-nginx/app/hr-external.yaml
+++ b/kube/deploy/core/ingress/ingress-nginx/app/hr-external.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://flux.jank.ing/helmrelease-helm-v2beta2.json
 # this is for apps to be exposed but may not be for public usage, e.g. exposing authenticated media apps, NextCloud, etc
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
diff --git a/kube/deploy/core/ingress/ingress-nginx/app/hr-internal.yaml b/kube/deploy/core/ingress/ingress-nginx/app/hr-internal.yaml
index 43cab0c7..88334bc0 100644
--- a/kube/deploy/core/ingress/ingress-nginx/app/hr-internal.yaml
+++ b/kube/deploy/core/ingress/ingress-nginx/app/hr-internal.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://flux.jank.ing/helmrelease-helm-v2beta2.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
diff --git a/kube/deploy/core/ingress/ingress-nginx/app/hr-public.yaml b/kube/deploy/core/ingress/ingress-nginx/app/hr-public.yaml
index 9fb093dc..cc400461 100644
--- a/kube/deploy/core/ingress/ingress-nginx/app/hr-public.yaml
+++ b/kube/deploy/core/ingress/ingress-nginx/app/hr-public.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://flux.jank.ing/helmrelease-helm-v2beta2.json
 # this is for exposing apps meant for public usage, e.g. websites, social platforms, etc
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
diff --git a/kube/deploy/core/ingress/ingress-nginx/app/kustomizeconfig.yaml b/kube/deploy/core/ingress/ingress-nginx/app/kustomizeconfig.yaml
index 86991082..735ccd37 100644
--- a/kube/deploy/core/ingress/ingress-nginx/app/kustomizeconfig.yaml
+++ b/kube/deploy/core/ingress/ingress-nginx/app/kustomizeconfig.yaml
@@ -4,10 +4,3 @@ nameReference:
     fieldSpecs:
       - kind: HelmRelease
         path: spec/valuesFrom/name
-  - kind: ConfigMap
-    version: v1
-    fieldSpecs:
-      - kind: HelmRelease
-        name: default-backend
-        namespace: ingress
-        path: spec/values/persistence/config/name
diff --git a/kube/deploy/core/ingress/ingress-nginx/ks.yaml b/kube/deploy/core/ingress/ingress-nginx/ks.yaml
index 2e93c1ce..d0613212 100644
--- a/kube/deploy/core/ingress/ingress-nginx/ks.yaml
+++ b/kube/deploy/core/ingress/ingress-nginx/ks.yaml
@@ -4,8 +4,6 @@ kind: Kustomization
 metadata:
   name: 1-core-ingress-nginx-app
   namespace: flux-system
-  labels:
-    prune.flux.home.arpa/disabled: "true"
 spec:
   path: ./kube/deploy/core/ingress/ingress-nginx/app
   dependsOn: