Skip to content

Commit 835c172

Browse files
authored
Shamadi fix fsdiffpod (#32)
remove fsdiff dependency
1 parent 357b529 commit 835c172

File tree

5 files changed

+1
-136
lines changed

5 files changed

+1
-136
lines changed

deploy-partner-pods.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,8 @@ else
1313
echo "namespace ${NAMESPACE_TO_GENERATE} already exists, no reason to recreate"
1414
fi
1515

16-
if [[ -n "${TNF_MINIKUBE_ONLY}" ]] && [[ ${TNF_MINIKUBE_ONLY} = "true" ]]; then
17-
echo "Running with Minikube, no FsDiff pod created"
18-
else
19-
cat ./local-test-infra/fsdiff-deployment.yaml | ./script/mo > ./temp/rendered-fsdiff-template.yaml
20-
oc apply -f ./temp/rendered-fsdiff-template.yaml
21-
rm ./temp/rendered-fsdiff-template.yaml
22-
sleep 3
23-
oc wait pod -n $NAMESPACE_TO_GENERATE --for=condition=ready -l "app=node-master" --timeout=30s
24-
fi
25-
26-
2716
cat ./local-test-infra/local-partner-deployment.yaml | ./script/mo > ./temp/rendered-partner-template.yaml
2817
oc apply -f ./temp/rendered-partner-template.yaml
2918
rm ./temp/rendered-partner-template.yaml
3019
sleep 3
31-
oc wait pod -n $NAMESPACE_TO_GENERATE --for=condition=ready -l "app=partner" --timeout=30s
20+
oc wait pod -n $NAMESPACE_TO_GENERATE --for=condition=ready -l "app=partner" --timeout=30s

local-test-infra/fsdiff-deployment.yaml

Lines changed: 0 additions & 63 deletions
This file was deleted.

local-test-infra/fsdiff-pod.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

test-partner/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FROM registry.access.redhat.com/ubi7/ubi:latest
22

33
RUN yum install -y hostname iproute iputils openssh openssh-clients podman
4-
COPY diff-fs.sh /diff-fs.sh
54

65
CMD ["tail", "-f", "/dev/null"]

test-partner/diff-fs.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)