Merge pull request #3572 from shashankram/gateway-flag

osm-gateway: add feature flag

charts/osm/README.md

@@ -77,8 +77,9 @@ The following table lists the configurable parameters of the osm chart and their
 | OpenServiceMesh.enablePrivilegedInitContainer | bool | `false` | Run init container in privileged mode |
 | OpenServiceMesh.enforceSingleMesh | bool | `false` | Enforce only deploying one mesh in the cluster |
 | OpenServiceMesh.envoyLogLevel | string | `"error"` | Log level for the Envoy proxy sidecar |
-| OpenServiceMesh.featureFlags.enableEgressPolicy | bool | `true` | Enable OSM's Egress policy API. If specified, fine grained control over Egress (external) traffic is enforced |
-| OpenServiceMesh.featureFlags.enableMulticlusterMode | bool | `false` | Enable Multicluster mode. If specified, multicluster mode will be enabled in OSM |
+| OpenServiceMesh.featureFlags.enableEgressPolicy | bool | `true` | Enable OSM's Egress policy API If specified, fine grained control over Egress (external) traffic is enforced |
+| OpenServiceMesh.featureFlags.enableMulticlusterMode | bool | `false` | Enable Multicluster mode If specified, multicluster mode will be enabled in OSM |
+| OpenServiceMesh.featureFlags.enableOSMGateway | bool | `false` | Enable OSM gateway for ingress or multicluster |
 | OpenServiceMesh.featureFlags.enableWASMStats | bool | `true` | Enable extra Envoy statistics generated by a custom WASM extension |
 | OpenServiceMesh.fluentBit.enableProxySupport | bool | `false` | Enable proxy support toggle for Fluent Bit |
 | OpenServiceMesh.fluentBit.httpProxy | string | `""` | Optional HTTP proxy endpoint for Fluent Bit |

charts/osm/values.schema.json

@@ -152,7 +152,8 @@
                 "webhookConfigNamePrefix",
                 "osmController",
                 "enablePrivilegedInitContainer",
-                "injector"
+                "injector",
+                "featureFlags"
             ],
             "properties": {
                 "osmController": {
@@ -673,7 +674,8 @@
                     "required": [
                         "enableWASMStats",
                         "enableEgressPolicy",
-                        "enableMulticlusterMode"
+                        "enableMulticlusterMode",
+                        "enableOSMGateway"
                     ],
                     "properties": {
                         "enableWASMStats": {
@@ -702,6 +704,15 @@
                             "examples": [
                                 true
                             ]
+                        },
+                        "enableOSMGateway": {
+                            "$id": "#/properties/OpenServiceMesh/properties/featureFlags/properties/enableOSMGateway",
+                            "type": "boolean",
+                            "title": "Enable OSM gateway",
+                            "description": "Enable OSM gateway for ingress or multicluster",
+                            "examples": [
+                                true
+                            ]
                         }
                     },
                     "additionalProperties": false

charts/osm/values.yaml

@@ -236,16 +236,18 @@ OpenServiceMesh:
   featureFlags:
     # -- Enable extra Envoy statistics generated by a custom WASM extension
     enableWASMStats: true
-    # -- Enable OSM's Egress policy API.
+    # -- Enable OSM's Egress policy API
     # If specified, fine grained control over Egress (external) traffic is enforced
     enableEgressPolicy: true
-    # -- Enable Multicluster mode.
+    # -- Enable Multicluster mode
     # If specified, multicluster mode will be enabled in OSM
     enableMulticlusterMode: false
+    # -- Enable OSM gateway for ingress or multicluster
+    enableOSMGateway: false
 
   # -- Run OSM with PodSecurityPolicy configured
   pspEnabled: false
 
   # -- Node tolerations applied to control plane pods.
   # The specified tolerations allow pods to schedule onto nodes with matching taints.
-  controlPlaneTolerations: []
+  controlPlaneTolerations: []

pkg/apis/config/v1alpha1/mesh_config.go

@@ -159,6 +159,9 @@ type FeatureFlags struct {
 	// EnableMulticlusterMode defines if Multicluster mode is enabled.
 	EnableMulticlusterMode bool `json:"enableMulticlusterMode,omitempty"`
 
-	// EnableSnapshotCacheMode defines if XDS server starts with snapshot cache
+	// EnableSnapshotCacheMode defines if XDS server starts with snapshot cache.
 	EnableSnapshotCacheMode bool `json:"enableSnapshotCacheMode,omitempty"`
+
+	// EnableOSMGateway defines if OSM gateway is enabled.
+	EnableOSMGateway bool `json:"enableOSMGateway,omitempty"`
 }