Merge branch 'main' into special-dp-adjustments

redhat-best-practices-for-k8s · Sep 17, 2024 · bda0a43 · bda0a43
2 parents 9e145f8 + 028a727
commit bda0a43
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 64 deletions.
diff --git a/scripts/delete-collector.sh b/scripts/delete-collector.sh
diff --git a/scripts/deploy-collector.sh b/scripts/deploy-collector.sh
diff --git 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
@@ -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}