8000 Update NAP DoS test container (#3663) (#3857) · nginx/kubernetes-ingress@1af92da · GitHub
[go: up one dir, main page]
Skip to content

Commit 1af92da

Browse files
lucacomepasmant
lucacome
and
pasmant
authored
Update NAP DoS test container (#3663) (#3857)
* Update NAP DoS test container * Add to path - good_path.html (#3679) --------- Co-authored-by: pasmant <78279234+pasmant@users.noreply.github.com> (cherry picked from commit d7f795a)
1 parent 643f1b4 commit 1af92da

File tree

9 files changed

+34
-31
lines changed

9 files changed

+34
-31
lines changed

‎pyproject.toml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@ pythonpath = [
2323
addopts = "--tb=native -ra --disable-warnings -x -l --profile -v"
2424
log_cli = true
2525
markers =[
26-
"smoke",
27-
"vsr",
28-
"policies",
29-
"vs",
30-
"ts",
31-
"ingresses",
3226
"appprotect",
27+
"dos",
28+
"ingresses",
29+
"policies",
3330
"rewrite",
3431
"skip_for_nginx_oss",
32+
"smoke",
33+
"ts",
34+
"vs",
35+
"vsr",
3536
]
3637
testpaths = [
3738
"tests",

‎tests/data/common/app/dos/app.yaml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
apiVersion: v1
2-
kind: Service
3-
metadata:
4-
name: dos-svc
5-
spec:
6-
selector:
7-
app: dos-server
8-
ports:
9-
- protocol: "TCP"
10-
port: 80
11-
targetPort: 8080
12-
type: NodePort
13-
---
141
apiVersion: apps/v1
152
kind: Deployment
163
metadata:
@@ -27,10 +14,23 @@ spec:
2714
spec:
2815
containers:
2916
- name: dos-server
30-
image: nginxkic/test-dos-server:2.0.0
17+
image: ghcr.io/nginxinc/kic-test-dos-server:0.2.0
3118
imagePullPolicy: IfNotPresent
32-
command: ['sh', '-c', 'python3 /root/webserver.py; tail -f "/dev/null"']
33-
lifecycle:
34-
preStop:
35-
exec:
36-
command: ['sh', '-c', 'python3 /root/webserver.py;']
19+
ports:
20+
- containerPort: 8000
21+
name: http
22+
protocol: TCP
23+
---
24+
apiVersion: v1
25+
kind: Service
26+
metadata:
27+
name: dos-svc
28+
spec:
29+
selector:
30+
app: dos-server
31+
ports:
32+
- name: http
33+
targetPort: 8000
34+
port: 80
35+
protocol: TCP
36+
type: NodePort

‎tests/data/common/app/grpc-vs-mixed/app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: greeter
17-
image: ghcr.io/nginxinc/kic-test-grpc-server:0.1.2
17+
image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.0
1818
ports:
1919
- containerPort: 50051
2020
---

‎tests/data/common/app/grpc-vs/app.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: greeter
17-
image: ghcr.io/nginxinc/kic-test-grpc-server:0.1.2
17+
image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.0
1818
ports:
1919
- containerPort: 50051
2020
---
@@ -47,7 +47,7 @@ spec:
4747
spec:
4848
containers:
4949
- name: greeter
50-
image: ghcr.io/nginxinc/kic-test-grpc-server:0.1.2
50+
image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.0
5151
ports:
5252
- containerPort: 50051
5353
---

‎tests/data/common/app/grpc/app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: greeter
17-
image: ghcr.io/nginxinc/kic-test-grpc-server:0.1.2
17+
image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.0
1818
ports:
1919
- containerPort: 50051
2020
---

‎tests/data/transport-server-tcp-load-balance/standard/service_deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: tcp-service
17-
image: ghcr.io/nginxinc/kic-test-tcp-server:0.1.2
17+
image: ghcr.io/nginxinc/kic-test-tcp-server:0.2.0
1818
ports:
1919
- containerPort: 3333
2020
name: tcp-server

‎tests/data/transport-server-udp-load-balance/standard/service_deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: udp-service
17-
image: ghcr.io/nginxinc/kic-test-udp-server:0.1.2
17+
image: ghcr.io/nginxinc/kic-test-udp-server:0.2.0
1818
ports:
1919
- containerPort: 3334
2020
name: udp-server

‎tests/suite/test_virtual_server_dos.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def virtual_server_setup_dos(request, kube_apis, ingress_controller_endpoint, te
6161
vs_name = create_virtual_server_from_yaml(kube_apis.custom_objects, vs_source, test_namespace)
6262
vs_host = get_first_host_from_yaml(vs_source)
6363
vs_paths = get_paths_from_vs_yaml(vs_source)
64+
vs_paths[0] += f"good_path.html"
6465
if request.param["app_type"]:
6566
create_example_app(kube_apis, request.param["app_type"], test_namespace)
6667
wait_until_all_pods_are_ready(kube_apis.v1, test_namespace)

‎tests/suite/utils/resources_utils.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ def are_all_pods_in_ready_state(v1: CoreV1Api, namespace) -> bool:
323323
return False
324324
pod_ready_amount = 0
325325
for pod in pods.items:
326+
print(f"Pod {pod.metadata.name} has image {pod.spec.containers[0].image}")
326327
if pod.status.conditions is None:
327328
return False
328329
for condition in pod.status.conditions:

0 commit comments

Comments
 (0)
0