Add kustomization files for each CRD (#2061)

tmshort · web-flow · commit 30fb077cfe08 · 2025-06-27T16:18:55.000Z
At the root of each CRD directory, there is a kustomization file.
Replicate this into the individual directories, so that they can be
referenced directly by overlays.

This keeps the "default" reference of `config/base/.../crd` to be the
standard CRD for compatibility with existing overlays.

The kustomizeconfig.yaml file is not used, and is deleted.

This is part of the feature-gated API functionality.

Signed-off-by: Todd Short &lt;tshort@redhat.com&gt;
diff --git a/config/base/catalogd/crd/experimental/kustomization.yaml b/config/base/catalogd/crd/experimental/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+- olm.operatorframework.io_clustercatalogs.yaml
diff --git a/config/base/catalogd/crd/kustomization.yaml b/config/base/catalogd/crd/kustomization.yaml
@@ -1,6 +1,4 @@
-# This kustomization.yaml is not intended to be run by itself,
-# since it depends on service name and namespace that are out of this kustomize package.
-# It should be run by config/default
+# This kustomization picks the standard CRD by default
+# If the experimental CRD is desired, select that directory explicitly
 resources:
-- standard/olm.operatorframework.io_clustercatalogs.yaml
-#+kubebuilder:scaffold:crdkustomizeresource
+- standard
diff --git a/config/base/catalogd/crd/standard/kustomization.yaml b/config/base/catalogd/crd/standard/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+- olm.operatorframework.io_clustercatalogs.yaml
diff --git a/config/base/operator-controller/crd/experimental/kustomization.yaml b/config/base/operator-controller/crd/experimental/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+- olm.operatorframework.io_clusterextensions.yaml
diff --git a/config/base/operator-controller/crd/kustomization.yaml b/config/base/operator-controller/crd/kustomization.yaml
@@ -1,9 +1,4 @@
-# This kustomization.yaml is not intended to be run by itself,
-# since it depends on service name and namespace that are out of this kustomize package.
-# It should be run by config/default
+# This kustomization picks the standard CRD by default
+# If the experimental CRD is desired, select that directory explicitly
 resources:
-- standard/olm.operatorframework.io_clusterextensions.yaml
-
-# the following config is for teaching kustomize how to do kustomization for CRDs.
-configurations:
-- kustomizeconfig.yaml
+- standard
diff --git a/config/base/operator-controller/crd/kustomizeconfig.yaml b/config/base/operator-controller/crd/kustomizeconfig.yaml
diff --git a/config/base/operator-controller/crd/standard/kustomization.yaml b/config/base/operator-controller/crd/standard/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+- olm.operatorframework.io_clusterextensions.yaml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+resources:`
	`2`	`+- olm.operatorframework.io_clustercatalogs.yaml`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+resources:`
	`2`	`+- olm.operatorframework.io_clusterextensions.yaml`