Added additional port configuration for flyte services (#5233)

* added additional port configuration for flyte services Signed-off-by: Daniel Rammer <[email protected]> * removed unecessary extra end Signed-off-by: Daniel Rammer <[email protected]> * fixed datacatalog indentation Signed-off-by: Daniel Rammer <[email protected]> --------- Signed-off-by: Daniel Rammer <[email protected]>
flyteorg · Apr 15, 2024 · 2ba277f · 2ba277f
1 parent 7287470
commit 2ba277f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md
@@ -139,7 +139,8 @@ helm install gateway bitnami/contour -n flyte
 | datacatalog.replicaCount | int | `1` | Replicas count for Datacatalog deployment |
 | datacatalog.resources | object | `{"limits":{"cpu":"500m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}}` | Default resources requests and limits for Datacatalog deployment |
 | datacatalog.securityContext | object | `{"fsGroup":1001,"fsGroupChangePolicy":"OnRootMismatch","runAsNonRoot":true,"runAsUser":1001,"seLinuxOptions":{"type":"spc_t"}}` | Sets securityContext for datacatalog pod(s). |
-| datacatalog.service | object | `{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"type":"NodePort"}` | Service settings for Datacatalog |
+| datacatalog.service | object | `{"additionalPorts":[],"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"type":"NodePort"}` | Service settings for Datacatalog |
+| datacatalog.service.additionalPorts | list | `[]` | Appends additional ports to the service spec. |
 | datacatalog.serviceAccount | object | `{"annotations":{},"create":true,"imagePullSecrets":[]}` | Configuration for service accounts for Datacatalog |
 | datacatalog.serviceAccount.annotations | object | `{}` | Annotations for ServiceAccount attached to Datacatalog pods |
 | datacatalog.serviceAccount.create | bool | `true` | Should a service account be created for Datacatalog |
@@ -175,7 +176,8 @@ helm install gateway bitnami/contour -n flyte
 | flyteadmin.resources | object | `{"limits":{"cpu":"250m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}}` | Default resources requests and limits for Flyteadmin deployment |
 | flyteadmin.secrets | object | `{}` |  |
 | flyteadmin.securityContext | object | `{"fsGroup":65534,"fsGroupChangePolicy":"Always","runAsNonRoot":true,"runAsUser":1001,"seLinuxOptions":{"type":"spc_t"}}` | Sets securityContext for flyteadmin pod(s). |
-| flyteadmin.service | object | `{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"loadBalancerSourceRanges":[],"type":"ClusterIP"}` | Service settings for Flyteadmin |
+| flyteadmin.service | object | `{"additionalPorts":[],"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"loadBalancerSourceRanges":[],"type":"ClusterIP"}` | Service settings for Flyteadmin |
+| flyteadmin.service.additionalPorts | list | `[]` | Appends additional ports to the service spec. |
 | flyteadmin.serviceAccount | object | `{"alwaysCreate":false,"annotations":{},"clusterRole":{"apiGroups":["","flyte.lyft.com","rbac.authorization.k8s.io"],"resources":["configmaps","flyteworkflows","namespaces","pods","resourcequotas","roles","rolebindings","secrets","services","serviceaccounts","spark-role","limitranges"],"verbs":["*"]},"create":true,"createClusterRole":true,"imagePullSecrets":[]}` | Configuration for service accounts for FlyteAdmin |
 | flyteadmin.serviceAccount.alwaysCreate | bool | `false` | Should a service account always be created for flyteadmin even without an actual flyteadmin deployment running (e.g. for multi-cluster setups) |
 | flyteadmin.serviceAccount.annotations | object | `{}` | Annotations for ServiceAccount attached to Flyteadmin pods |
@@ -236,7 +238,8 @@ helm install gateway bitnami/contour -n flyte
 | flytepropeller.replicaCount | int | `1` | Replicas count for Flytepropeller deployment |
 | flytepropeller.resources | object | `{"limits":{"cpu":"200m","ephemeral-storage":"100Mi","memory":"200Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"100Mi"}}` | Default resources requests and limits for Flytepropeller deployment |
 | flytepropeller.securityContext | object | `{"fsGroup":65534,"fsGroupChangePolicy":"Always","runAsUser":1001}` | Sets securityContext for flytepropeller pod(s). |
-| flytepropeller.service | object | `{"enabled":false}` | Settings for flytepropeller service |
+| flytepropeller.service | object | `{"additionalPorts":[],"enabled":false}` | Settings for flytepropeller service |
+| flytepropeller.service.additionalPorts | list | `[]` | Appends additional ports to the service spec. |
 | flytepropeller.service.enabled | bool | `false` | If enabled create the flytepropeller service |
 | flytepropeller.serviceAccount | object | `{"annotations":{},"create":true,"imagePullSecrets":[]}` | Configuration for service accounts for FlytePropeller |
 | flytepropeller.serviceAccount.annotations | object | `{}` | Annotations for ServiceAccount attached to FlytePropeller pods |

diff --git a/charts/flyte-core/templates/admin/service.yaml b/charts/flyte-core/templates/admin/service.yaml
@@ -32,5 +32,8 @@ spec:
     - name: http-metrics
       protocol: TCP
       port: 10254
+    {{- with .Values.flyteadmin.service.additionalPorts -}}
+    {{ tpl (toYaml .) $ | nindent 4 }}
+    {{- end }}
   selector: {{ include "flyteadmin.selectorLabels" . | nindent 4 }}
 {{- end }}
diff --git a/charts/flyte-core/templates/datacatalog/service.yaml b/charts/flyte-core/templates/datacatalog/service.yaml
@@ -21,5 +21,8 @@ spec:
     port: 89
     protocol: TCP
     targetPort: 8089
+  {{- with .Values.datacatalog.service.additionalPorts -}}
+  {{ tpl (toYaml .) $ | nindent 2 }}
+  {{- end }}
   selector: {{ include "datacatalog.selectorLabels" . | nindent 4 }}
 {{- end }}
diff --git a/charts/flyte-core/templates/propeller/service.yaml b/charts/flyte-core/templates/propeller/service.yaml
@@ -11,5 +11,8 @@ spec:
     - name: http-metrics
       protocol: TCP
       port: 10254
+    {{- with .Values.flytepropeller.service.additionalPorts -}}
+    {{ tpl (toYaml .) $ | nindent 4 }}
+    {{- end }}
   selector: {{ include "flytepropeller.selectorLabels" . | nindent 4 }}
 {{- end }}
diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml
@@ -54,6 +54,8 @@ flyteadmin:
       projectcontour.io/upstream-protocol.h2c: grpc
     type: ClusterIP
     loadBalancerSourceRanges: []
+    # -- Appends additional ports to the service spec.
+    additionalPorts: []
   # -- Configuration for service accounts for FlyteAdmin
   serviceAccount:
     # -- Should a service account be created for flyteadmin
@@ -228,6 +230,8 @@ datacatalog:
     annotations:
       projectcontour.io/upstream-protocol.h2c: grpc
     type: NodePort
+    # -- Appends additional ports to the service spec.
+    additionalPorts: []
   # -- Configuration for service accounts for Datacatalog
   serviceAccount:
     # -- Should a service account be created for Datacatalog
@@ -356,6 +360,8 @@ flytepropeller:
   service:
     # -- If enabled create the flytepropeller service
     enabled: false
+    # -- Appends additional ports to the service spec.
+    additionalPorts: []
 
   # -- Settings for flytepropeller service monitor
   serviceMonitor: