diff --git a/deploy-partner-pods.sh b/deploy-partner-pods.sh index da224c12..338763c5 100644 --- a/deploy-partner-pods.sh +++ b/deploy-partner-pods.sh @@ -13,19 +13,8 @@ else echo "namespace ${NAMESPACE_TO_GENERATE} already exists, no reason to recreate" fi -if [[ -n "${TNF_MINIKUBE_ONLY}" ]] && [[ ${TNF_MINIKUBE_ONLY} = "true" ]]; then - echo "Running with Minikube, no FsDiff pod created" -else - cat ./local-test-infra/fsdiff-deployment.yaml | ./script/mo > ./temp/rendered-fsdiff-template.yaml - oc apply -f ./temp/rendered-fsdiff-template.yaml - rm ./temp/rendered-fsdiff-template.yaml - sleep 3 - oc wait pod -n $NAMESPACE_TO_GENERATE --for=condition=ready -l "app=node-master" --timeout=30s -fi - - cat ./local-test-infra/local-partner-deployment.yaml | ./script/mo > ./temp/rendered-partner-template.yaml oc apply -f ./temp/rendered-partner-template.yaml rm ./temp/rendered-partner-template.yaml sleep 3 -oc wait pod -n $NAMESPACE_TO_GENERATE --for=condition=ready -l "app=partner" --timeout=30s \ No newline at end of file +oc wait pod -n $NAMESPACE_TO_GENERATE --for=condition=ready -l "app=partner" --timeout=30s diff --git a/local-test-infra/fsdiff-deployment.yaml b/local-test-infra/fsdiff-deployment.yaml deleted file mode 100644 index 59a5dcfe..00000000 --- a/local-test-infra/fsdiff-deployment.yaml +++ /dev/null @@ -1,63 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: node-master - namespace: {{ NAMESPACE_TO_GENERATE }} - test-network-function.com/generic: fs_diff_master -spec: - replicas: 1 - selector: - matchLabels: - app: node-master - template: - metadata: - labels: - app: node-master - test-network-function.com/generic: fs_diff_master - test-network-function.com/container: fs_diff_master - annotations: - test-network-function.com/defaultnetworkinterface: '"eth0"' # optional - name: node-master - spec: - # hostPID: true - containers: - - command: - - tail - - -f - - /dev/null - image: quay.io/testnetworkfunction/cnf-test-partner:latest # quay.io/testnetworkfunction/test-network-function - name: master - resources: - limits: - memory: 512Mi - cpu: 0.25 - volumeMounts: - - mountPath: /var/lib/containers - name: var-lib-containers - - mountPath: /var/run/containers - name: var-run-containers - - mountPath: /run/runc - name: runc-dir - - mountPath: /var/run/containers/storage/overlay-containers - name: overlay-containers - securityContext: - privileged: true - restartPolicy: Always - volumes: - - name: var-lib-containers - hostPath: - path: /var/lib/containers - type: Directory - - name: var-run-containers - hostPath: - path: /var/run/containers - type: Directory - - name: runc-dir - hostPath: - path: /run/runc - type: Directory - - name: overlay-containers - hostPath: - path: /var/run/containers/storage/overlay-containers - type: Directory diff --git a/local-test-infra/fsdiff-pod.yaml b/local-test-infra/fsdiff-pod.yaml deleted file mode 100755 index 5fbcef3c..00000000 --- a/local-test-infra/fsdiff-pod.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - labels: - app: node-master - test-network-function.com/generic: fs_diff_master - test-network-function.com/container: fs_diff_master - annotations: - test-network-function.com/defaultnetworkinterface: '"eth0"' # optional - name: node-master - namespace: {{ NAMESPACE_TO_GENERATE }} -spec: - # hostPID: true - containers: - - command: - - tail - - -f - - /dev/null - image: quay.io/testnetworkfunction/cnf-test-partner:latest # quay.io/testnetworkfunction/test-network-function - name: master - resources: - limits: - memory: 512Mi - cpu: 0.25 - volumeMounts: - - mountPath: /var/lib/containers - name: var-lib-containers - - mountPath: /var/run/containers - name: var-run-containers - - mountPath: /run/runc - name: runc-dir - - mountPath: /var/run/containers/storage/overlay-containers - name: overlay-containers - securityContext: - privileged: true - restartPolicy: Always - volumes: - - name: var-lib-containers - hostPath: - path: /var/lib/containers - type: Directory - - name: var-run-containers - hostPath: - path: /var/run/containers - type: Directory - - name: runc-dir - hostPath: - path: /run/runc - type: Directory - - name: overlay-containers - hostPath: - path: /var/run/containers/storage/overlay-containers - type: Directory \ No newline at end of file diff --git a/test-partner/Dockerfile b/test-partner/Dockerfile index 15cc1948..23b9630c 100644 --- a/test-partner/Dockerfile +++ b/test-partner/Dockerfile @@ -1,6 +1,5 @@ FROM registry.access.redhat.com/ubi7/ubi:latest RUN yum install -y hostname iproute iputils openssh openssh-clients podman -COPY diff-fs.sh /diff-fs.sh CMD ["tail", "-f", "/dev/null"] diff --git a/test-partner/diff-fs.sh b/test-partner/diff-fs.sh deleted file mode 100755 index 705e859a..00000000 --- a/test-partner/diff-fs.sh +++ /dev/null @@ -1,7 +0,0 @@ -result=`podman diff $1 | cut -d " " -f 2 | grep -E "(^/var/lib/rpm)|(^/var/lib/dpkg)|(^/bin)|(^/sbin)|(^/lib)|(^/lib64)|(^/usr/bin)|(^/usr/sbin)|(^/usr/lib)|(^/usr/lib64)"` -if [ -z "${result}" ] -then -echo empty -else -echo $result -fi \ No newline at end of file