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

Increase default upstream zone size for NGINX Plus #2009

Merged
merged 2 commits into from
Sep 27, 2021
Merged

Increase default upstream zone size for NGINX Plus #2009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75c3f94
Increase upstream zone size for NGINX Plus
pleshakov Sep 24, 2021
1a44c5a
Update python tests
pleshakov Sep 24, 2021
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
2 changes: 1 addition & 1 deletion cmd/nginx-ingress/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ func main() {
}
}

cfgParams := configs.NewDefaultConfigParams()
cfgParams := configs.NewDefaultConfigParams(*nginxPlus)

if *nginxConfigMaps != "" {
ns, name, err := k8s.ParseNamespaceName(*nginxConfigMaps)
Expand Down
2 changes: 1 addition & 1 deletion docs/content/configuration/global-configuration/configmap-resource.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
| ---| ---| ---| --- |
|``lb-method`` | Sets the [load balancing method](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/#choosing-a-load-balancing-method). To use the round-robin method, specify ``"round_robin"``. | ``"random two least_conn"`` | |
|``max-fails`` | Sets the value of the [max_fails](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#max_fails) parameter of the ``server`` directive. | ``1`` | |
|``upstream-zone-size`` | Sets the size of the shared memory [zone](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#zone) for upstreams. For NGINX, the special value 0 disables the shared memory zones. For NGINX Plus, shared memory zones are required and cannot be disabled. The special value 0 will be ignored. | ``256K`` | |
|``upstream-zone-size`` | Sets the size of the shared memory [zone](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#zone) for upstreams. For NGINX, the special value 0 disables the shared memory zones. For NGINX Plus, shared memory zones are required and cannot be disabled. The special value 0 will be ignored. | ``256k`` for NGINX, ``512k`` for NGINX Plus | |
|``fail-timeout`` | Sets the value of the [fail_timeout](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#fail_timeout) parameter of the ``server`` directive. | ``10s`` | |
|``keepalive`` | Sets the value of the [keepalive](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive) directive. Note that ``proxy_set_header Connection "";`` is added to the generated configuration when the value > 0. | ``0`` | |
{{% /table %}}
Expand Down
9 changes: 7 additions & 2 deletions internal/configs/config_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,12 @@ type Listener struct {
}

// NewDefaultConfigParams creates a ConfigParams with default values.
func NewDefaultConfigParams() *ConfigParams {
func NewDefaultConfigParams(isPlus bool) *ConfigParams {
upstreamZoneSize := "256k"
if isPlus {
upstreamZoneSize = "512k"
}

return &ConfigParams{
DefaultServerReturn: "404",
ServerTokens: "on",
Expand All @@ -152,7 +157,7 @@ func NewDefaultConfigParams() *ConfigParams {
SSLPorts: []int{443},
MaxFails: 1,
MaxConns: 0,
UpstreamZoneSize: "256k",
UpstreamZoneSize: upstreamZoneSize,
FailTimeout: "10s",
LBMethod: "random two least_conn",
MainErrorLogLevel: "notice",
Expand Down
2 changes: 1 addition & 1 deletion internal/configs/configmaps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

// ParseConfigMap parses ConfigMap into ConfigParams.
func ParseConfigMap(cfgm *v1.ConfigMap, nginxPlus bool, hasAppProtect bool) *ConfigParams {
cfgParams := NewDefaultConfigParams()
cfgParams := NewDefaultConfigParams(nginxPlus)

if serverTokens, exists, err := GetMapKeyAsBool(cfgm.Data, "server-tokens", cfgm); exists {
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions internal/configs/configurator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func createTestConfigurator() (*Configurator, error) {

manager := nginx.NewFakeManager("/etc/nginx")

cnf, err := NewConfigurator(manager, createTestStaticConfigParams(), NewDefaultConfigParams(), templateExecutor, templateExecutorV2, false, false, nil, false, nil, false), nil
cnf, err := NewConfigurator(manager, createTestStaticConfigParams(), NewDefaultConfigParams(false), templateExecutor, templateExecutorV2, false, false, nil, false, nil, false), nil
if err != nil {
return nil, err
}
Expand All @@ -64,7 +64,7 @@ func createTestConfiguratorInvalidIngressTemplate() (*Configurator, error) {

manager := nginx.NewFakeManager("/etc/nginx")

cnf, err := NewConfigurator(manager, createTestStaticConfigParams(), NewDefaultConfigParams(), templateExecutor, &version2.TemplateExecutor{}, false, false, nil, false, nil, false), nil
cnf, err := NewConfigurator(manager, createTestStaticConfigParams(), NewDefaultConfigParams(false), templateExecutor, &version2.TemplateExecutor{}, false, false, nil, false, nil, false), nil
if err != nil {
return nil, err
}
Expand Down
54 changes: 30 additions & 24 deletions internal/configs/ingress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ import (

func TestGenerateNginxCfg(t *testing.T) {
cafeIngressEx := createCafeIngressEx()
configParams := NewDefaultConfigParams()

isPlus := false
configParams := NewDefaultConfigParams(isPlus)

expected := createExpectedConfigForCafeIngressEx(isPlus)

apRes := AppProtectResources{}
result, warnings := generateNginxCfg(&cafeIngressEx, apRes, false, configParams, false, false, &StaticConfigParams{}, false)
result, warnings := generateNginxCfg(&cafeIngressEx, apRes, false, configParams, isPlus, false, &StaticConfigParams{}, false)

if diff := cmp.Diff(expected, result); diff != "" {
t.Errorf("generateNginxCfg() returned unexpected result (-want +got):\n%s", diff)
Expand All @@ -46,9 +46,8 @@ func TestGenerateNginxCfgForJWT(t *testing.T) {
Path: "/etc/nginx/secrets/default-cafe-jwk",
}

configParams := NewDefaultConfigParams()

isPlus := true
configParams := NewDefaultConfigParams(isPlus)

expected := createExpectedConfigForCafeIngressEx(isPlus)
expected.Servers[0].JWTAuth = &version1.JWTAuth{
Expand Down Expand Up @@ -81,7 +80,7 @@ func TestGenerateNginxCfgForJWT(t *testing.T) {
func TestGenerateNginxCfgWithMissingTLSSecret(t *testing.T) {
cafeIngressEx := createCafeIngressEx()
cafeIngressEx.SecretRefs["cafe-secret"].Error = errors.New("secret doesn't exist")
configParams := NewDefaultConfigParams()
configParams := NewDefaultConfigParams(false)

apRes := AppProtectResources{}
result, resultWarnings := generateNginxCfg(&cafeIngressEx, apRes, false, configParams, false, false, &StaticConfigParams{}, false)
Expand All @@ -105,7 +104,7 @@ func TestGenerateNginxCfgWithMissingTLSSecret(t *testing.T) {
func TestGenerateNginxCfgWithWildcardTLSSecret(t *testing.T) {
cafeIngressEx := createCafeIngressEx()
cafeIngressEx.Ingress.Spec.TLS[0].SecretName = ""
configParams := NewDefaultConfigParams()
configParams := NewDefaultConfigParams(false)

apRes := AppProtectResources{}
result, warnings := generateNginxCfg(&cafeIngressEx, apRes, false, configParams, false, false, &StaticConfigParams{}, true)
Expand Down Expand Up @@ -176,10 +175,15 @@ func TestGenerateIngressPath(t *testing.T) {
}

func createExpectedConfigForCafeIngressEx(isPlus bool) version1.IngressNginxConfig {
upstreamZoneSize := "256k"
if isPlus {
upstreamZoneSize = "512k"
}

coffeeUpstream := version1.Upstream{
Name: "default-cafe-ingress-cafe.example.com-coffee-svc-80",
LBMethod: "random two least_conn",
UpstreamZoneSize: "256k",
UpstreamZoneSize: upstreamZoneSize,
UpstreamServers: []version1.UpstreamServer{
{
Address: "10.0.0.1",
Expand All @@ -202,7 +206,7 @@ func createExpectedConfigForCafeIngressEx(isPlus bool) version1.IngressNginxConf
teaUpstream := version1.Upstream{
Name: "default-cafe-ingress-cafe.example.com-tea-svc-80",
LBMethod: "random two least_conn",
UpstreamZoneSize: "256k",
UpstreamZoneSize: upstreamZoneSize,
UpstreamServers: []version1.UpstreamServer{
{
Address: "10.0.0.2",
Expand Down Expand Up @@ -356,7 +360,7 @@ func TestGenerateNginxCfgForMergeableIngresses(t *testing.T) {
isPlus := false
expected := createExpectedConfigForMergeableCafeIngress(isPlus)

configParams := NewDefaultConfigParams()
configParams := NewDefaultConfigParams(isPlus)

masterApRes := AppProtectResources{}
result, warnings := generateNginxCfgForMergeableIngresses(mergeableIngresses, masterApRes, configParams, false, false, &StaticConfigParams{}, false)
Expand All @@ -381,7 +385,7 @@ func TestGenerateNginxConfigForCrossNamespaceMergeableIngresses(t *testing.T) {
}

expected := createExpectedConfigForCrossNamespaceMergeableCafeIngress()
configParams := NewDefaultConfigParams()
configParams := NewDefaultConfigParams(false)

emptyApResources := AppProtectResources{}
result, warnings := generateNginxCfgForMergeableIngresses(mergeableIngresses, emptyApResources, configParams, false, false, &StaticConfigParams{}, false)
Expand Down Expand Up @@ -446,7 +450,7 @@ func TestGenerateNginxCfgForMergeableIngressesForJWT(t *testing.T) {

minionJwtKeyFileNames := make(map[string]string)
minionJwtKeyFileNames[objectMetaToFileName(&mergeableIngresses.Minions[0].Ingress.ObjectMeta)] = "/etc/nginx/secrets/default-coffee-jwk"
configParams := NewDefaultConfigParams()
configParams := NewDefaultConfigParams(isPlus)

masterApRes := AppProtectResources{}
result, warnings := generateNginxCfgForMergeableIngresses(mergeableIngresses, masterApRes, configParams, isPlus, false, &StaticConfigParams{}, false)
Expand Down Expand Up @@ -619,10 +623,15 @@ func createMergeableCafeIngress() *MergeableIngresses {
}

func createExpectedConfigForMergeableCafeIngress(isPlus bool) version1.IngressNginxConfig {
upstreamZoneSize := "256k"
if isPlus {
upstreamZoneSize = "512k"
}

coffeeUpstream := version1.Upstream{
Name: "default-cafe-ingress-coffee-minion-cafe.example.com-coffee-svc-80",
LBMethod: "random two least_conn",
UpstreamZoneSize: "256k",
UpstreamZoneSize: upstreamZoneSize,
UpstreamServers: []version1.UpstreamServer{
{
Address: "10.0.0.1",
Expand All @@ -645,7 +654,7 @@ func createExpectedConfigForMergeableCafeIngress(isPlus bool) version1.IngressNg
teaUpstream := version1.Upstream{
Name: "default-cafe-ingress-tea-minion-cafe.example.com-tea-svc-80",
LBMethod: "random two least_conn",
UpstreamZoneSize: "256k",
UpstreamZoneSize: upstreamZoneSize,
UpstreamServers: []version1.UpstreamServer{
{
Address: "10.0.0.2",
Expand Down Expand Up @@ -842,9 +851,8 @@ func createExpectedConfigForCrossNamespaceMergeableCafeIngress() version1.Ingres

func TestGenerateNginxCfgForSpiffe(t *testing.T) {
cafeIngressEx := createCafeIngressEx()
configParams := NewDefaultConfigParams()

isPlus := false
configParams := NewDefaultConfigParams(isPlus)

expected := createExpectedConfigForCafeIngressEx(isPlus)
expected.SpiffeClientCerts = true
Expand All @@ -868,9 +876,8 @@ func TestGenerateNginxCfgForInternalRoute(t *testing.T) {
internalRouteAnnotation := "nsm.nginx.com/internal-route"
cafeIngressEx := createCafeIngressEx()
cafeIngressEx.Ingress.Annotations[internalRouteAnnotation] = "true"
configParams := NewDefaultConfigParams()

isPlus := false
configParams := NewDefaultConfigParams(isPlus)

expected := createExpectedConfigForCafeIngressEx(isPlus)
expected.Servers[0].SpiffeCerts = true
Expand Down Expand Up @@ -1339,7 +1346,9 @@ func TestGenerateNginxCfgForAppProtect(t *testing.T) {
},
}

configParams := NewDefaultConfigParams()
isPlus := true

configParams := NewDefaultConfigParams(isPlus)
apRes := AppProtectResources{
AppProtectPolicy: "/etc/nginx/waf/nac-policies/default_dataguard-alarm",
AppProtectLogconfs: []string{"/etc/nginx/waf/nac-logconfs/default_logconf syslog:server=127.0.0.1:514"},
Expand All @@ -1348,8 +1357,6 @@ func TestGenerateNginxCfgForAppProtect(t *testing.T) {
MainAppProtectLoadModule: true,
}

isPlus := true

expected := createExpectedConfigForCafeIngressEx(isPlus)
expected.Servers[0].AppProtectEnable = "on"
expected.Servers[0].AppProtectPolicy = "/etc/nginx/waf/nac-policies/default_dataguard-alarm"
Expand Down Expand Up @@ -1391,7 +1398,8 @@ func TestGenerateNginxCfgForMergeableIngressesForAppProtect(t *testing.T) {
},
}

configParams := NewDefaultConfigParams()
isPlus := true
configParams := NewDefaultConfigParams(isPlus)
apRes := AppProtectResources{
AppProtectPolicy: "/etc/nginx/waf/nac-policies/default_dataguard-alarm",
AppProtectLogconfs: []string{"/etc/nginx/waf/nac-logconfs/default_logconf syslog:server=127.0.0.1:514"},
Expand All @@ -1400,8 +1408,6 @@ func TestGenerateNginxCfgForMergeableIngressesForAppProtect(t *testing.T) {
MainAppProtectLoadModule: true,
}

isPlus := true

expected := createExpectedConfigForMergeableCafeIngress(isPlus)
expected.Servers[0].AppProtectEnable = "on"
expected.Servers[0].AppProtectPolicy = "/etc/nginx/waf/nac-policies/default_dataguard-alarm"
Expand Down
2 changes: 1 addition & 1 deletion internal/configs/version1/nginx-plus.ingress.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# configuration for {{.Ingress.Namespace}}/{{.Ingress.Name}}
{{range $upstream := .Upstreams}}
upstream {{$upstream.Name}} {
zone {{$upstream.Name}} {{if ne $upstream.UpstreamZoneSize "0"}}{{$upstream.UpstreamZoneSize}}{{else}}256k{{end}};
zone {{$upstream.Name}} {{if ne $upstream.UpstreamZoneSize "0"}}{{$upstream.UpstreamZoneSize}}{{else}}512k{{end}};
{{if $upstream.LBMethod }}{{$upstream.LBMethod}};{{end}}
{{range $server := $upstream.UpstreamServers}}
server {{$server.Address}}:{{$server.Port}} max_fails={{$server.MaxFails}} fail_timeout={{$server.FailTimeout}} max_conns={{$server.MaxConns}}
Expand Down
2 changes: 1 addition & 1 deletion internal/configs/version2/nginx-plus.virtualserver.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{ range $u := .Upstreams }}
upstream {{ $u.Name }} {
zone {{ $u.Name }} {{ if ne $u.UpstreamZoneSize "0" }}{{ $u.UpstreamZoneSize }}{{ else }}256k{{ end }};
zone {{ $u.Name }} {{ if ne $u.UpstreamZoneSize "0" }}{{ $u.UpstreamZoneSize }}{{ else }}512k{{ end }};

{{ if $u.LBMethod }}{{ $u.LBMethod }};{{ end }}

Expand Down
2 changes: 1 addition & 1 deletion internal/k8s/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ func (lbc *LoadBalancerController) syncConfigMap(task task) {
}

func (lbc *LoadBalancerController) updateAllConfigs() {
cfgParams := configs.NewDefaultConfigParams()
cfgParams := configs.NewDefaultConfigParams(lbc.isNginxPlus)

if lbc.configMap != nil {
cfgParams = configs.ParseConfigMap(lbc.configMap, lbc.isNginxPlus, lbc.appProtectEnabled)
Expand Down
10 changes: 7 additions & 3 deletions tests/suite/test_annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def fin():
@pytest.mark.ingresses
@pytest.mark.parametrize('annotations_setup', ["standard", "mergeable"], indirect=True)
class TestAnnotations:
def test_nginx_config_defaults(self, kube_apis, annotations_setup, ingress_controller_prerequisites):
def test_nginx_config_defaults(self, kube_apis, annotations_setup, ingress_controller_prerequisites, cli_arguments):
print("Case 1: no ConfigMap keys, no annotations in Ingress")
result_conf = get_ingress_nginx_template_conf(kube_apis.v1,
annotations_setup.namespace,
Expand All @@ -178,8 +178,12 @@ def test_nginx_config_defaults(self, kube_apis, annotations_setup, ingress_contr

assert "Strict-Transport-Security" not in result_conf

expected_zone_size = "256k"
if cli_arguments["ic-type"] == "nginx-plus-ingress":
expected_zone_size = "512k"

for upstream in annotations_setup.upstream_names:
assert f"zone {upstream} 256k;" in result_conf
assert f"zone {upstream} {expected_zone_size};" in result_conf

@pytest.mark.parametrize('annotations, expected_strings, unexpected_strings', [
({"nginx.org/proxy-send-timeout": "10s", "nginx.org/max-conns": "1024",
Expand Down Expand Up @@ -318,7 +322,7 @@ def test_upstream_zone_size_0(self, cli_arguments, kube_apis,
if cli_arguments["ic-type"] == "nginx-plus-ingress":
print("Run assertions for Nginx Plus case")
assert "zone " in result_conf
assert " 256k;" in result_conf
assert " 512k;" in result_conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is causing failures in the pipeline, although for some reason it is not showing up in the PR: https://gitlab.com/f5/nginx/kic/kubernetes-ingress/-/jobs/1623726013

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for pointing out. forgot to update the template for N+ for Ingress, it still uses 256k default:

	zone {{$upstream.Name}} {{if ne $upstream.UpstreamZoneSize "0"}}{{$upstream.UpstreamZoneSize}}{{else}}256k{{end}};

elif cli_arguments["ic-type"] == "nginx-ingress":
print("Run assertions for Nginx OSS case")
assert "zone " not in result_conf
Expand Down
2 changes: 1 addition & 1 deletion tests/suite/test_externalname_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def test_ic_template_config_upstream_zone(self, kube_apis, ingress_controller_pr
ingress_controller_prerequisites.namespace)
line = f"zone {external_name_setup.namespace}-" \
f"{external_name_setup.ingress_name}-" \
f"{external_name_setup.ingress_host}-{external_name_setup.service}-80 256k;"
f"{external_name_setup.ingress_host}-{external_name_setup.service}-80 512k;"
assert line in result_conf

def test_ic_template_config_upstream_rule(self, kube_apis, ingress_controller_prerequisites,
Expand Down
2 changes: 1 addition & 1 deletion tests/suite/test_v_s_route_externalname.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def test_template_config(self, kube_apis,
ingress_controller_prerequisites.namespace)

line = f"zone vs_{vsr_externalname_setup.namespace}_{vsr_externalname_setup.vs_name}" \
f"_vsr_{vsr_externalname_setup.route.namespace}_{vsr_externalname_setup.route.name}_ext-backend 256k;"
f"_vsr_{vsr_externalname_setup.route.namespace}_{vsr_externalname_setup.route.name}_ext-backend 512k;"
assert line in initial_config
assert "random two least_conn;" in initial_config
assert f"server {vsr_externalname_setup.external_host}:80 max_fails=1 fail_timeout=10s max_conns=0 resolve;"\
Expand Down
17 changes: 13 additions & 4 deletions tests/suite/test_virtual_server_configmap_keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def assert_specific_keys_for_nginx_plus(config, expected_values):
assert f"server_tokens \"{expected_values['server-tokens']}\";" in config
assert "random two least_conn;" not in config \
and expected_values['lb-method'] in config
assert "zone " in config and " 256k;" in config
assert "zone " in config and " 512k;" in config


def assert_specific_keys_for_nginx_oss(config, expected_values):
Expand All @@ -79,8 +79,15 @@ def assert_specific_keys_for_nginx_oss(config, expected_values):
and expected_values['lb-method'] in config
assert "zone " not in config and " 256k;" not in config

def assert_defaults_of_keys_with_validation_for_nginx_plus(config, unexpected_values):
assert_common_defaults_of_keys_with_validation(config, unexpected_values)
assert "zone " in config and " 512k;" in config

def assert_defaults_of_keys_with_validation_for_nginx_oss(config, unexpected_values):
assert_common_defaults_of_keys_with_validation(config, unexpected_values)
assert "zone " in config and " 256k;" in config

def assert_defaults_of_keys_with_validation(config, unexpected_values):
def assert_common_defaults_of_keys_with_validation(config, unexpected_values):
assert "proxy_buffering on;" in config
assert "real_ip_recursive" not in config
assert "max_fails=1" in config
Expand All @@ -89,7 +96,6 @@ def assert_defaults_of_keys_with_validation(config, unexpected_values):
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
assert "zone " in config and " 256k;" in config


def assert_defaults_of_keys_with_validation_in_main_config(config, unexpected_values):
Expand Down Expand Up @@ -222,7 +228,10 @@ def test_keys(self, cli_arguments, kube_apis, ingress_controller_prerequisites,
ingress_controller_prerequisites.namespace)
step_4_events = get_events(kube_apis.v1, virtual_server_setup.namespace)
assert_update_event_count_increased(virtual_server_setup, step_4_events, step_3_events)
assert_defaults_of_keys_with_validation(step_4_config, expected_values)
if cli_arguments['ic-type'] == "nginx-ingress":
assert_defaults_of_keys_with_validation_for_nginx_oss(step_4_config, expected_values)
else:
assert_defaults_of_keys_with_validation_for_nginx_plus(step_4_config, expected_values)

def test_keys_in_main_config(self, cli_arguments, kube_apis, ingress_controller_prerequisites,
crd_ingress_controller, virtual_server_setup, clean_up):
Expand Down
2 changes: 1 addition & 1 deletion tests/suite/test_virtual_server_external_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def test_template_config(self, kube_apis, ingress_controller_prerequisites,
virtual_server_setup.vs_name,
vs_externalname_setup.ic_pod_name,
ingress_controller_prerequisites.namespace)
line = f"zone vs_{virtual_server_setup.namespace}_{virtual_server_setup.vs_name}_backend1 256k;"
line = f"zone vs_{virtual_server_setup.namespace}_{virtual_server_setup.vs_name}_backend1 512k;"
assert line in result_conf
assert "random two least_conn;" in result_conf
assert f"server {vs_externalname_setup.external_host}:80 max_fails=1 fail_timeout=10s max_conns=0 resolve;"\
Expand Down