Add invocation of olm-create-bundle.sh to build-controller-release.sh (…

…#207) Issue #, if available: 972 Description of changes: Adds `olm-create-bundle.sh` to the OLM conditional block of `build-controller-release.sh`. Also adds stripping the 'v' from `$BUNDLE_RELEASE` to prevent any breakage if the user has that variable including a 'v.' fixes aws-controllers-k8s/community#972 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Sep 24, 2021 · 2b0ac06 · 2b0ac06
1 parent e4d7c2a
commit 2b0ac06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/scripts/build-controller-release.sh b/scripts/build-controller-release.sh
@@ -252,4 +252,6 @@ if [[ $ACK_GENERATE_OLM == "true" ]]; then
     fi
 
     $ACK_GENERATE_BIN_PATH olm $ag_olm_args
+    $SCRIPTS_DIR/olm-create-bundle.sh "$SERVICE" "$olm_version"
+
 fi
diff --git a/scripts/olm-create-bundle.sh b/scripts/olm-create-bundle.sh
@@ -81,6 +81,7 @@ fi
 SERVICE=$(echo "$1" | tr '[:upper:]' '[:lower:]')
 VERSION=$2
 BUNDLE_VERSION=${BUNDLE_VERSION:-$VERSION}
+BUNDLE_VERSION=$(echo $BUNDLE_VERSION | tr -d "v")
 
 DEFAULT_SERVICE_CONTROLLER_SOURCE_PATH="$ROOT_DIR/../$SERVICE-controller"
 SERVICE_CONTROLLER_SOURCE_PATH=${SERVICE_CONTROLLER_SOURCE_PATH:-$DEFAULT_SERVICE_CONTROLLER_SOURCE_PATH}
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,4 +252,6 @@ if [[ $ACK_GENERATE_OLM == "true" ]]; then @@
         fi
         $ACK_GENERATE_BIN_PATH olm $ag_olm_args
+        $SCRIPTS_DIR/olm-create-bundle.sh "$SERVICE" "$olm_version"
     fi