feat(multicluster): customize multicluster gateway port

Signed-off-by: Allen Leigh <[email protected]>
openservicemesh · Jul 22, 2021 · 6f4fd21 · 6f4fd21
1 parent 6721dc6
commit 6f4fd21
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/charts/osm/README.md b/charts/osm/README.md
@@ -117,6 +117,7 @@ The following table lists the configurable parameters of the osm chart and their
 | OpenServiceMesh.injector.webhookTimeoutSeconds | int | `20` | Mutating webhook timeout |
 | OpenServiceMesh.maxDataPlaneConnections | int | `0` | Sets the max data plane connections allowed for an instance of osm-controller, set to 0 to not enforce limits |
 | OpenServiceMesh.meshName | string | `"osm"` | Identifier for the instance of a service mesh within a cluster |
+| OpenServiceMesh.multicluster.gatewayPort | int | `14080` | The port number of the multicluster gateway service |
 | OpenServiceMesh.osmController.autoScale | object | `{"enable":false,"maxReplicas":5,"minReplicas":1,"targetAverageUtilization":80}` | Auto scale configuration |
 | OpenServiceMesh.osmController.autoScale.enable | bool | `false` | Enable Autoscale |
 | OpenServiceMesh.osmController.autoScale.maxReplicas | int | `5` | Maximum replicas for autoscale |

diff --git a/charts/osm/templates/osm-gateway-deployment.yaml b/charts/osm/templates/osm-gateway-deployment.yaml
@@ -43,7 +43,7 @@ spec:
             "--service-cluster", "osm-gateway",
           ]
           ports:
-            - containerPort: 14080
+            - containerPort: {{ .Values.OpenServiceMesh.multicluster.gatewayPort }}
               name: http2
               protocol: TCP
           volumeMounts:

diff --git a/charts/osm/values.schema.json b/charts/osm/values.schema.json
@@ -702,6 +702,26 @@
                     },
                     "additionalProperties": false
                 },
+                "multicluster": {
+                    "$id": "#/properties/OpenServiceMesh/properties/multicluster",
+                    "type": "object",
+                    "title": "Multicluster",
+                    "description": "Configuration for multicluster features",
+                    "required": [
+                        "gatewayPort"
+                    ],
+                    "properties": {
+                        "gatewayPort": {
+                            "$id": "#/properties/OpenServiceMesh/properties/multicluster/properties/gatewayPort",
+                            "type": "integer",
+                            "title": "Gateway port",
+                            "description": "Port number of multicluster gateway",
+                            "examples": [
+                                12345
+                            ]
+                        }
+                    }
+                },
                 "featureFlags": {
                     "$id": "#/properties/OpenServiceMesh/properties/featureFlags",
                     "type": "object",

diff --git a/charts/osm/values.yaml b/charts/osm/values.yaml
@@ -261,6 +261,11 @@ OpenServiceMesh:
     # When enabled, OSM will use the IngressBackend API allow ingress traffic to mesh backends
     enableIngressBackendPolicy: false
 
+  #
+  # -- OSM multicluster feature configuration
+  multicluster:
+    # -- The port number of the multicluster gateway service
+    gatewayPort: 14080
 
   # -- Run OSM with PodSecurityPolicy configured
   pspEnabled: false