Skip to content

Commit 547b9e1

Browse files
authored
Update whereabouts to v0.6.3 (#404)
1 parent dc8916a commit 547b9e1

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

scripts/deploy-multus-network.sh

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ if $TNF_NON_OCP_CLUSTER; then
1616

1717
rm -rf ./temp
1818
git clone --depth 1 $MULTUS_GIT_URL -b v4.0.2 ./temp/multus-cni
19-
20-
# fix for dimensioning bug
21-
# sed 's/memory: "50Mi"/memory: "100Mi"/g' temp/multus-cni/deployments/multus-daemonset-thick.yml -i
22-
23-
# Deploy Multus
24-
# oc apply --filename ./temp/multus-cni/deployments/multus-daemonset-thick.yml
2519
oc apply --filename ./temp/multus-cni/deployments/multus-daemonset.yml
2620

2721
# Wait for all multus daemonset pods to be running
@@ -33,20 +27,14 @@ if $TNF_NON_OCP_CLUSTER; then
3327
./get_tools.sh
3428
./generate_yamls.sh
3529
popd || exit
36-
sed 's/alpine/quay.io\/jitesoft\/alpine:latest/g' temp/multus-cni/e2e/yamls/cni-install.yml -i
30+
31+
# Temporarily commenting this out as we are currently not running this in a non-allowlisted environment
32+
# sed 's/alpine/quay.io\/jitesoft\/alpine:latest/g' temp/multus-cni/e2e/yamls/cni-install.yml -i
3733
kubectl create -f temp/multus-cni/e2e/yamls/cni-install.yml
3834
kubectl -n kube-system wait --for=condition=ready -l name="cni-plugins" pod --timeout="$TNF_DEPLOYMENT_TIMEOUT"
3935

4036
# Install whereabouts at specific released version
41-
git clone $WHEREABOUTS_GIT_URL --depth 1 -b v0.6.2
42-
43-
# git clone $WHEREABOUTS_GIT_URL --depth 1
44-
pushd whereabouts || exit
45-
git checkout d15b4d5456ee910a81bf15e9e242a136823d22fd
46-
popd || exit
47-
48-
# Replace the image in the daemonset-install.yaml
49-
# sed 's/whereabouts\/whereabouts:latest-amd64/whereabouts\/whereabouts:v0.6.1-amd64/g' whereabouts/doc/crds/daemonset-install.yaml -i
37+
git clone $WHEREABOUTS_GIT_URL --depth 1 -b v0.6.3
5038

5139
oc apply \
5240
-f whereabouts/doc/crds/daemonset-install.yaml \

0 commit comments

Comments
 (0)