Skip to content

Commit d59ba85

Browse files
author
Fabio Grätz
committed
Fix: Make appProtocols optional flyte flyteadmin and flyteconsole services in helm chart
Signed-off-by: Fabio Grätz <[email protected]>
1 parent 25c89ee commit d59ba85

13 files changed

+22
-38
lines changed

‎charts/flyte-core/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ helm install gateway bitnami/contour -n flyte
191191
| 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 |
192192
| flyteadmin.secrets | object | `{}` | |
193193
| flyteadmin.securityContext | object | `{"fsGroup":65534,"fsGroupChangePolicy":"Always","runAsNonRoot":true,"runAsUser":1001,"seLinuxOptions":{"type":"spc_t"}}` | Sets securityContext for flyteadmin pod(s). |
194-
| flyteadmin.service | object | `{"additionalPorts":[],"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"loadBalancerSourceRanges":[],"type":"ClusterIP"}` | Service settings for Flyteadmin |
194+
| flyteadmin.service | object | `{"additionalPorts":[],"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"appProtocols":{"enabled":false},"loadBalancerSourceRanges":[],"type":"ClusterIP"}` | Service settings for Flyteadmin |
195195
| flyteadmin.service.additionalPorts | list | `[]` | Appends additional ports to the service spec. |
196196
| 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 |
197197
| 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) |
@@ -234,7 +234,7 @@ helm install gateway bitnami/contour -n flyte
234234
| flyteconsole.replicaCount | int | `1` | Replicas count for Flyteconsole deployment |
235235
| flyteconsole.resources | object | `{"limits":{"cpu":"500m","memory":"250Mi"},"requests":{"cpu":"10m","memory":"50Mi"}}` | Default resources requests and limits for Flyteconsole deployment |
236236
| flyteconsole.securityContext | object | `{"fsGroupChangePolicy":"OnRootMismatch","runAsNonRoot":true,"runAsUser":1000,"seLinuxOptions":{"type":"spc_t"}}` | Sets securityContext for flyteconsole pod(s). |
237-
| flyteconsole.service | object | `{"annotations":{},"type":"ClusterIP"}` | Service settings for Flyteconsole |
237+
| flyteconsole.service | object | `{"annotations":{},"appProtocols":{"enabled":false},"type":"ClusterIP"}` | Service settings for Flyteconsole |
238238
| flyteconsole.serviceMonitor | object | `{"enabled":false,"interval":"60s","labels":{},"scrapeTimeout":"30s"}` | Settings for flyteconsole service monitor |
239239
| flyteconsole.serviceMonitor.enabled | bool | `false` | If enabled create the flyteconsole service monitor |
240240
| flyteconsole.serviceMonitor.interval | string | `"60s"` | Sets the interval at which metrics will be scraped by prometheus |

‎charts/flyte-core/templates/admin/service.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,30 @@ spec:
2020
- name: http
2121
port: 80
2222
protocol: TCP
23+
{{- if .Values.flyteadmin.service.appProtocols.enabled }}
2324
appProtocol: TCP
25+
{{- end }}
2426
targetPort: 8088
2527
- name: grpc
2628
port: 81
2729
protocol: TCP
2830
# intentionally set to TCP instead of grpc
31+
{{- if .Values.flyteadmin.service.appProtocols.enabled }}
2932
appProtocol: TCP
33+
{{- end }}
3034
targetPort: 8089
3135
- name: redoc
3236
protocol: TCP
37+
{{- if .Values.flyteadmin.service.appProtocols.enabled }}
3338
appProtocol: TCP
39+
{{- end }}
3440
port: 87
3541
targetPort: 8087
3642
- name: http-metrics
3743
protocol: TCP
44+
{{- if .Values.flyteadmin.service.appProtocols.enabled }}
3845
appProtocol: TCP
46+
{{- end }}
3947
port: 10254
4048
{{- with .Values.flyteadmin.service.additionalPorts -}}
4149
{{ tpl (toYaml .) $ | nindent 4 }}

‎charts/flyte-core/templates/console/service.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ spec:
1616
- name: http
1717
port: 80
1818
protocol: TCP
19+
{{- if .Values.flyteconsole.service.appProtocols.enabled }}
1920
appProtocol: TCP
21+
{{- end }}
2022
targetPort: 8080
2123
{{- if .Values.flyteconsole.serviceMonitor.enabled }}
2224
- name: http-metrics

