DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge c525936940 into de1a4c463c

Browse source
This commit is contained in:
DEEPAK RAWTE 2025-02-17 09:50:35 -08:00 committed by GitHub
commit 3f262745db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/ingress/controller/template/template.go
View file

@ -1404,6 +1404,12 @@ func buildHTTPSListener(t, s interface{}) string {
return "" return ""
} }
for _, server := range tc.Servers {
if server.Hostname == hostname && server.SSLCert == nil {
return ""
}
}
co := commonListenOptions(&tc, hostname) co := commonListenOptions(&tc, hostname)
addrV4 := []string{""} addrV4 := []string{""}

4
test/e2e/lua/dynamic_certificates.go
View file

@ -62,6 +62,10 @@ var _ = framework.IngressNginxDescribe("[Lua] dynamic certificates", func() {
_, err = f.KubeClientSet.NetworkingV1().Ingresses(f.Namespace).Update(context.TODO(), ing, metav1.UpdateOptions{}) _, err = f.KubeClientSet.NetworkingV1().Ingresses(f.Namespace).Update(context.TODO(), ing, metav1.UpdateOptions{})
assert.Nil(ginkgo.GinkgoT(), err) assert.Nil(ginkgo.GinkgoT(), err)
ing.Annotations = map[string]string{
"nginx.ingress.kubernetes.io/proxy-read-timeout": "20",
"nginx.ingress.kubernetes.io/load-balance": "ewma",
}
time.Sleep(waitForLuaSync) time.Sleep(waitForLuaSync)
ensureHTTPSRequest(f, f.GetURL(framework.HTTPS), host, host) ensureHTTPSRequest(f, f.GetURL(framework.HTTPS), host, host)