fixed as per review comments

Signed-off-by: Shriram Sharma <[email protected]>
istio-ecosystem · Aug 23, 2024 · d4c9629 · d4c9629
1 parent 29e8a80
commit d4c9629
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/admiral/cmd/admiral/cmd/root.go b/admiral/cmd/admiral/cmd/root.go
@@ -255,6 +255,7 @@ func GetRootCmd(args []string) *cobra.Command {
 	// Flags pertaining to VS based routing
 	rootCmd.PersistentFlags().BoolVar(&params.EnableVSRouting, "enable_vs_routing", false, "Enable/Disable VS Based Routing")
 	rootCmd.PersistentFlags().StringArrayVar(&params.VSRoutingGateways, "vs_routing_gateways", []string{}, "The PASSTHROUGH gateways to use for VS based routing")
+	rootCmd.PersistentFlags().StringArrayVar(&params.IngressVSExportToNamespaces, "ingress_vs_export_to_namespaces", []string{"istio-system"}, "List of namespaces where the ingress VS should be exported")
 
 	return rootCmd
 }

diff --git a/admiral/pkg/clusters/virtualservice_handler.go b/admiral/pkg/clusters/virtualservice_handler.go
@@ -651,7 +651,7 @@ func getBaseVirtualServiceForIngress(host, sniHost string) (*v1alpha3.VirtualSer
 		// We are using the SNI host in hosts field as they need to match
 		Hosts:    []string{sniHost},
 		Gateways: gateways,
-		ExportTo: []string{"istio-system"},
+		ExportTo: common.GetIngressVSExportToNamespace(),
 		Tls: []*networkingV1Alpha3.TLSRoute{
 			{
 				Match: []*networkingV1Alpha3.TLSMatchAttributes{

diff --git a/admiral/pkg/clusters/virtualservice_handler_test.go b/admiral/pkg/clusters/virtualservice_handler_test.go
@@ -2254,6 +2254,7 @@ func TestGetBaseVirtualServiceForIngress(t *testing.T) {
 
 	admiralParams := common.AdmiralParams{
 		SyncNamespace: "test-sync-ns",
+		IngressVSExportToNamespaces: []string{"istio-system"},
 	}
 
 	vsLabels := map[string]string{

diff --git a/admiral/pkg/controller/common/config.go b/admiral/pkg/controller/common/config.go
@@ -426,6 +426,12 @@ func EnableSWAwareNSCaches() bool {
 	return wrapper.params.EnableSWAwareNSCaches
 }
 
+func GetIngressVSExportToNamespace() []string {
+	wrapper.RLock()
+	defer wrapper.RUnlock()
+	return wrapper.params.IngressVSExportToNamespaces
+}
+
 func IsVSBasedRoutingEnabled() bool {
 	wrapper.RLock()
 	defer wrapper.RUnlock()

diff --git a/admiral/pkg/controller/common/types.go b/admiral/pkg/controller/common/types.go
@@ -121,8 +121,9 @@ type AdmiralParams struct {
 	OperatorSecretFilterTags string
 
 	// VS Based Routing
-	EnableVSRouting   bool
-	VSRoutingGateways []string
+	EnableVSRouting             bool
+	VSRoutingGateways           []string
+	IngressVSExportToNamespaces []string
 }
 
 func (b AdmiralParams) String() string {