Move ocs operator kustomize manifests to config/manifets

It's the standard location for this. During the removal of the fusion bundle generation scripts this was missed. Signed-off-by: Malay Kumar Parida <[email protected]>
red-hat-storage · Sep 27, 2023 · 8a75f6e · 8a75f6e
1 parent ebaf35b
commit 8a75f6e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/...s/ocs-operator.clusterserviceversion.yaml → ...s/ocs-operator.clusterserviceversion.yaml b/...s/ocs-operator.clusterserviceversion.yaml → ...s/ocs-operator.clusterserviceversion.yaml
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
@@ -0,0 +1,4 @@
+resources:
+- ../default
+- ../samples
+# - ../scorecard
diff --git a/config/manifests/ocs-operator/kustomization.yaml b/config/manifests/ocs-operator/kustomization.yaml
diff --git a/hack/source-manifests.sh b/hack/source-manifests.sh
@@ -62,14 +62,11 @@ function gen_ocs_csv() {
 	rm -rf $OCS_CSV
 	rm -rf $ocs_crds_outdir
 	mkdir -p $ocs_crds_outdir
-
-	gen_args="generate kustomize manifests --input-dir config/manifests/ocs-operator --output-dir config/manifests/ocs-operator --package ocs-operator -q"
-	# shellcheck disable=SC2086
-	$OPERATOR_SDK $gen_args
+	$OPERATOR_SDK generate kustomize manifests --package ocs-operator -q
 	pushd config/manager
 	$KUSTOMIZE edit set image ocs-dev/ocs-operator="$OCS_IMAGE"
 	popd
-	$KUSTOMIZE build config/manifests/ocs-operator | $OPERATOR_SDK generate bundle -q --overwrite=false --output-dir deploy/ocs-operator --kustomize-dir config/manifests/ocs-operator --package ocs-operator --version "$CSV_VERSION" --extra-service-accounts=ocs-metrics-exporter
+	$KUSTOMIZE build config/manifests | $OPERATOR_SDK generate bundle -q --overwrite=false --output-dir deploy/ocs-operator--package ocs-operator --version "$CSV_VERSION" --extra-service-accounts=ocs-metrics-exporter
 	mv deploy/ocs-operator/manifests/*clusterserviceversion.yaml $OCS_CSV
 	cp config/crd/bases/* $ocs_crds_outdir
 }