Skip to content

Commit 2b0ac06

Browse files
authored
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.
1 parent e4d7c2a commit 2b0ac06

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

scripts/build-controller-release.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,6 @@ if [[ $ACK_GENERATE_OLM == "true" ]]; then
252252
fi
253253

254254
$ACK_GENERATE_BIN_PATH olm $ag_olm_args
255+
$SCRIPTS_DIR/olm-create-bundle.sh "$SERVICE" "$olm_version"
256+
255257
fi

scripts/olm-create-bundle.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ fi
8181
SERVICE=$(echo "$1" | tr '[:upper:]' '[:lower:]')
8282
VERSION=$2
8383
BUNDLE_VERSION=${BUNDLE_VERSION:-$VERSION}
84+
BUNDLE_VERSION=$(echo $BUNDLE_VERSION | tr -d "v")
8485

8586
DEFAULT_SERVICE_CONTROLLER_SOURCE_PATH="$ROOT_DIR/../$SERVICE-controller"
8687
SERVICE_CONTROLLER_SOURCE_PATH=${SERVICE_CONTROLLER_SOURCE_PATH:-$DEFAULT_SERVICE_CONTROLLER_SOURCE_PATH}

0 commit comments

Comments
 (0)