Skip to content

Commit

Permalink
Addressing comments from Brandon and David
Browse files Browse the repository at this point in the history
  • Loading branch information
edcdavid committed May 15, 2024
1 parent 48f78b3 commit 71ed086
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 4 additions & 2 deletions scripts/deploy-multus-network.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ if $TNF_NON_OCP_CLUSTER; then
# Install macvlan and other default plugins
echo "## install CNIs"
pushd temp/multus-cni/e2e || exit
./get_tools.sh
if [ "${ARCH}" != arm64 ]; then
./get_tools.sh
fi
./generate_yamls.sh
popd || exit

if [ "$CPU_ARCH" == "arm64" ]; then
if [ "$CPU_ARCH" == arm64 ]; then
sed -i 's/amd64/arm64/g' temp/multus-cni/e2e/yamls/cni-install.yml
fi

Expand Down
5 changes: 3 additions & 2 deletions scripts/init-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ OPERATOR_REGISTRY_POD_NAME_FULL=$(echo $OPERATOR_BUNDLE_IMAGE_FULL_NAME | sed 's
export \
COMMUNITY_OPERATOR_IMAGEREPO=docker.io/hazelcast \
COMMUNITY_OPERATOR_BASE=hazelcast-platform-operator \
COMMUNITY_OPERATOR_NAME=hazelcast-platform-operator.v5.10.0 \
COMMUNITY_OPERATOR_IMAGEVERSION=5.10.0 \
COMMUNITY_OPERATOR_NAME=hazelcast-platform-operator.v5.12.0 \
COMMUNITY_OPERATOR_IMAGEVERSION=5.12.0 \
OPERATOR_IMAGE_FULL_NAME=$REGISTRY$DIRECTORY$OPERATOR_IMAGE \
SECRET_NAME=foo-cert-sec

Expand Down Expand Up @@ -87,6 +87,7 @@ if $TNF_NON_OCP_CLUSTER; then
create_multus_annotation ipv6

# Remove the last character (comma)
# https://unix.stackexchange.com/questions/144298/delete-the-last-character-of-a-string-using-string-manipulation-in-shell-script
MULTUS_ANNOTATION="${MULTUS_ANNOTATION%?}"
fi

Expand Down

0 comments on commit 71ed086

Please sign in to comment.