‎charts/flyte-core/values.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ flyteadmin:
5050
- flyteexamples
5151
# -- Service settings for Flyteadmin
5252
service:
53+
appProtocols:
54+
enabled: false
5355
annotations:
5456
projectcontour.io/upstream-protocol.h2c: grpc
5557
type: ClusterIP
@@ -407,6 +409,8 @@ flyteconsole:
407409
memory: 50Mi
408410
# -- Service settings for Flyteconsole
409411
service:
412+
appProtocols:
413+
enabled: false
410414
annotations: {}
411415
type: ClusterIP
412416
# -- Annotations for Flyteconsole pods

‎deployment/eks/flyte_aws_scheduler_helm_generated.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -751,22 +751,18 @@ spec:
751751
- name: http
752752
port: 80
753753
protocol: TCP
754-
appProtocol: TCP
755754
targetPort: 8088
756755
- name: grpc
757756
port: 81
758757
protocol: TCP
759758
# intentionally set to TCP instead of grpc
760-
appProtocol: TCP
761759
targetPort: 8089
762760
- name: redoc
763761
protocol: TCP
764-
appProtocol: TCP
765762
port: 87
766763
targetPort: 8087
767764
- name: http-metrics
768765
protocol: TCP
769-
appProtocol: TCP
770766
port: 10254
771767
selector:
772768
app.kubernetes.io/name: flyteadmin
@@ -789,7 +785,6 @@ spec:
789785
- name: http
790786
port: 80
791787
protocol: TCP
792-
appProtocol: TCP
793788
targetPort: 8080
794789
selector:
795790
app.kubernetes.io/name: flyteconsole

‎deployment/eks/flyte_helm_controlplane_generated.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -474,22 +474,18 @@ spec:
474474
- name: http
475475
port: 80
476476
protocol: TCP
477-
appProtocol: TCP
478477
targetPort: 8088
479478
- name: grpc
480479
port: 81
481480
protocol: TCP
482481
# intentionally set to TCP instead of grpc
483-
appProtocol: TCP
484482
targetPort: 8089
485483
- name: redoc
486484
protocol: TCP
487-
appProtocol: TCP
488485
port: 87
489486
targetPort: 8087
490487
- name: http-metrics
491488
protocol: TCP
492-
appProtocol: TCP
493489
port: 10254
494490
selector:
495491
app.kubernetes.io/name: flyteadmin
@@ -512,7 +508,6 @@ spec:
512508
- name: http
513509
port: 80
514510
protocol: TCP
515-
appProtocol: TCP
516511
targetPort: 8080
517512
selector:
518513
app.kubernetes.io/name: flyteconsole

‎deployment/eks/flyte_helm_generated.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -782,22 +782,18 @@ spec:
782782
- name: http
783783
port: 80
784784
protocol: TCP
785-
appProtocol: TCP
786785
targetPort: 8088
787786
- name: grpc
788787
port: 81
789788
protocol: TCP
790789
# intentionally set to TCP instead of grpc
791-
appProtocol: TCP
792790
targetPort: 8089
793791
- name: redoc
794792
protocol: TCP
795-
appProtocol: TCP
796793
port: 87
797794
targetPort: 8087
798795
- name: http-metrics
799796
protocol: TCP
800-
appProtocol: TCP
801797
port: 10254
802798
selector:
803799
app.kubernetes.io/name: flyteadmin
@@ -820,7 +816,6 @@ spec:
820816
- name: http
821817
port: 80
822818
protocol: TCP
823-
appProtocol: TCP
824819
targetPort: 8080
825820
selector:
826821
app.kubernetes.io/name: flyteconsole

‎deployment/gcp/flyte_helm_controlplane_generated.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -488,22 +488,18 @@ spec:
488488
- name: http
489489
port: 80
490490
protocol: TCP
491-
appProtocol: TCP
492491
targetPort: 8088
493492
- name: grpc
494493
port: 81
495494
protocol: TCP
496495
# intentionally set to TCP instead of grpc
497-
appProtocol: TCP
498496
targetPort: 8089
499497
- name: redoc
500498
protocol: TCP
501-
appProtocol: TCP
502499
port: 87
503500
targetPort: 8087
504501
- name: http-metrics
505502
protocol: TCP
506-
appProtocol: TCP
507503
port: 10254
508504
selector:
509505
app.kubernetes.io/name: flyteadmin
@@ -526,7 +522,6 @@ spec:
526522
- name: http
527523
port: 80
528524
protocol: TCP
529-
appProtocol: TCP
530525
targetPort: 8080
531526
selector:
532527
app.kubernetes.io/name: flyteconsole

