File tree Expand file tree Collapse file tree 4 files changed +8
-5
lines changed Expand file tree Collapse file tree 4 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -6,5 +6,5 @@ curl https://raw.githubusercontent.com/projectcalico/calico/v3.28.0/manifests/ca
66 sed s/docker.io/quay.io/g > temp-calico.yaml
77
88# Deploy calico
9- oc create -f temp-calico.yaml
9+ oc apply -f temp-calico.yaml
1010rm temp-calico.yaml
Original file line number Diff line number Diff line change @@ -36,9 +36,12 @@ if $TNF_NON_OCP_CLUSTER; then
3636
3737 # Temporarily commenting this out as we are currently not running this in a non-allowlisted environment
3838 # sed 's/alpine/quay.io\/jitesoft\/alpine:latest/g' temp/multus-cni/e2e/yamls/cni-install.yml -i
39- kubectl create -f temp/multus-cni/e2e/yamls/cni-install.yml
39+ kubectl apply -f temp/multus-cni/e2e/yamls/cni-install.yml
4040 kubectl -n kube-system wait --for=condition=ready -l name=" cni-plugins" pod --timeout=" $TNF_DEPLOYMENT_TIMEOUT "
4141
42+ # If the whereabouts folder exists, remove it
43+ rm -rf whereabouts
44+
4245 # Install whereabouts at specific released version
4346 git clone $WHEREABOUTS_GIT_URL --depth 1 -b v0.6.3
4447
Original file line number Diff line number Diff line change 2121oc label namespace " $TNF_EXAMPLE_CNF_NAMESPACE " istio-injection=enabled --overwrite
2222if ! $TNF_NON_OCP_CLUSTER ; then
2323 oc adm policy add-scc-to-group anyuid system:serviceaccounts:" $TNF_EXAMPLE_CNF_NAMESPACE "
24- oc -n " $TNF_EXAMPLE_CNF_NAMESPACE " create -f ./test-target/nad-istio.yaml
24+ oc -n " $TNF_EXAMPLE_CNF_NAMESPACE " apply -f ./test-target/nad-istio.yaml
2525fi
Original file line number Diff line number Diff line change @@ -18,9 +18,9 @@ if [[ -z "$(which operator-sdk 2>/dev/null)" ]]; then
1818else
1919 echo " operator-sdk was found in the path, no need to install it"
2020fi
21- curl -L https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.26 .0/install.sh -o install.sh
21+ curl -L https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.28 .0/install.sh -o install.sh
2222chmod +x install.sh
23- ./install.sh v0.26 .0
23+ ./install.sh v0.28 .0
2424rm install.sh
2525
2626# Wait for all OLM pods to be ready
You can’t perform that action at this time.
0 commit comments