Merge pull request #9323 from travisn/backport-olm-build

build: Run mv outside the OLM_CATALOG_DIR (backport #9319)
rook · Dec 6, 2021 · c58765b · c58765b
2 parents 1292df0 + dfe97b3
commit c58765b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/deploy/olm/generate-rook-csv.sh b/deploy/olm/generate-rook-csv.sh
@@ -118,9 +118,10 @@ function cleanup() {
 function generate_csv(){
     pushd "$OLM_CATALOG_DIR" &> /dev/null
     "${OP_SDK_CMD[@]}" "$VERSION"
-    mv "$CSV_BUNDLE_PATH/olm.clusterserviceversion.yaml" "$CSV_FILE_NAME"
     popd &> /dev/null
 
+    mv "$CSV_BUNDLE_PATH/olm.clusterserviceversion.yaml" "$CSV_FILE_NAME"
+
     # cleanup to get the expected state before merging the real data from assembles
     "${YQ_CMD_DELETE[@]}" "$CSV_FILE_NAME" 'spec.icon[*]'
     "${YQ_CMD_DELETE[@]}" "$CSV_FILE_NAME" 'spec.installModes[*]'