‎deployment/gcp/flyte_helm_generated.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -804,22 +804,18 @@ spec:
804804
- name: http
805805
port: 80
806806
protocol: TCP
807-
appProtocol: TCP
808807
targetPort: 8088
809808
- name: grpc
810809
port: 81
811810
protocol: TCP
812811
# intentionally set to TCP instead of grpc
813-
appProtocol: TCP
814812
targetPort: 8089
815813
- name: redoc
816814
protocol: TCP
817-
appProtocol: TCP
818815
port: 87
819816
targetPort: 8087
820817
- name: http-metrics
821818
protocol: TCP
822-
appProtocol: TCP
823819
port: 10254
824820
selector:
825821
app.kubernetes.io/name: flyteadmin
@@ -842,7 +838,6 @@ spec:
842838
- name: http
843839
port: 80
844840
protocol: TCP
845-
appProtocol: TCP
846841
targetPort: 8080
847842
selector:
848843
app.kubernetes.io/name: flyteconsole

‎deployment/sandbox/flyte_helm_generated.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -6145,22 +6145,18 @@ spec:
61456145
- name: http
61466146
port: 80
61476147
protocol: TCP
6148-
appProtocol: TCP
61496148
targetPort: 8088
61506149
- name: grpc
61516150
port: 81
61526151
protocol: TCP
61536152
# intentionally set to TCP instead of grpc
6154-
appProtocol: TCP
61556153
targetPort: 8089
61566154
- name: redoc
61576155
protocol: TCP
6158-
appProtocol: TCP
61596156
port: 87
61606157
targetPort: 8087
61616158
- name: http-metrics
61626159
protocol: TCP
6163-
appProtocol: TCP
61646160
port: 10254
61656161
selector:
61666162
app.kubernetes.io/name: flyteadmin
@@ -6183,7 +6179,6 @@ spec:
61836179
- name: http
61846180
port: 80
61856181
protocol: TCP
6186-
appProtocol: TCP
61876182
targetPort: 8080
61886183
selector:
61896184
app.kubernetes.io/name: flyteconsole

‎docker/sandbox-bundled/manifests/complete-agent.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ type: Opaque
819819
---
820820
apiVersion: v1
821821
data:
822-
haSharedSecret: c2Z6ZUdxTjJ1bEc1QlVaeQ==
822+
haSharedSecret: MzdjVFBHVmlTTUJLV2FLRA==
823823
proxyPassword: ""
824824
proxyUsername: ""
825825
kind: Secret
@@ -1416,7 +1416,7 @@ spec:
14161416
metadata:
14171417
annotations:
14181418
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
1419-
checksum/secret: ad072a5177dfbeacda100d536f1c7d611808b1c7f79dc6d02d9dbf24b8294e3b
1419+
checksum/secret: 51eef38b8d9341f4897669e28bab62b0ef7f2a690e6c78756e25dff548f68c57
14201420
labels:
14211421
app: docker-registry
14221422
release: flyte-sandbox

‎docker/sandbox-bundled/manifests/complete.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ type: Opaque
801801
---
802802
apiVersion: v1
803803
data:
804-
haSharedSecret: TUpUek9Ib3BpWTlEbFRvSw==
804+
haSharedSecret: QzdpNFV1b01KaVpCZ3NrbQ==
805805
proxyPassword: ""
806806
proxyUsername: ""
807807
kind: Secret
@@ -1365,7 +1365,7 @@ spec:
13651365
metadata:
13661366
annotations:
13671367
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
1368-
checksum/secret: 09204971564694f6090d55069cf0853843456945f781aa7842f33021d09f4f25
1368+
checksum/secret: 14a953a34adb01e2532145c9fc3eec829b95c5515b181f8877e9837c8ff5ed10
13691369
labels:
13701370
app: docker-registry
13711371
release: flyte-sandbox

‎docker/sandbox-bundled/manifests/dev.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ metadata:
499499
---
500500
apiVersion: v1
501501
data:
502-
haSharedSecret: d2VkcjRnRHkyTmZrOU52cw==
502+
haSharedSecret: SmFESFBwbUNNYWxHYWlzYQ==
503503
proxyPassword: ""
504504
proxyUsername: ""
505505
kind: Secret
@@ -934,7 +934,7 @@ spec:
934934
metadata:
935935
annotations:
936936
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
937-
checksum/secret: 3b1376c2c63f4fff6745ad085844b7a1d7c8ad2cce13cae4e1e9c3ea495cebaa
937+
checksum/secret: cdfbf45c37e81185184e6abf451cbe04ab03e455ccfd425e83f2e6fddb0b4339
938938
labels:
939939
app: docker-registry
940940
release: flyte-sandbox

0 commit comments

Comments
 (0)