lint

scripts/deploy-statefulset-test-pods.sh

@@ -16,9 +16,6 @@ if [[ $NUM_NODES == 1 ]]; then
 	REPLICAS=1
 fi
 
-MULTUS_ANNOTATION="${MULTUS_ANNOTATION%?}" # Remove the last character
-echo "MULTUS_ANNOTATION=$MULTUS_ANNOTATION"
-
 APP="testss" RESOURCE_TYPE="StatefulSet" MULTUS_ANNOTATION=$MULTUS_ANNOTATION REPLICAS=$REPLICAS "$SCRIPT_DIR"/mo ./test-target/local-pod-under-test.yaml >./temp/rendered-local-statefulset-pod-under-test-template.yaml
 oc apply --filename ./temp/rendered-local-statefulset-pod-under-test-template.yaml
 rm ./temp/rendered-local-statefulset-pod-under-test-template.yaml

scripts/deploy-test-pods.sh

@@ -17,9 +17,6 @@ if [[ $NUM_NODES == 1 ]]; then
 fi
 "$SCRIPT_DIR"/mo ./test-target/test-service-account.yaml >./temp/rendered-test-service-account-template.yaml
 
-MULTUS_ANNOTATION="${MULTUS_ANNOTATION%?}" # Remove the last character
-echo "MULTUS_ANNOTATION=$MULTUS_ANNOTATION"
-
 APP="testdp" RESOURCE_TYPE="Deployment" MULTUS_ANNOTATION=$MULTUS_ANNOTATION REPLICAS=$REPLICAS "$SCRIPT_DIR"/mo ./test-target/local-pod-under-test.yaml >./temp/rendered-local-pod-under-test-template.yaml
 oc apply --filename ./temp/rendered-test-service-account-template.yaml
 oc apply --filename ./temp/rendered-local-pod-under-test-template.yaml

scripts/init-env.sh

@@ -85,11 +85,9 @@ if $TNF_NON_OCP_CLUSTER; then
 
 	# IPv6
 	create_multus_annotation ipv6
-	if [ "$NUM" -ge 0 ]; then
-		# Remove last comma. Works on bash 3.2.4 on OS X:
-		#  https://unix.stackexchange.com/questions/144298/delete-the-last-character-of-a-string-using-string-manipulation-in-shell-script
-		export MULTUS_ANNOTATION="'[ ${MULTUS_ANNOTATION::-1} ]'"
-	fi
+
+	# Remove the last character (comma)
+	MULTUS_ANNOTATION="${MULTUS_ANNOTATION%?}"
 fi
 
 CPU_ARCH="$(uname -m)"