Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NAP DoS test container #3663

Merged
merged 3 commits into from
Mar 29, 2023
Merged

Update NAP DoS test container #3663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3d021d
Update NAP DoS test container
lucacome Mar 18, 2023
7f61232
Add to path - good_path.html (#3679)
pasmant Mar 22, 2023
14a82a8
Merge branch 'main' into chore/dos-test-container
lucacome Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@ pythonpath = [
addopts = "--tb=native -ra --disable-warnings -x -l --profile -v"
log_cli = true
markers =[
"smoke",
"vsr",
"policies",
"vs",
"ts",
"ingresses",
"appprotect",
"dos",
"ingresses",
"policies",
"rewrite",
"skip_for_nginx_oss",
"smoke",
"ts",
"vs",
"vsr",
]
testpaths = [
"tests",
Expand Down
38 changes: 19 additions & 19 deletions tests/data/common/app/dos/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
apiVersion: v1
kind: Service
metadata:
name: dos-svc
spec:
selector:
app: dos-server
ports:
- protocol: "TCP"
port: 80
targetPort: 8080
type: NodePort
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -27,10 +14,23 @@ spec:
spec:
containers:
- name: dos-server
image: nginxkic/test-dos-server:2.0.0
image: ghcr.io/nginxinc/kic-test-dos-server:0.2.0
imagePullPolicy: IfNotPresent
command: ['sh', '-c', 'python3 /root/webserver.py; tail -f "/dev/null"']
lifecycle:
preStop:
exec:
command: ['sh', '-c', 'python3 /root/webserver.py;']
ports:
- containerPort: 8000
name: http
protocol: TCP
---
apiVersion: v1
kind: Service
metadata:
name: dos-svc
spec:
selector:
app: dos-server
ports:
- name: http
targetPort: 8000
port: 80
protocol: TCP
type: NodePort
2 changes: 1 addition & 1 deletion tests/data/common/app/grpc-vs-mixed/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: greeter
image: ghcr.io/nginxinc/kic-test-grpc-server:0.1.2
image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.0
ports:
- containerPort: 50051
---
Expand Down
4 changes: 2 additions & 2 deletions tests/data/common/app/grpc-vs/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: greeter
image: ghcr.io/nginxinc/kic-test-grpc-server:0.1.2
image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.0
ports:
- containerPort: 50051
---
Expand Down Expand Up @@ -47,7 +47,7 @@ spec:
spec:
containers:
- name: greeter
image: ghcr.io/nginxinc/kic-test-grpc-server:0.1.2
image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.0
ports:
- containerPort: 50051
---
Expand Down
2 changes: 1 addition & 1 deletion tests/data/common/app/grpc/app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: greeter
image: ghcr.io/nginxinc/kic-test-grpc-server:0.1.2
image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.0
ports:
- containerPort: 50051
---
Expand Down
2 changes: 1 addition & 1 deletion tests/data/transport-server-tcp-load-balance/standard/service_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: tcp-service
image: ghcr.io/nginxinc/kic-test-tcp-server:0.1.2
image: ghcr.io/nginxinc/kic-test-tcp-server:0.2.0
ports:
- containerPort: 3333
name: tcp-server
Expand Down
2 changes: 1 addition & 1 deletion tests/data/transport-server-udp-load-balance/standard/service_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: udp-service
image: ghcr.io/nginxinc/kic-test-udp-server:0.1.2
image: ghcr.io/nginxinc/kic-test-udp-server:0.2.0
ports:
- containerPort: 3334
name: udp-server
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_virtual_server_dos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def virtual_server_setup_dos(request, kube_apis, ingress_controller_endpoint, te
vs_name = create_virtual_server_from_yaml(kube_apis.custom_objects, vs_source, test_namespace)
vs_host = get_first_host_from_yaml(vs_source)
vs_paths = get_paths_from_vs_yaml(vs_source)
vs_paths[0] += f"good_path.html"
if request.param["app_type"]:
create_example_app(kube_apis, request.param["app_type"], test_namespace)
wait_until_all_pods_are_ready(kube_apis.v1, test_namespace)
Expand Down
1 change: 1 addition & 0 deletions tests/suite/utils/resources_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ def are_all_pods_in_ready_state(v1: CoreV1Api, namespace) -> bool:
return False
pod_ready_amount = 0
for pod in pods.items:
print(f"Pod {pod.metadata.name} has image {pod.spec.containers[0].image}")
if pod.status.conditions is None:
return False
for condition in pod.status.conditions:
Expand Down