Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
edcdavid committed May 15, 2024
1 parent dd4c834 commit 2aa5634
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion scripts/deploy-multus-network.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if $TNF_NON_OCP_CLUSTER; then
if [ "$CPU_ARCH" == "arm64" ]; then
sed -i 's/amd64/arm64/g' temp/multus-cni/e2e/yamls/cni-install.yml
fi

# Temporarily commenting this out as we are currently not running this in a non-allowlisted environment
# sed 's/alpine/quay.io\/jitesoft\/alpine:latest/g' temp/multus-cni/e2e/yamls/cni-install.yml -i
kubectl create -f temp/multus-cni/e2e/yamls/cni-install.yml
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy-statefulset-test-pods.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [[ $NUM_NODES == 1 ]]; then
REPLICAS=1
fi

MULTUS_ANNOTATION="${MULTUS_ANNOTATION%?}" # Remove the last character
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
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy-test-pods.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ 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
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
Expand Down
1 change: 0 additions & 1 deletion scripts/init-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ create_multus_annotation() {
done
}


# Only add annotation in non OCP clusters
if $TNF_NON_OCP_CLUSTER; then
echo 'creating multus annotations'
Expand Down
2 changes: 1 addition & 1 deletion scripts/preload-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ IMAGES_TO_PRELOAD=(
# Preload images
for image in "${IMAGES_TO_PRELOAD[@]}"; do
${CONTAINER_CLIENT} pull "$image"
${CONTAINER_CLIENT} save "$image" -o image.tar && kind load image-archive image.tar && rm image.tar
${CONTAINER_CLIENT} save "$image" -o image.tar && kind load image-archive image.tar && rm image.tar
done

0 comments on commit 2aa5634

Please sign in to comment.