WIP: pulling in CRDs as files

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

Makefile

@@ -166,11 +166,16 @@ manifests: $(CONTROLLER_GEN) $(KUSTOMIZE) #EXHELP Generate WebhookConfiguration,
 	$(KUSTOMIZE) build $(KUSTOMIZE_EXPERIMENTAL_OVERLAY) > $(EXPERIMENTAL_MANIFEST)
 	$(KUSTOMIZE) build $(KUSTOMIZE_EXPERIMENTAL_E2E_OVERLAY) > $(EXPERIMENTAL_E2E_MANIFEST)
 
+BASE_COPY := helm/olmv1/base
 helm-manifests: #EXHELP WIP: Make manifests via helm
-	helm template olmv1 helm/olmv1 --values helm/standard.yaml > $(STANDARD_MANIFEST)
-	helm template olmv1 helm/olmv1 --values helm/standard-e2e.yaml > $(STANDARD_E2E_MANIFEST)
-	helm template olmv1 helm/olmv1 --values helm/experimental.yaml > $(EXPERIMENTAL_MANIFEST)
-	helm template olmv1 helm/olmv1 --values helm/experimental-e2e.yaml > $(EXPERIMENTAL_E2E_MANIFEST)
+	rm -rf $(BASE_COPY)
+	mkdir -p $(BASE_COPY)
+	cp -r config/base/* $(BASE_COPY)
+	helm template olmv1 helm/olmv1 --values helm/standard.yaml > $(STANDARD_MANIFEST:.yaml=-helm.yaml)
+	helm template olmv1 helm/olmv1 --values helm/standard-e2e.yaml > $(STANDARD_E2E_MANIFEST:.yaml=-helm.yaml)
+	helm template olmv1 helm/olmv1 --values helm/experimental.yaml > $(EXPERIMENTAL_MANIFEST:.yaml=-helm.yaml)
+	helm template olmv1 helm/olmv1 --values helm/experimental-e2e.yaml > $(EXPERIMENTAL_E2E_MANIFEST:.yaml=-helm.yaml)
+	rm -rf $(BASE_COPY)
 
 .PHONY: generate
 generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

helm/olmv1/crds/experimental.clustercatalog.crd.yaml

@@ -1,8 +1,8 @@
 {{- if .Values.components.catalogd.enabled }}
 {{- if or (eq .Values.featureSet "standard") (eq .Values.featureSet "standard-e2e") }}
-{{ .Files.Get "crds/standard.clustercatalog.crd.yaml" }}
+{{ .Files.Get "base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml" }}
 {{- end }}
 {{- if or (eq .Values.featureSet "experimental") (eq .Values.featureSet "experimental-e2e") }}
-{{ .Files.Get "crds/experimental.clustercatalog.crd.yaml" }}
+{{ .Files.Get "base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml" }}
 {{- end }}
 {{- end }}

helm/olmv1/crds/experimental.clusterextension.crd.yaml

@@ -1,8 +1,8 @@
 {{- if .Values.components.operatorController.enabled }}
 {{- if or (eq .Values.featureSet "standard") (eq .Values.featureSet "standard-e2e") }}
-{{ .Files.Get "crds/standard.clusterextension.crd.yaml" }}
+{{ .Files.Get "base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml" }}
 {{- end }}
 {{- if or (eq .Values.featureSet "experimental") (eq .Values.featureSet "experimental-e2e") }}
-{{ .Files.Get "crds/experimental.clusterextension.crd.yaml" }}
+{{ .Files.Get "base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml" }}
 {{- end }}
 {{- end }}