Skip to content

Commit

Permalink
Store the bundle manifests in the bundle dir instead of deploy dir
Browse files Browse the repository at this point in the history
Bundle directory is the standard location for storing the bundle
manifests, metadata.

Signed-off-by: Malay Kumar Parida <[email protected]>
  • Loading branch information
malayparida2000 committed Sep 27, 2023
1 parent 8a75f6e commit e0a156c
Show file tree
Hide file tree
Showing 42 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.bundle
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

# Copy files to locations specified by labels.
COPY deploy/ocs-operator/manifests /manifests/
COPY deploy/ocs-operator/metadata /metadata/
COPY bundle/manifests /manifests/
COPY bundle/metadata /metadata/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion hack/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ GINKGO_TEST_SUITE="${GINKGO_TEST_SUITE:-ocs}"
# This env var allows developers to point to a custom oc tool that isn't in $PATH
# defaults to just using the 'oc' binary provided in $PATH
OCS_OC_PATH="${OCS_OC_PATH:-oc}"
OCS_FINAL_DIR="deploy/ocs-operator/manifests"
BUNDLE_MANIFESTS_DIR="bundle/manifests"
EXTRA_MANIFESTS_DIR="deploy/extra-manifests"

ROOK_CSV="$OUTDIR_TEMPLATES/rook-csv.yaml.in"
Expand Down
2 changes: 1 addition & 1 deletion hack/generate-unified-csv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ $CSV_MERGER \
--ocs-must-gather-image="$OCS_MUST_GATHER_IMAGE" \
--crds-directory="$OUTDIR_CRDS" \
--manifests-directory=$EXTRA_MANIFESTS_DIR \
--olm-bundle-directory="$OCS_FINAL_DIR" \
--olm-bundle-directory="$BUNDLE_MANIFESTS_DIR" \
--timestamp="$TIMESTAMP" \
--rook-csiaddons-image="$ROOK_CSIADDONS_IMAGE"
6 changes: 3 additions & 3 deletions hack/source-manifests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function dump_rook_csv() {
# This is the base CSV everything else gets merged into later on.
function gen_ocs_csv() {
echo "Generating OpenShift Container Storage CSV"
rm -rf "$(dirname $OCS_FINAL_DIR)"
rm -rf "$(dirname $BUNDLE_MANIFESTS_DIR)"
ocs_crds_outdir="$OUTDIR_CRDS/ocs"
rm -rf $OUTDIR_TEMPLATES/manifests/ocs-operator.clusterserviceversion.yaml
rm -rf $OCS_CSV
Expand All @@ -66,8 +66,8 @@ function gen_ocs_csv() {
pushd config/manager
$KUSTOMIZE edit set image ocs-dev/ocs-operator="$OCS_IMAGE"
popd
$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
$KUSTOMIZE build config/manifests | $OPERATOR_SDK generate bundle -q --package ocs-operator --version "$CSV_VERSION" --extra-service-accounts=ocs-metrics-exporter
mv $BUNDLE_MANIFESTS_DIR/*clusterserviceversion.yaml $OCS_CSV
cp config/crd/bases/* $ocs_crds_outdir
}

Expand Down

0 comments on commit e0a156c

Please sign in to comment.