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.

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

NGINX: Add nginx-go-crossplane rendering. #11975

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix test assertion
rikatz committed Jan 12, 2025
commit bc232c355e475ffd212649a42de9d22376674910
3 changes: 2 additions & 1 deletion test/e2e/lua/dynamic_configuration.go
Original file line number Diff line number Diff line change
@@ -212,7 +212,8 @@ func createIngress(f *framework.Framework, host, deploymentName string) {

f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %s;", host)) &&
return (strings.Contains(server, fmt.Sprintf("server_name %s;", host)) ||
strings.Contains(server, fmt.Sprintf("server_name %s ;", host))) &&
strings.Contains(server, "proxy_pass http://upstream_balancer;")
})
}
3 changes: 2 additions & 1 deletion test/e2e/metrics/metrics.go
Original file line number Diff line number Diff line change
@@ -43,7 +43,8 @@ var _ = framework.IngressNginxDescribe("[metrics] exported prometheus metrics",
f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil))
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %s;", host)) &&
return (strings.Contains(server, fmt.Sprintf("server_name %s;", host)) ||
strings.Contains(server, fmt.Sprintf("server_name %s ;", host))) &&
strings.Contains(server, "proxy_pass http://upstream_balancer;")
})
})
12 changes: 8 additions & 4 deletions test/e2e/settings/badannotationvalues.go
Original file line number Diff line number Diff line change
@@ -50,7 +50,8 @@ var _ = framework.DescribeAnnotation("Bad annotation values", func() {

f.WaitForNginxServer(host,
func(server string) bool {
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host))
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) &&
!strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
})

f.WaitForNginxServer(host,
@@ -87,7 +88,8 @@ var _ = framework.DescribeAnnotation("Bad annotation values", func() {

f.WaitForNginxServer(host,
func(server string) bool {
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host))
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) &&
!strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
})

f.WaitForNginxServer(host,
@@ -123,7 +125,8 @@ var _ = framework.DescribeAnnotation("Bad annotation values", func() {

f.WaitForNginxServer(hostValid,
func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %s;", hostValid))
return strings.Contains(server, fmt.Sprintf("server_name %s;", hostValid)) ||
strings.Contains(server, fmt.Sprintf("server_name %s ;", hostValid))
})

f.WaitForNginxServer(hostValid,
@@ -156,7 +159,8 @@ var _ = framework.DescribeAnnotation("Bad annotation values", func() {

f.WaitForNginxServer(host,
func(server string) bool {
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host))
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) &&
!strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
})

f.WaitForNginxServer(host,
3 changes: 2 additions & 1 deletion test/e2e/settings/limit_rate.go
Original file line number Diff line number Diff line change
@@ -41,7 +41,8 @@ var _ = framework.DescribeSetting("Configmap - limit-rate", func() {
f.EnsureIngress(ing)

f.WaitForNginxServer(host, func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %s;", host))
return strings.Contains(server, fmt.Sprintf("server_name %s;", host)) ||
strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
})

wlKey := "limit-rate"