internal/dag: move ListenerName to Listener struct

Moves the ListenerName field from VirtualHost to Listener, to better reflect the data model. This field is now populated by the listener processor. Signed-off-by: Steve Kriss <krisss@vmware.com>
projectcontour · Nov 2, 2021 · c4c8772 · c4c8772
1 parent 5c65e8a
commit c4c8772
Show file tree

Hide file tree

Showing 5 changed files with 279 additions and 122 deletions.
diff --git a/internal/dag/accessors.go b/internal/dag/accessors.go
@@ -125,8 +125,7 @@ func (d *DAG) EnsureSecureVirtualHost(hostname string) *SecureVirtualHost {
 
 	svh := &SecureVirtualHost{
 		VirtualHost: VirtualHost{
-			Name:         hostname,
-			ListenerName: "ingress_https",
+			Name: hostname,
 		},
 	}
 	d.SecureVirtualHosts[hostname] = svh
@@ -147,8 +146,7 @@ func (d *DAG) EnsureVirtualHost(hostname string) *VirtualHost {
 	}
 
 	vhost := &VirtualHost{
-		Name:         hostname,
-		ListenerName: "ingress_http",
+		Name: hostname,
 	}
 	d.VirtualHosts[hostname] = vhost
 	return vhost