Skip to content

Commit b4a20bb

Browse files
edcdavidjc-rh
andauthored
Remove partner pod code doc update (#68)
* removing partner pod * remove remaining references to TPP and tnfpartner Co-authored-by: Jun Chen <[email protected]>
1 parent b2e44d6 commit b4a20bb

File tree

8 files changed

+6
-180
lines changed

8 files changed

+6
-180
lines changed

.github/actions/create-local-test-infra-resources/action.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ inputs:
1919
put_pod_name_env_var:
2020
description: "The environment variable the test pod's name will be saved to"
2121
default: PUT_POD_NAME
22-
tpp_pod_label_app:
23-
description: "The expected value of the partner pod's `app` label"
24-
default: tnfpartner
25-
tpp_pod_name_env_var:
26-
description: "The environment variable the partner pod's name will be saved to"
27-
default: TPP_POD_NAME
2822

2923
runs:
3024
using: 'composite'
@@ -46,10 +40,6 @@ runs:
4640
run: oc wait deployment ${{ inputs.put_deployment_name }} --for=condition=available --timeout=${{ inputs.oc_pod_timeout }}
4741
shell: bash
4842

49-
- name: (TPP) Wait for the partner pod to be ready
50-
run: oc wait pod --for=condition=ready -l "app=${{ inputs.tpp_pod_label_app }}" --timeout=${{ inputs.oc_pod_timeout }} -n ${{ inputs.default_namespace }}
51-
shell: bash
52-
5343
- name: Display all pods in namespace
5444
run: oc get pods -o wide
5545
shell: bash
@@ -58,24 +48,13 @@ runs:
5848
run: '[[ $(oc get pods -l "app=${{ inputs.put_pod_label_app }}" -o name | wc -l) -eq "2" ]]'
5949
shell: bash
6050

61-
- name: (TPP) Ensure only one pod with the label is present
62-
run: '[[ $(oc get pods -l "app=${{ inputs.tpp_pod_label_app }}" -n ${{ inputs.default_namespace }} -o name | wc -l) -eq "1" ]]'
63-
shell: bash
64-
6551
- name: (PUT) Discover the name of the first test pod
6652
run: |
6753
PUT_POD_NAME=$(oc get pods -l 'app=${{ inputs.put_pod_label_app }}' -o jsonpath='{.items[0].metadata.name}')
6854
echo "${{ inputs.put_pod_name_env_var }}=$PUT_POD_NAME" >> $GITHUB_ENV
6955
shell: bash
7056

71-
- name: (TPP) Discover the name of the partner pod
72-
run: |
73-
TPP_POD_NAME=$(oc get pods -n ${{ inputs.default_namespace }} -l 'app=${{ inputs.tpp_pod_label_app }}' -o jsonpath='{.items[0].metadata.name}')
74-
echo "${{ inputs.tpp_pod_name_env_var }}=$TPP_POD_NAME" >> $GITHUB_ENV
75-
shell: bash
76-
7757
- name: Display auto-discovered pod names
7858
run: |
7959
echo "(PUT) test pod name: $${{ inputs.put_pod_name_env_var }}"
80-
echo "(TPP) partner pod name: $${{ inputs.tpp_pod_name_env_var }}"
8160
shell: bash

.github/workflows/local-test-infra.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,6 @@ jobs:
3838
- name: '(test pod) Test: Check if ssh is installed'
3939
run: oc exec -i $PUT_POD_NAME -c $PUT_CONTAINER_NAME -- which ssh
4040

41-
# Tests for the partner pod (TPP)
42-
43-
- name: '(partner pod) Test: Check if ping is installed'
44-
run: oc exec -i $TPP_POD_NAME -c $TPP_CONTAINER_NAME -n $DEFAULT_NAMESPACE -- which ping
45-
46-
- name: '(partner pod) Test: Check if ip is installed'
47-
run: oc exec -i $TPP_POD_NAME -c $TPP_CONTAINER_NAME -n $DEFAULT_NAMESPACE -- which ip
48-
49-
- name: '(partner pod) Test: Check if ssh is installed'
50-
run: oc exec -i $TPP_POD_NAME -c $TPP_CONTAINER_NAME -n $DEFAULT_NAMESPACE -- which ssh
51-
5241
# Cleanup
5342

5443
- name: Delete OpenShift resources

.github/workflows/partner-pod.yaml

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

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
install:
77
./scripts/fix-minikube-labels.sh
88
./scripts/deploy-multus-network.sh
9-
./scripts/deploy-partner-pods.sh
109
./scripts/deploy-test-pods.sh
1110
./scripts/deploy-hpa.sh
1211
./scripts/deploy-operator.sh
@@ -19,7 +18,6 @@ rebuild-minikube:
1918

2019
# deploys the partner pods
2120
install-partner-pods:
22-
./scripts/deploy-partner-pods.sh
2321
./scripts/deploy-debug-ds.sh
2422

2523
# Instal operator requires OLM and operator SDK

README.md

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,36 @@
11
# CNF Certification Partner
22

33
This repository contains two main sections:
4-
* test-partner: Partner pods definition for use on a k8s CNF Certification cluster.
4+
* test-partner: Partner debug pods definition for use on a k8s CNF Certification cluster. Used to run platform and networking tests.
55
* test-target: A trivial example CNF (including a replicaset/deployment, a CRD and an operator), primarily intended to be used to run [test-network-function](https://github.com/test-network-function/test-network-function) test suites on a development machine.
66

7-
Together, they make up the basic infrastructure required for "testing the tester".
7+
Together, they make up the basic infrastructure required for "testing the tester". The partner debug pod is always required for platform tests and networking tests.
88

99
# Glossary
1010

1111
* Pod Under Test (PUT): The Vendor Pod, usually provided by a CNF Partner.
1212
* Operator Under Test (OT): The Vendor Operator, usually provided by a CNF Partner.
13-
* Test Partner Pod (TPP): A Universal Base Image (UBI) Pod containing the test tools and dependencies to act as a traffic workload generator or receiver. For generic cases, this currently includes ICMPv4 only.
1413
* Debug Pod (DP): A Pod running [a UBI8-based support image](https://quay.io/repository/testnetworkfunction/debug-partner) deployed as part of a daemon set for accessing node information. DPs is deployed in "default" namespace
1514
* CRD Under Test (CRD): A basic CustomResourceDefinition.
1615

1716

1817
# Namespace
1918

20-
By default, TPP and DP are deployed in "default" namespace. all the other deployment files in this repository use ``tnf`` as default namespace. A specific namespace can be configured using:
19+
By default, DP are deployed in "default" namespace. all the other deployment files in this repository use ``tnf`` as default namespace. A specific namespace can be configured using:
2120

2221
```shell-script
2322
export TNF_EXAMPLE_CNF_NAMESPACE="tnf" #tnf for example
2423
```
25-
# Test-partner
26-
27-
test-partner provides the basic configuration to create a CNF Test Partner Pod (TPP), which is used to verify proper operation of a Partner Vendor's Pod Under Test in a CNF Certification Cluster. The Pod is composed of a single container, which is based off Universal Base Image (UBI) 8. A minimal set of tools is installed on top of the base image to fulfill CNF Test dependency requirements:
28-
* iputils (for ping)
29-
* iproute (for ip)
30-
31-
If you are using a different test partner pod, please ensure you provide these or the image will be unable to run all CNF
32-
Certification tests.
33-
3424
## Cloning the repository
3525

3626
The repository can be cloned to local machine using:
3727

3828
```shell-script
3929
git clone [email protected]:test-network-function/cnf-certification-test-partner.git
4030
```
41-
## (Re)Building the container image
42-
43-
In order to build the test-partner image, the code should be [cloned locally](##cloning-the-repository). The following command should be issued:
44-
```shell-script
45-
docker build --no-cache -f Dockerfile -t testnetworkfunction/cnf-test-partner .
46-
```
47-
48-
If needed (and authorized) the following will update the stored image:
49-
50-
```shell-script
51-
docker push testnetworkfunction/cnf-test-partner
52-
```
53-
5431
## Installing the partner pod
5532

56-
In order to create and deploy the partner pod, use the following:
33+
In order to create and deploy the partner debug pods (daemonset), use the following:
5734

5835
```shell-script
5936
make install-partner-pods
@@ -114,7 +91,7 @@ To create the resources, issue the following command:
11491
make install
11592
```
11693

117-
This will create a PUT named "test" in `TNF_EXAMPLE_CNF_NAMESPACE` [namespace](#namespace), TPP named "tnfpartner" which can be used to run test suites, and Debug Daemonset named "debug". The
94+
This will create a PUT named "test" in `TNF_EXAMPLE_CNF_NAMESPACE` [namespace](#namespace) and Debug Daemonset named "debug". The
11895
example `tnf_config.yml` in [`test-network-function`](https://github.com/test-network-function/test-network-function)
11996
will use this local infrastructure by default.
12097

@@ -135,21 +112,9 @@ quay-io-testnetworkfunction-nginx-operator-bundle-v0-0-1 1/1 Runnin
135112
test-697ff58f87-88245 1/1 Running 0 2m20s 10.244.2.2 minikube-m03 <none> <none>
136113
test-697ff58f87-mfmpv 1/1 Running 0 2m20s 10.244.1.3 minikube-m02 <none> <none>
137114
```
138-
139-
To verify `partner` pod is running:
140-
141-
```shell-script
142-
oc get pods -n default -o wide
143-
```
144-
145-
You should see something like this (note that the 2 test pods are running on different nodes due to a anti-affinity rule):
146-
```shell-script
147-
NAME NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
148-
tnfpartner-678db9858c-f9p4f 1/1 Running 0 142m 10.244.4.2 minikube-m05 <none> <none>
149-
```
150115
## Delete local-test-infra
151116

152-
To tear down the local test infrastruture from the cluster, use the following command. It may take some time to completely stop the PUT, CRD, OT, DP and TPP:
117+
To tear down the local test infrastruture from the cluster, use the following command. It may take some time to completely stop the PUT, CRD, OT, and DP:
153118

154119
```shell-script
155120
make clean

scripts/delete-partner-pods.sh

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

scripts/deploy-partner-pods.sh

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

test-partner/partner-deployment.yaml

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

0 commit comments

Comments
 (0)