Skip to content

Fix Helm tests failing with latest version #8179

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

Merged
merged 2 commits into from
Aug 21, 2025
Merged

Fix Helm tests failing with latest version #8179

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
3dee004
fix helm test
AlexFenlon Aug 21, 2025
116f04d
Merge branch 'main' into chore/helm-test-update
AlexFenlon Aug 21, 2025
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
28 changes: 17 additions & 11 deletions charts/tests/helmunit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,16 +167,16 @@ func TestHelmNICTemplateNegative(t *testing.T) {
t.Parallel()

negativeTests := map[string]struct {
valuesFile string
releaseName string
namespace string
expectedErrorMsg string
valuesFile string
releaseName string
namespace string
expectedErrorMsgs []string
}{
"startupStatusInvalid": {
valuesFile: "testdata/startupstatus-invalid.yaml",
releaseName: "startupstatus-invalid",
namespace: "default",
expectedErrorMsg: "port is required",
valuesFile: "testdata/startupstatus-invalid.yaml",
releaseName: "startupstatus-invalid",
namespace: "default",
expectedErrorMsgs: []string{"missing properties 'port', 'path'", "port is required"},
},
}

Expand All @@ -201,11 +201,17 @@ func TestHelmNICTemplateNegative(t *testing.T) {
t.Fatalf("Expected helm template to fail for invalid configuration, but it succeeded")
}

if tc.expectedErrorMsg != "" && !strings.Contains(err.Error(), tc.expectedErrorMsg) {
t.Fatalf("Expected error to contain '%s', but got: %s", tc.expectedErrorMsg, err.Error())
errMsg := err.Error()
for _, expected := range tc.expectedErrorMsgs {
if strings.Contains(errMsg, expected) {
t.Logf("Expected failure occurred: %s", errMsg)
return
}
}

t.Logf("Expected failure occurred: %s", err.Error())
t.Fatalf("Expected error to contain '%s', but got: %s", tc.expectedErrorMsgs[0], errMsg)

t.Logf("Expected failure occurred: %s", errMsg)
})
}
}
286 changes: 143 additions & 143 deletions internal/configs/version2/__snapshots__/templates_test.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,149 @@ server {

---

[TestExecuteVirtualServerTemplateWithCachePolicyNGINXPlus - 1]

upstream test-upstream {
zone test-upstream ;
server 10.0.0.20:8001 max_fails=0 fail_timeout= max_conns=0;
}

proxy_cache_path /var/cache/nginx/test_cache_full_advanced levels=2:2 keys_zone=test_cache_full_advanced:50m;
proxy_cache_path /var/cache/nginx/test_cache_location_location_cache keys_zone=test_cache_location_location_cache:20m;
geo $purge_allowed_test_cache_full_advanced {
default 0;
127.0.0.1 1;
10.0.0.0/8 1;
192.168.1.0/24 1;
}

map $request_method $cache_purge_test_cache_full_advanced {
PURGE $purge_allowed_test_cache_full_advanced;
default 0;
}

server {
listen 80;
listen [::]:80;


server_name example.com;
status_zone example.com;
set $resource_type "virtualserver";
set $resource_name "";
set $resource_namespace "";

server_tokens "off";
# Server-level cache configuration
proxy_cache test_cache_full_advanced;
proxy_cache_key $scheme$proxy_host$request_uri;
proxy_ignore_headers Cache-Control Expires Set-Cookie Vary X-Accel-Expires;
proxy_cache_valid 200 2h;
proxy_cache_valid 301 2h;
proxy_cache_valid 404 2h;
proxy_cache_methods GET HEAD POST;
proxy_cache_purge $cache_purge_test_cache_full_advanced;




location / {
set $service "";
status_zone "";


set $default_connection_header close;
proxy_connect_timeout ;
proxy_read_timeout ;
proxy_send_timeout ;
client_max_body_size ;

proxy_buffering off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $vs_connection_header;
proxy_pass_request_headers off;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache test_cache_location_location_cache;
proxy_cache_key $scheme$proxy_host$request_uri;
proxy_cache_valid any 1h;
proxy_cache_methods GET HEAD;
proxy_pass http://test-upstream;
proxy_next_upstream ;
proxy_next_upstream_timeout ;
proxy_next_upstream_tries 0;
}
}

---

[TestExecuteVirtualServerTemplateWithCachePolicyOSS - 1]

upstream test-upstream {zone test-upstream ;
server 10.0.0.20:8001 max_fails=0 fail_timeout= max_conns=0;
}

proxy_cache_path /var/cache/nginx/test_cache_basic_cache levels=1:2 keys_zone=test_cache_basic_cache:10m;
proxy_cache_path /var/cache/nginx/test_cache_location_simple_cache keys_zone=test_cache_location_simple_cache:5m;
server {
listen 80;
listen [::]:80;


server_name example.com;

set $resource_type "virtualserver";
set $resource_name "";
set $resource_namespace "";

server_tokens "off";
# Server-level cache configuration
proxy_cache test_cache_basic_cache;
proxy_cache_key $scheme$proxy_host$request_uri;
proxy_ignore_headers Cache-Control Expires Set-Cookie Vary X-Accel-Expires;
proxy_cache_valid any 1h;
proxy_cache_methods GET HEAD;




location / {
set $service "";


set $default_connection_header close;
proxy_connect_timeout ;
proxy_read_timeout ;
proxy_send_timeout ;
client_max_body_size ;

proxy_buffering off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $vs_connection_header;
proxy_pass_request_headers off;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache test_cache_location_simple_cache;
proxy_cache_key $scheme$proxy_host$request_uri;
proxy_cache_valid 200 30m;
proxy_cache_valid 404 30m;
proxy_pass http://test-upstream;
proxy_next_upstream ;
proxy_next_upstream_timeout ;
proxy_next_upstream_tries 0;
}
}

---

[TestExecuteVirtualServerTemplateWithJWKSWithToken - 1]

upstream vs_default_cafe_tea {
Expand Down Expand Up @@ -3493,146 +3636,3 @@ server {
}

---

[TestExecuteVirtualServerTemplateWithCachePolicyOSS - 1]

upstream test-upstream {zone test-upstream ;
server 10.0.0.20:8001 max_fails=0 fail_timeout= max_conns=0;
}

proxy_cache_path /var/cache/nginx/test_cache_basic_cache levels=1:2 keys_zone=test_cache_basic_cache:10m;
proxy_cache_path /var/cache/nginx/test_cache_location_simple_cache keys_zone=test_cache_location_simple_cache:5m;
server {
listen 80;
listen [::]:80;


server_name example.com;

set $resource_type "virtualserver";
set $resource_name "";
set $resource_namespace "";

server_tokens "off";
# Server-level cache configuration
proxy_cache test_cache_basic_cache;
proxy_cache_key $scheme$proxy_host$request_uri;
proxy_ignore_headers Cache-Control Expires Set-Cookie Vary X-Accel-Expires;
proxy_cache_valid any 1h;
proxy_cache_methods GET HEAD;




location / {
set $service "";


set $default_connection_header close;
proxy_connect_timeout ;
proxy_read_timeout ;
proxy_send_timeout ;
client_max_body_size ;

proxy_buffering off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $vs_connection_header;
proxy_pass_request_headers off;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache test_cache_location_simple_cache;
proxy_cache_key $scheme$proxy_host$request_uri;
proxy_cache_valid 200 30m;
proxy_cache_valid 404 30m;
proxy_pass http://test-upstream;
proxy_next_upstream ;
proxy_next_upstream_timeout ;
proxy_next_upstream_tries 0;
}
}

---

[TestExecuteVirtualServerTemplateWithCachePolicyNGINXPlus - 1]

upstream test-upstream {
zone test-upstream ;
server 10.0.0.20:8001 max_fails=0 fail_timeout= max_conns=0;
}

proxy_cache_path /var/cache/nginx/test_cache_full_advanced levels=2:2 keys_zone=test_cache_full_advanced:50m;
proxy_cache_path /var/cache/nginx/test_cache_location_location_cache keys_zone=test_cache_location_location_cache:20m;
geo $purge_allowed_test_cache_full_advanced {
default 0;
127.0.0.1 1;
10.0.0.0/8 1;
192.168.1.0/24 1;
}

map $request_method $cache_purge_test_cache_full_advanced {
PURGE $purge_allowed_test_cache_full_advanced;
default 0;
}

server {
listen 80;
listen [::]:80;


server_name example.com;
status_zone example.com;
set $resource_type "virtualserver";
set $resource_name "";
set $resource_namespace "";

server_tokens "off";
# Server-level cache configuration
proxy_cache test_cache_full_advanced;
proxy_cache_key $scheme$proxy_host$request_uri;
proxy_ignore_headers Cache-Control Expires Set-Cookie Vary X-Accel-Expires;
proxy_cache_valid 200 2h;
proxy_cache_valid 301 2h;
proxy_cache_valid 404 2h;
proxy_cache_methods GET HEAD POST;
proxy_cache_purge $cache_purge_test_cache_full_advanced;




location / {
set $service "";
status_zone "";


set $default_connection_header close;
proxy_connect_timeout ;
proxy_read_timeout ;
proxy_send_timeout ;
client_max_body_size ;

proxy_buffering off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $vs_connection_header;
proxy_pass_request_headers off;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Port $server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_cache test_cache_location_location_cache;
proxy_cache_key $scheme$proxy_host$request_uri;
proxy_cache_valid any 1h;
proxy_cache_methods GET HEAD;
proxy_pass http://test-upstream;
proxy_next_upstream ;
proxy_next_upstream_timeout ;
proxy_next_upstream_tries 0;
}
}

---
Loading