Skip to content

Commit 926affc

Browse files
authored
Merge pull request #293 from aojea/tunnel_mac_gw
add and remove tunnels for gateways
2 parents b52fd7f + a19891d commit 926affc

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

pkg/gateway/gateway.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,14 @@ func (c *Controller) syncGateway(ctx context.Context, key string) error {
108108
newGw.Status.Listeners = listenerStatuses
109109
err = c.UpdateXDSServer(ctx, containerName, envoyResources)
110110

111+
// forward traffic from the host on Mac and Windows
112+
if c.tunnelManager != nil {
113+
err := c.tunnelManager.SetupTunnels(containerName)
114+
if err != nil {
115+
klog.Errorf("failed to set up tunnels for gateway %s: %v", key, err)
116+
}
117+
}
118+
111119
// Calculate and set the Gateway's own status conditions based on the build results.
112120
setGatewayConditions(newGw, listenerStatuses, err)
113121

@@ -671,6 +679,13 @@ func (c *Controller) deleteGatewayResources(ctx context.Context, name, namespace
671679
return fmt.Errorf("failed to set empty snapshot for deleted gateway %s: %w", name, err)
672680
}
673681

682+
if c.tunnelManager != nil {
683+
err := c.tunnelManager.RemoveTunnels(containerName)
684+
if err != nil {
685+
klog.Errorf("failed to remove tunnels for deleted gateway %s: %v", name, err)
686+
}
687+
}
688+
674689
if err := container.Delete(containerName); err != nil {
675690
return fmt.Errorf("failed to delete container for gateway %s: %v", name, err)
676691
}

0 commit comments

Comments
 (0)