From a271369fc69537691f1d74b52cb99ec6e54e4993 Mon Sep 17 00:00:00 2001 From: Julio Camarero Date: Mon, 9 Dec 2024 17:12:11 +0100 Subject: [PATCH] update logic to account for new CA file --- internal/ingress/controller/controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go index 652a80e498..a3df6bf245 100644 --- 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) }