Skip to content

Use simplified gRPC health probe, make dynamic #6633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Use simplified gRPC health probe, make dynamic #6633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/flyte-core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ helm install gateway bitnami/contour -n flyte
| flyteadmin.image.repository | string | `"cr.flyte.org/flyteorg/flyteadmin"` | Docker image for Flyteadmin deployment |
| flyteadmin.image.tag | string | `"v1.16.0"` | |
| flyteadmin.initialProjects | list | `["flytesnacks","flytetester","flyteexamples"]` | Initial projects to create |
| flyteadmin.livenessProbe | string | `"exec:\n command: [ \"sh\", \"-c\", \"reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \\\"$reply\\\" -lt 200 -o \\\"$reply\\\" -ge 400 ]; then exit 1; fi;\",\"grpc_health_probe\", \"-addr=:8089\"]\ninitialDelaySeconds: 20\nperiodSeconds: 5"` | |
| flyteadmin.livenessProbe | string | `"grpc: \n port: {{ .Values.configmap.adminServer.server.grpc.port }}\ninitialDelaySeconds: 20\nperiodSeconds: 5"` | |
| flyteadmin.nodeSelector | object | `{}` | nodeSelector for Flyteadmin deployment |
| flyteadmin.podAnnotations | object | `{}` | Annotations for Flyteadmin pods |
| flyteadmin.podLabels | object | `{}` | Labels for Flyteadmin pods |
| flyteadmin.priorityClassName | string | `""` | Sets priorityClassName for flyteadmin pod(s). |
| flyteadmin.readinessProbe | string | `"exec:\n command: [ \"sh\", \"-c\", \"reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \\\"$reply\\\" -lt 200 -o \\\"$reply\\\" -ge 400 ]; then exit 1; fi;\",\"grpc_health_probe\", \"-addr=:8089\"]\ninitialDelaySeconds: 15"` | Default readinessProbe and livenessProbe for Flyteadmin deployment |
| flyteadmin.readinessProbe | string | `"grpc: \n port: {{ .Values.configmap.adminServer.server.grpc.port }}\ninitialDelaySeconds: 15"` | Default readinessProbe and livenessProbe for Flyteadmin deployment |
| flyteadmin.replicaCount | int | `1` | Replicas count for Flyteadmin deployment |
| 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 | `{}` | |
Expand Down
4 changes: 2 additions & 2 deletions charts/flyte-core/templates/admin/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ spec:
- containerPort: {{ .Values.configmap.adminServer.flyteadmin.profilerPort }}
readinessProbe:
{{- with .Values.flyteadmin.readinessProbe -}}
{{- . | nindent 10 }}
{{- tpl . $ | nindent 10 }}
{{- end }}
livenessProbe:
{{- with .Values.flyteadmin.livenessProbe -}}
{{- . | nindent 10 }}
{{- tpl . $ | nindent 10 }}
{{- end }}
resources: {{- toYaml .Values.flyteadmin.resources | nindent 10 }}
securityContext:
Expand Down
8 changes: 4 additions & 4 deletions charts/flyte-core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
envFrom: []
# -- Default readinessProbe and livenessProbe for Flyteadmin deployment
readinessProbe: |-
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:

Check failure on line 38 in charts/flyte-core/values.yaml

View workflow job for this annotation

GitHub Actions / lint-and-test-charts 

38:10 [trailing-spaces] trailing spaces
port: {{ .Values.configmap.adminServer.server.grpc.port }}
initialDelaySeconds: 15
livenessProbe: |-
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:

Check failure on line 42 in charts/flyte-core/values.yaml

View workflow job for this annotation

GitHub Actions / lint-and-test-charts 

42:10 [trailing-spaces] trailing spaces
port: {{ .Values.configmap.adminServer.server.grpc.port }}
initialDelaySeconds: 20
periodSeconds: 5
# -- Default resources requests and limits for Flyteadmin deployment
Expand Down
8 changes: 4 additions & 4 deletions deployment/eks/flyte_aws_scheduler_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,12 +998,12 @@ spec:
- containerPort: 8089
- containerPort: 10254
readinessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 15
livenessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 20
periodSeconds: 5
resources:
Expand Down
8 changes: 4 additions & 4 deletions deployment/eks/flyte_helm_controlplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,12 +695,12 @@ spec:
- containerPort: 8089
- containerPort: 10254
readinessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 15
livenessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 20
periodSeconds: 5
resources:
Expand Down
8 changes: 4 additions & 4 deletions deployment/eks/flyte_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,12 +1029,12 @@ spec:
- containerPort: 8089
- containerPort: 10254
readinessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 15
livenessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 20
periodSeconds: 5
resources:
Expand Down
8 changes: 4 additions & 4 deletions deployment/gcp/flyte_helm_controlplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,12 +712,12 @@ spec:
- containerPort: 8089
- containerPort: 10254
readinessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 15
livenessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 20
periodSeconds: 5
resources:
Expand Down
8 changes: 4 additions & 4 deletions deployment/gcp/flyte_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,12 +1054,12 @@ spec:
- containerPort: 8089
- containerPort: 10254
readinessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 15
livenessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 20
periodSeconds: 5
resources:
Expand Down
8 changes: 4 additions & 4 deletions deployment/sandbox/flyte_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6839,12 +6839,12 @@ spec:
- containerPort: 8089
- containerPort: 10254
readinessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 15
livenessProbe:
exec:
command: [ "sh", "-c", "reply=$(curl -s -o /dev/null -w %{http_code} http://127.0.0.1:8088/healthcheck); if [ \"$reply\" -lt 200 -o \"$reply\" -ge 400 ]; then exit 1; fi;","grpc_health_probe", "-addr=:8089"]
grpc:
port: 8089
initialDelaySeconds: 20
periodSeconds: 5
resources:
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete-connector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: QUVqQmx5bGJySWhjSjF0bw==
haSharedSecret: Q2l2cVpqZkRVSEdraWxncw==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1419,7 +1419,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 798c87369386469c6c2311656622a0eb1482625653ad1de361695e01151c57fd
checksum/secret: 9094d1aeff0d8143702cf7880081edf71eec7763e6fb450fa8e9021db1e4dd7f
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: a1doU0xtWUlud0xsSTM5VQ==
haSharedSecret: T1RwaUZlZEV1aG9DQjloZQ==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1367,7 +1367,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 855c4f6fc84fb7a055427bcd712eac03e376383ba1d04ac1ab74bab9c5117879
checksum/secret: 94bd2400673ce3c94eee615da93ff4dcbc32f28bd03aab063dc613a3d98bae88
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ metadata:
---
apiVersion: v1
data:
haSharedSecret: ajRmNnZOcWZQTHlGa2c1eQ==
haSharedSecret: MG1VbHM5bVNIOVdEZnU5Uw==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -934,7 +934,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 907c158b3cdfe55efc0894dbd4ba0762233336309d2584d3bd1167ca43564419
checksum/secret: 7e5bbc472fd9508013f3525a6093c4a1d17f293b40bef0be282eff55c42bf024
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
Loading