update logic to account for new CA file

juliocamarero · juliocamarero · commit 0b5b058fd8a9 · 2024-12-10T15:43:52.000+01:00
diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go
@@ -749,9 +749,9 @@ func (n *NGINXController) getBackendServers(ingresses []*ingress.Ingress) ([]*in
 			}
 
 			if !n.store.GetBackendConfiguration().ProxySSLLocationOnly {
-				if server.ProxySSL.CAFileName == "" {
+				if server.ProxySSL.CAFileName == "" && server.ProxySSL.ProxySSLCA.CAFileName == "" {
 					server.ProxySSL = anns.ProxySSL
-					if server.ProxySSL.Secret != "" && server.ProxySSL.CAFileName == "" {
+					if (server.ProxySSL.Secret != "" && server.ProxySSL.CAFileName == "") && (server.ProxySSL.ProxySSLCA.ConfigMap != "" && server.ProxySSL.ProxySSLCA.CAFileName == "") {
 						klog.V(3).Infof("Secret %q has no 'ca.crt' key, client cert authentication disabled for Ingress %q",
 							server.ProxySSL.Secret, ingKey)
 					}

Original file line number	Diff line number	Diff line change
`@@ -749,9 +749,9 @@ func (n NGINXController) getBackendServers(ingresses []ingress.Ingress) ([]*in`
`749`	`749`	`}`
`750`	`750`
`751`	`751`	`if !n.store.GetBackendConfiguration().ProxySSLLocationOnly {`
`752`		`- if server.ProxySSL.CAFileName == "" {`
	`752`	`+ if server.ProxySSL.CAFileName == "" && server.ProxySSL.ProxySSLCA.CAFileName == "" {`
`753`	`753`	`server.ProxySSL = anns.ProxySSL`
`754`		`- if server.ProxySSL.Secret != "" && server.ProxySSL.CAFileName == "" {`
	`754`	`+ if (server.ProxySSL.Secret != "" && server.ProxySSL.CAFileName == "") && (server.ProxySSL.ProxySSLCA.ConfigMap != "" && server.ProxySSL.ProxySSLCA.CAFileName == "") {`
`755`	`755`	`klog.V(3).Infof("Secret %q has no 'ca.crt' key, client cert authentication disabled for Ingress %q",`
`756`	`756`	`server.ProxySSL.Secret, ingKey)`
`757`	`757`	`}`