Skip to content

Commit c484422

Browse files
authored
updating image format in olm create bundle to match the new image format (#204)
Issue #, if available: fixes aws-controllers-k8s/community#970 Description of changes: Update `olm-create-bundle` script to follow new image formate. This code follows the same format/intent as the `containerImage` template code. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent fe3ca1f commit c484422

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/olm-create-bundle.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
99
ROOT_DIR="$SCRIPTS_DIR/.."
1010
BUILD_DIR="$ROOT_DIR/build"
1111
DEFAULT_BUNDLE_CHANNEL="alpha"
12-
DEFAULT_SERVICE_CONTROLLER_CONTAINER_REPOSITORY="public.ecr.aws/aws-controllers-k8s/controller"
12+
DEFAULT_SERVICE_CONTROLLER_CONTAINER_REPOSITORY="public.ecr.aws/aws-controllers-k8s"
1313
PRESERVE=${PRESERVE:-"false"}
1414

1515
export DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1}
@@ -114,7 +114,7 @@ if [ -n "$AWS_SERVICE_DOCKER_IMG" ] && [ -n "$SERVICE_CONTROLLER_CONTAINER_REPOS
114114
fi
115115

116116
SERVICE_CONTROLLER_CONTAINER_REPOSITORY=${SERVICE_CONTROLLER_CONTAINER_REPOSITORY:-$DEFAULT_SERVICE_CONTROLLER_CONTAINER_REPOSITORY}
117-
DEFAULT_AWS_SERVICE_DOCKER_IMAGE="$SERVICE_CONTROLLER_CONTAINER_REPOSITORY:$SERVICE-$VERSION"
117+
DEFAULT_AWS_SERVICE_DOCKER_IMAGE="$SERVICE_CONTROLLER_CONTAINER_REPOSITORY/$SERVICE-controller:v$VERSION"
118118
AWS_SERVICE_DOCKER_IMG=${AWS_SERVICE_DOCKER_IMG:-$DEFAULT_AWS_SERVICE_DOCKER_IMAGE}
119119

120120
trap "clean_up" EXIT

0 commit comments

Comments
 (0)