Skip to content

Commit 0b8380c

Browse files
authored
add zone-sync support to OIDC tests (#7440)
1 parent e8f0687 commit 0b8380c

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
kind: ConfigMap
2+
apiVersion: v1
3+
metadata:
4+
name: nginx-config
5+
namespace: nginx-ingress
6+
data:
7+
zone-sync: "true"
8+
resolver-addresses: kube-dns.kube-system.svc.cluster.local
9+
resolver-valid: 5s

tests/suite/test_oidc.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
oidc_vs_src = f"{TEST_DATA}/oidc/virtual-server.yaml"
3434
orig_vs_src = f"{TEST_DATA}/virtual-server-tls/standard/virtual-server.yaml"
3535
cm_src = f"{TEST_DATA}/oidc/nginx-config.yaml"
36+
cm_zs_src = f"{TEST_DATA}/oidc/nginx-config-zs.yaml"
3637
orig_cm_src = f"{DEPLOYMENTS}/common/nginx-config.yaml"
3738
svc_src = f"{TEST_DATA}/oidc/nginx-ingress-headless.yaml"
3839

@@ -126,6 +127,7 @@ def fin():
126127
indirect=True,
127128
)
128129
class TestOIDC:
130+
@pytest.mark.parametrize("configmap", [cm_src, cm_zs_src])
129131
def test_oidc(
130132
self,
131133
request,
@@ -136,6 +138,7 @@ def test_oidc(
136138
test_namespace,
137139
virtual_server_setup,
138140
keycloak_setup,
141+
configmap,
139142
):
140143
print(f"Create oidc secret")
141144
with open(oidc_secret_src) as f:
@@ -158,17 +161,18 @@ def test_oidc(
158161
kube_apis.custom_objects, virtual_server_setup.vs_name, oidc_vs_src, test_namespace
159162
)
160163
wait_before_test()
161-
162164
print(f"Update nginx configmap")
163165
replace_configmap_from_yaml(
164166
kube_apis.v1,
165167
ingress_controller_prerequisites.config_map["metadata"]["name"],
166168
ingress_controller_prerequisites.namespace,
167-
cm_src,
169+
configmap,
168170
)
169171
wait_before_test()
170-
print(f"Create headless service")
171-
create_items_from_yaml(kube_apis, svc_src, ingress_controller_prerequisites.namespace)
172+
173+
if configmap == cm_src:
174+
print(f"Create headless service")
175+
create_items_from_yaml(kube_apis, svc_src, ingress_controller_prerequisites.namespace)
172176

173177
with sync_playwright() as playwright:
174178
run_oidc(playwright.chromium, ingress_controller_endpoint.public_ip, ingress_controller_endpoint.port_ssl)

tests/suite/test_zone_sync.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import pytest
22
from kubernetes.client.exceptions import ApiException
3-
from settings import (
4-
TEST_DATA,
5-
)
3+
from settings import TEST_DATA
64
from suite.utils.resources_utils import (
75
get_nginx_template_conf,
86
read_service,

0 commit comments

Comments
 (0)