From f26f054a6973760f93a45355804f1326fc8fb09f Mon Sep 17 00:00:00 2001 From: lianglli Date: Wed, 27 Sep 2023 16:40:05 +0800 Subject: [PATCH] TLS: allow support for different protocols on different hosts --- internal/ingress/controller/controller.go | 2 +- internal/ingress/controller/hotreload.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go index 66cb2d8..708e20f 100644 --- a/internal/ingress/controller/controller.go +++ b/internal/ingress/controller/controller.go @@ -482,7 +482,7 @@ func (n *NGINXController) getConfiguration(ingresses []*ingress.Ingress) (sets.S upstreams, servers := n.getBackendServers(ingresses) var passUpstreams []*ingress.SSLPassthroughBackend - hosts := sets.NewString() + hosts := sets.New[string]() for _, server := range servers { if !hosts.Has(server.Hostname) { diff --git a/internal/ingress/controller/hotreload.go b/internal/ingress/controller/hotreload.go index bc843e1..f0eb746 100644 --- a/internal/ingress/controller/hotreload.go +++ b/internal/ingress/controller/hotreload.go @@ -312,7 +312,7 @@ func createVirtualService(target string, loc *ingress.Location, serviceName stri return service } -func createMetaData(loc *ingress.Location) []*route.Metadata { +func createMetaData(server *ingress.Server, loc *ingress.Location) []*route.Metadata { var namespace, ingress, service string if loc.Ingress == nil { namespace = ""