From ae2243205db74cdfaba23066dd83d0a6c484c8b3 Mon Sep 17 00:00:00 2001
From: "Dimitri (__)" <5569570+f46b83ee9@users.noreply.github.com>
Date: Sun, 3 Nov 2024 17:38:19 +0000
Subject: [PATCH] fix(wherabouts): fix crd not being installed in helm

---
 .../{crds => templates}/whereabouts.cni.cncf.io_ippools.yaml | 5 +++--
 ...ereabouts.cni.cncf.io_overlappingrangeipreservations.yaml | 5 +++--
 packages/rke2-whereabouts/charts/values.yaml                 | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename packages/rke2-whereabouts/charts/{crds => templates}/whereabouts.cni.cncf.io_ippools.yaml (96%)
 rename packages/rke2-whereabouts/charts/{crds => templates}/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml (96%)

diff --git a/packages/rke2-whereabouts/charts/crds/whereabouts.cni.cncf.io_ippools.yaml b/packages/rke2-whereabouts/charts/templates/whereabouts.cni.cncf.io_ippools.yaml
similarity index 96%
rename from packages/rke2-whereabouts/charts/crds/whereabouts.cni.cncf.io_ippools.yaml
rename to packages/rke2-whereabouts/charts/templates/whereabouts.cni.cncf.io_ippools.yaml
index 266bc5ede..dd213d15a 100644
--- a/packages/rke2-whereabouts/charts/crds/whereabouts.cni.cncf.io_ippools.yaml
+++ b/packages/rke2-whereabouts/charts/templates/whereabouts.cni.cncf.io_ippools.yaml
@@ -1,4 +1,4 @@
----
+{{- if .Values.manifests.customResourceDefinition }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -68,4 +68,5 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
\ No newline at end of file
+    storage: true
+{{- end -}}
\ No newline at end of file
diff --git a/packages/rke2-whereabouts/charts/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml b/packages/rke2-whereabouts/charts/templates/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml
similarity index 96%
rename from packages/rke2-whereabouts/charts/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml
rename to packages/rke2-whereabouts/charts/templates/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml
index fbe90cf72..f1a67e729 100644
--- a/packages/rke2-whereabouts/charts/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml
+++ b/packages/rke2-whereabouts/charts/templates/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml
@@ -1,4 +1,4 @@
----
+{{- if .Values.manifests.customResourceDefinition }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -54,4 +54,5 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
\ No newline at end of file
+    storage: true
+{{- end -}}
\ No newline at end of file
diff --git a/packages/rke2-whereabouts/charts/values.yaml b/packages/rke2-whereabouts/charts/values.yaml
index 996084427..ab3e6b876 100644
--- a/packages/rke2-whereabouts/charts/values.yaml
+++ b/packages/rke2-whereabouts/charts/values.yaml
@@ -46,6 +46,9 @@ tolerations:
 
 affinity: {}
 
+manifests:
+  customResourceDefinition: true
+
 cniConf:
   confDir: /etc/cni/net.d
   binDir: /opt/cni/bin