diff --git a/scripts/delete-collector.sh b/scripts/delete-collector.sh deleted file mode 100755 index 6edec13b..00000000 --- a/scripts/delete-collector.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# Initialization -SCRIPT_DIR=$(dirname "$0") - -# shellcheck disable=SC1091 # Not following. -source "$SCRIPT_DIR"/init-env.sh -# shellcheck disable=SC1091 # Not following. -source "$SCRIPT_DIR"/logging.sh - -CHECKOUT_FOLDER=collector-deployment -rm -rf ${CHECKOUT_FOLDER} - -log_info "Cloning collector" -# git clone "$COLLECTOR_URL" -b "$COLLECTOR_TAG" "${CHECKOUT_FOLDER}" || exit 1 # TODO: uncomment this line when COLLECTOR_TAG is ready -git clone "$COLLECTOR_URL" "${CHECKOUT_FOLDER}" || exit 1 - -pushd "${CHECKOUT_FOLDER}" || exit 1 - -log_info "Deleting collector" -make delete-collector - -log_info "Deploying MySQL" -make delete-mysql - -popd || exit 1 - -# Delete the checkout folder after installation. -log_info "Removing collector checkout folder ${CHECKOUT_FOLDER}" -rm -rf "${CHECKOUT_FOLDER}" diff --git a/scripts/deploy-collector.sh b/scripts/deploy-collector.sh deleted file mode 100755 index 817a3603..00000000 --- a/scripts/deploy-collector.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# Initialization -SCRIPT_DIR=$(dirname "$0") - -# shellcheck disable=SC1091 # Not following. -source "$SCRIPT_DIR"/init-env.sh -# shellcheck disable=SC1091 # Not following. -source "$SCRIPT_DIR"/logging.sh - -CHECKOUT_FOLDER=collector-deployment -rm -rf ${CHECKOUT_FOLDER} - -log_info "Cloning collector" -# git clone "$COLLECTOR_URL" -b "$COLLECTOR_TAG" "${CHECKOUT_FOLDER}" || exit 1 # TODO: uncomment this line when COLLECTOR_TAG is ready -git clone "$COLLECTOR_URL" "${CHECKOUT_FOLDER}" || exit 1 - -pushd "${CHECKOUT_FOLDER}" || exit 1 - -log_info "Deploying MySQL" -make deploy-mysql - -log_info "Deploying collector" -make deploy-collector - -popd || exit 1 - -# Delete the checkout folder after installation. -log_info "Removing collector checkout folder ${CHECKOUT_FOLDER}" -rm -rf "${CHECKOUT_FOLDER}" diff --git a/scripts/deploy-multus-network.sh b/scripts/deploy-multus-network.sh index 5cb74b9e..179166cb 100755 --- a/scripts/deploy-multus-network.sh +++ b/scripts/deploy-multus-network.sh @@ -15,7 +15,7 @@ if $CERTSUITE_NON_OCP_CLUSTER; then oc rollout status daemonset calico-node -n kube-system --timeout="$CERTSUITE_DEPLOYMENT_TIMEOUT" rm -rf ./temp - git clone --depth 1 $MULTUS_GIT_URL -b v4.0.2 ./temp/multus-cni + git clone --depth 1 $MULTUS_GIT_URL -b v4.1.1 ./temp/multus-cni oc apply --filename ./temp/multus-cni/deployments/multus-daemonset.yml # Wait for all multus daemonset pods to be running diff --git a/scripts/init-env.sh b/scripts/init-env.sh index 73d3e6f2..3fe7959f 100755 --- a/scripts/init-env.sh +++ b/scripts/init-env.sh @@ -20,9 +20,6 @@ export \ OPERATOR_IMAGE_FULL_NAME=$REGISTRY$DIRECTORY$OPERATOR_IMAGE \ SECRET_NAME=foo-cert-sec -export COLLECTOR_URL=https://github.com/test-network-function/collector-deployment.git -# export COLLECTOR_TAG=v0.0.1 # Re-enable this when the version is released - # Truncate registry pod name if more than 63 characters if [[ ${#OPERATOR_REGISTRY_POD_NAME_FULL} -gt 63 ]]; then export OPERATOR_REGISTRY_POD_NAME=${OPERATOR_REGISTRY_POD_NAME_FULL: -63}