add https socket

Author: sarthyparty

internal/mode/static/nginx/conf/nginx.conf

@@ -43,6 +43,6 @@ stream {
 	variables_hash_bucket_size 512;
     variables_hash_max_size 1024;
 
-    map_hash_max_size 2048;
-    map_hash_bucket_size 256;
+#     map_hash_max_size 2048;
+#     map_hash_bucket_size 256;
 }

internal/mode/static/nginx/config/maps.go

@@ -50,6 +50,7 @@ func createStreamMaps(conf dataplane.Configuration) []shared.Map {
 						Result: getSocketNameTLS(server.Port, server.Hostname),
 					},
 				},
+				UseHostnames: true,
 			}
 			maps = append(maps, m)
 			portsToMap[server.Port] = len(maps) - 1
@@ -61,24 +62,20 @@ func createStreamMaps(conf dataplane.Configuration) []shared.Map {
 		}
 	}
 
-	coveredPorts := make(map[int32]struct{})
-
 	for _, server := range conf.SSLServers {
 		mapInd, ok := portsToMap[server.Port]
-		_, covered := coveredPorts[server.Port]
 
 		hostname := server.Hostname
 
 		if server.IsDefault {
 			hostname = "default"
 		}
 
-		if ok && !covered {
+		if ok {
 			maps[mapInd].Parameters = append(maps[mapInd].Parameters, shared.MapParameter{
 				Value:  hostname,
 				Result: getSocketNameHTTPS(server.Port),
 			})
-			coveredPorts[server.Port] = struct{}{}
 		}
 	}
 

internal/mode/static/nginx/config/maps_template.go

@@ -3,6 +3,11 @@ package config
 const mapsTemplateText = `
 {{ range $m := . }}
 map {{ $m.Source }} {{ $m.Variable }} {
+
+	{{- if $m.UseHostnames -}}
+	hostnames;
+	{{ end }}
+
     {{ range $p := $m.Parameters }}
     {{ $p.Value }} {{ $p.Result }};
     {{ end }}

internal/mode/static/nginx/config/servers.go

@@ -165,7 +165,7 @@ func createServers(
 
 		_, portInUse := sharedPorts[s.Port]
 		if portInUse {
-			listen = getSocketNameTLS(s.Port, s.Hostname)
+			listen = getSocketNameHTTPS(s.Port)
 		}
 		sslServer, matchPair := createSSLServer(s, serverID, listen)
 		servers = append(servers, sslServer)

internal/mode/static/nginx/config/shared/config.go

@@ -2,9 +2,10 @@ package shared
 
 // Map defines an NGINX map.
 type Map struct {
-	Source     string
-	Variable   string
-	Parameters []MapParameter
+	Source       string
+	Variable     string
+	Parameters   []MapParameter
+	UseHostnames bool
 }
 
 // MapParameter Parameter defines a Value and Result pair in a Map.

internal/mode/static/nginx/config/stream_servers.go

@@ -29,11 +29,12 @@ func executeStreamServers(conf dataplane.Configuration) []executeResult {
 func createStreamServers(conf dataplane.Configuration) []stream.Server {
 	streamServers := make([]stream.Server, 0, len(conf.TLSPassthroughServers)*2)
 	for _, server := range conf.TLSPassthroughServers {
+		listen := getSocketNameTLS(server.Port, server.Hostname)
 		streamServers = append(streamServers, stream.Server{
-			Listen:     getSocketNameTLS(server.Port, server.Hostname),
-			ProxyPass:  server.UpstreamName,
-			SSLPreread: false,
+			Listen:    listen,
+			ProxyPass: server.UpstreamName,
 		})
+
 	}
 
 	portSet := make(map[int32]struct{}, len(streamServers))

internal/mode/static/state/dataplane/configuration.go

@@ -29,7 +29,7 @@ const (
 func BuildConfiguration(
 	ctx context.Context,
 	g *graph.Graph,
-	resolver resolver.ServiceResolver,
+	serviceResolver resolver.ServiceResolver,
 	generator policies.ConfigGenerator,
 	configVersion int,
 ) Configuration {
@@ -41,20 +41,39 @@ func BuildConfiguration(
 		return Configuration{Version: configVersion}
 	}
 
-	upstreams := buildUpstreams(ctx, g.Gateway.Listeners, resolver)
+	upstreams := buildUpstreams(ctx, g.Gateway.Listeners, serviceResolver)
 	httpServers, sslServers := buildServers(g, generator)
 	backendGroups := buildBackendGroups(append(httpServers, sslServers...))
 	keyPairs := buildSSLKeyPairs(g.ReferencedSecrets, g.Gateway.Listeners)
 	certBundles := buildCertBundles(g.ReferencedCaCertConfigMaps, backendGroups)
 	telemetry := buildTelemetry(g)
 	baseHTTPConfig := buildBaseHTTPConfig(g)
-	var tlsServers []Layer4VirtualServer
+	tlsServers := []Layer4VirtualServer{
+		{
+			Hostname:     "app.example.com",
+			UpstreamName: "backend1",
+			Port:         443,
+		},
+	}
+	streamUpstreams := []Upstream{
+		{
+			Name:     "backend1",
+			ErrorMsg: "error",
+			Endpoints: []resolver.Endpoint{
+				{
+					Address: "10.244.0.7",
+					Port:    8443,
+				},
+			},
+		},
+	}
 
 	config := Configuration{
 		HTTPServers:           httpServers,
 		SSLServers:            sslServers,
 		TLSPassthroughServers: tlsServers,
 		Upstreams:             upstreams,
+		StreamUpstreams:       streamUpstreams,
 		BackendGroups:         backendGroups,
 		SSLKeyPairs:           keyPairs,
 		Version:               configVersion,