Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions tests/data/oidc/nginx-config-zs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: nginx-config
namespace: nginx-ingress
data:
zone-sync: "true"
resolver-addresses: kube-dns.kube-system.svc.cluster.local
resolver-valid: 5s
12 changes: 8 additions & 4 deletions tests/suite/test_oidc.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
oidc_vs_src = f"{TEST_DATA}/oidc/virtual-server.yaml"
orig_vs_src = f"{TEST_DATA}/virtual-server-tls/standard/virtual-server.yaml"
cm_src = f"{TEST_DATA}/oidc/nginx-config.yaml"
cm_zs_src = f"{TEST_DATA}/oidc/nginx-config-zs.yaml"
orig_cm_src = f"{DEPLOYMENTS}/common/nginx-config.yaml"
svc_src = f"{TEST_DATA}/oidc/nginx-ingress-headless.yaml"

Expand Down Expand Up @@ -126,6 +127,7 @@ def fin():
indirect=True,
)
class TestOIDC:
@pytest.mark.parametrize("configmap", [cm_src, cm_zs_src])
def test_oidc(
self,
request,
Expand All @@ -136,6 +138,7 @@ def test_oidc(
test_namespace,
virtual_server_setup,
keycloak_setup,
configmap,
):
print(f"Create oidc secret")
with open(oidc_secret_src) as f:
Expand All @@ -158,17 +161,18 @@ def test_oidc(
kube_apis.custom_objects, virtual_server_setup.vs_name, oidc_vs_src, test_namespace
)
wait_before_test()

print(f"Update nginx configmap")
replace_configmap_from_yaml(
kube_apis.v1,
ingress_controller_prerequisites.config_map["metadata"]["name"],
ingress_controller_prerequisites.namespace,
cm_src,
configmap,
)
wait_before_test()
print(f"Create headless service")
create_items_from_yaml(kube_apis, svc_src, ingress_controller_prerequisites.namespace)

if configmap == cm_src:
print(f"Create headless service")
create_items_from_yaml(kube_apis, svc_src, ingress_controller_prerequisites.namespace)

with sync_playwright() as playwright:
run_oidc(playwright.chromium, ingress_controller_endpoint.public_ip, ingress_controller_endpoint.port_ssl)
Expand Down
4 changes: 1 addition & 3 deletions tests/suite/test_zone_sync.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import pytest
from kubernetes.client.exceptions import ApiException
from settings import (
TEST_DATA,
)
from settings import TEST_DATA
from suite.utils.resources_utils import (
get_nginx_template_conf,
read_service,
Expand Down