From 8a75f6e470057a1ab2d584d941caeed0c2fcd4e9 Mon Sep 17 00:00:00 2001 From: Malay Kumar Parida Date: Thu, 28 Sep 2023 01:33:44 +0530 Subject: [PATCH] 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 --- .../bases/ocs-operator.clusterserviceversion.yaml | 0 config/manifests/kustomization.yaml | 4 ++++ config/manifests/ocs-operator/kustomization.yaml | 4 ---- hack/source-manifests.sh | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-) rename config/manifests/{ocs-operator => }/bases/ocs-operator.clusterserviceversion.yaml (100%) create mode 100644 config/manifests/kustomization.yaml delete mode 100644 config/manifests/ocs-operator/kustomization.yaml diff --git a/config/manifests/ocs-operator/bases/ocs-operator.clusterserviceversion.yaml b/config/manifests/bases/ocs-operator.clusterserviceversion.yaml similarity index 100% rename from config/manifests/ocs-operator/bases/ocs-operator.clusterserviceversion.yaml rename to config/manifests/bases/ocs-operator.clusterserviceversion.yaml diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml new file mode 100644 index 0000000000..32dbc65ce4 --- /dev/null +++ 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 deleted file mode 100644 index de0a3a75f0..0000000000 --- a/config/manifests/ocs-operator/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -resources: -- ../../default -- ../../samples -# - ../../scorecard diff --git a/hack/source-manifests.sh b/hack/source-manifests.sh index 73fa2299bd..839f80fb45 100755 --- 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 }