diff --git a/tests/data/virtual-server-configmap-keys/configmap-ssl-keys-invalid.yaml b/tests/data/virtual-server-configmap-keys/configmap-ssl-keys-invalid.yaml index 5c9e02c76d..3b26fc0663 100644 --- a/tests/data/virtual-server-configmap-keys/configmap-ssl-keys-invalid.yaml +++ b/tests/data/virtual-server-configmap-keys/configmap-ssl-keys-invalid.yaml @@ -4,6 +4,5 @@ metadata: name: nginx-config namespace: nginx-ingress data: - ssl-redirect: "invalid" proxy-protocol: "invalid" http2: "invalid" \ No newline at end of file diff --git a/tests/data/virtual-server-configmap-keys/configmap-ssl-keys.yaml b/tests/data/virtual-server-configmap-keys/configmap-ssl-keys.yaml index dd4ab526e8..d16f1764ce 100644 --- a/tests/data/virtual-server-configmap-keys/configmap-ssl-keys.yaml +++ b/tests/data/virtual-server-configmap-keys/configmap-ssl-keys.yaml @@ -4,6 +4,5 @@ metadata: name: nginx-config namespace: nginx-ingress data: - ssl-redirect: "false" proxy-protocol: "true" http2: "true" \ No newline at end of file diff --git a/tests/data/virtual-server-configmap-keys/configmap-validation-keys-invalid-oss.yaml b/tests/data/virtual-server-configmap-keys/configmap-validation-keys-invalid-oss.yaml index 32ae60a40c..1dd44ff187 100644 --- a/tests/data/virtual-server-configmap-keys/configmap-validation-keys-invalid-oss.yaml +++ b/tests/data/virtual-server-configmap-keys/configmap-validation-keys-invalid-oss.yaml @@ -10,5 +10,4 @@ data: lb-method: "least_time header inflight" # plus only max-fails: "invalid" keepalive: "invalid" - proxy-protocol: "invalid proxy" - redirect-to-https: "invalid" \ No newline at end of file + proxy-protocol: "invalid proxy" \ No newline at end of file diff --git a/tests/data/virtual-server-configmap-keys/configmap-validation-keys-invalid.yaml b/tests/data/virtual-server-configmap-keys/configmap-validation-keys-invalid.yaml index d5f0324c24..7ae39d5512 100644 --- a/tests/data/virtual-server-configmap-keys/configmap-validation-keys-invalid.yaml +++ b/tests/data/virtual-server-configmap-keys/configmap-validation-keys-invalid.yaml @@ -11,6 +11,5 @@ data: max-fails: "invalid" keepalive: "invalid" proxy-protocol: "invalid proxy" - redirect-to-https: "invalid" variables-hash-bucket-size: "0" variables-hash-max-size: "-1024" \ No newline at end of file diff --git a/tests/data/virtual-server-configmap-keys/configmap-validation-keys-oss.yaml b/tests/data/virtual-server-configmap-keys/configmap-validation-keys-oss.yaml index 10445b74f9..3bd59c97bf 100644 --- a/tests/data/virtual-server-configmap-keys/configmap-validation-keys-oss.yaml +++ b/tests/data/virtual-server-configmap-keys/configmap-validation-keys-oss.yaml @@ -11,5 +11,4 @@ data: max-fails: "3" keepalive: "32" proxy-protocol: "true" - redirect-to-https: "true" upstream-zone-size: "0" # special value \ No newline at end of file diff --git a/tests/data/virtual-server-configmap-keys/configmap-validation-keys.yaml b/tests/data/virtual-server-configmap-keys/configmap-validation-keys.yaml index dc172070a9..75f99f24c8 100644 --- a/tests/data/virtual-server-configmap-keys/configmap-validation-keys.yaml +++ b/tests/data/virtual-server-configmap-keys/configmap-validation-keys.yaml @@ -11,7 +11,6 @@ data: max-fails: "3" keepalive: "32" proxy-protocol: "true" - redirect-to-https: "true" upstream-zone-size: "0" # special value variables-hash-bucket-size: "512" variables-hash-max-size: "2048" \ No newline at end of file diff --git a/tests/suite/test_virtual_server_configmap_keys.py b/tests/suite/test_virtual_server_configmap_keys.py index e1ab66278b..4fdb4277a9 100644 --- a/tests/suite/test_virtual_server_configmap_keys.py +++ b/tests/suite/test_virtual_server_configmap_keys.py @@ -53,7 +53,6 @@ def assert_keys_with_validation(config, expected_values): assert f"max_fails={expected_values['max-fails']}" in config assert f"keepalive {expected_values['keepalive']};" in config assert "listen 80 proxy_protocol;" in config - assert "if ($http_x_forwarded_proto = 'http') {" in config def assert_keys_with_validation_in_main_config(config, expected_values): @@ -84,7 +83,6 @@ def assert_defaults_of_keys_with_validation(config, unexpected_values): assert "max_fails=1" in config assert "keepalive" not in config assert "listen 80;" in config - assert "if ($http_x_forwarded_proto = 'http') {" not in config assert "server_tokens \"on\"" in config assert "random two least_conn;" in config and unexpected_values['lb-method'] not in config assert f"proxy_send_timeout 60s;" in config