Skip to content
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

Allow flytepropeller manager to have different resource request from flyte propeller #5974

Merged
merged 3 commits into from
Dec 26, 2024
+22 −6
Merged

Allow flytepropeller manager to have different resource request from flyte propeller #5974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b416fb4
Allow flytepropeller manager to have different resource request from …
cpaulik Oct 18, 2024
e1e8b88
Merge remote-tracking branch 'origin' into flyte-propeller-manager-re…
eapolinario Dec 5, 2024
2ff4195
Merge remote-tracking branch 'origin' into flyte-propeller-manager-re…
eapolinario Dec 26, 2024
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
1 change: 1 addition & 0 deletions charts/flyte-core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ helm install gateway bitnami/contour -n flyte
| flytepropeller.image.repository | string | `"cr.flyte.org/flyteorg/flytepropeller"` | Docker image for Flytepropeller deployment |
| flytepropeller.image.tag | string | `"v1.14.1"` | |
| flytepropeller.manager | bool | `false` | |
| flytepropeller.manager_resources | object | `{"resources":{"limits":{"cpu":"200m","ephemeral-storage":"100Mi","memory":"200Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"100Mi"}}}` | If manager is set to true this can be used to give the flytepropeller-manager different resource requests than the sharded flyte propeller pods |
| flytepropeller.nodeSelector | object | `{}` | nodeSelector for Flytepropeller deployment |
| flytepropeller.podAnnotations | object | `{}` | Annotations for Flytepropeller pods |
| flytepropeller.podEnv | object | `{}` | Additional Flytepropeller container environment variables |
Expand Down
4 changes: 4 additions & 0 deletions charts/flyte-core/templates/propeller/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ spec:
{{- end }}
ports:
- containerPort: {{ index .Values.configmap.core.propeller "prof-port" }}
{{- if and (.Values.flytepropeller.manager) (.Values.flytepropeller.manager_resources) }}
resources: {{- toYaml .Values.flytepropeller.manager_resources.resources | nindent 10 }}
{{- else }}
resources: {{- toYaml .Values.flytepropeller.resources | nindent 10 }}
{{- end }}
volumeMounts:
- name: config-volume
mountPath: /etc/flyte/config
Expand Down
11 changes: 11 additions & 0 deletions charts/flyte-core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,17 @@ flytepropeller:
cpu: 10m
ephemeral-storage: 50Mi
memory: 100Mi
# -- If manager is set to true this can be used to give the flytepropeller-manager different resource requests than the sharded flyte propeller pods
manager_resources:
resources:
limits:
cpu: 200m
ephemeral-storage: 100Mi
memory: 200Mi
requests:
cpu: 10m
ephemeral-storage: 50Mi
memory: 100Mi
# -- Error reporting
terminationMessagePolicy: FallbackToLogsOnError
# -- Default regex string for searching configuration files
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: YUNORVNVRjBKVFpMTjVzZg==
haSharedSecret: ZVg2MDdXYnJyNXlYUWlLSA==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1420,7 +1420,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 89b23b61fb0b3e8423af547ebb08fefb82a79836f1eaaf90e838ebcb71bb2a1b
checksum/secret: 4d048d7850540d6862f070a28041c7c814d011e537872aecce2159789db2db79
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 @@ -805,7 +805,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: YmtheFJhUGp0WTh5dEo4Ug==
haSharedSecret: VXRnT3hJaE9CMEZldDJubg==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1369,7 +1369,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 249d45f57d99d60d9ba687a2b5451154fa1e5a1be8c5e399d769b7e0c73c5aaa
checksum/secret: 8a6224d331e9ccebb789367315d7f9677d9f4c7886640c8baeea547432cca5ad
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: UU1hc3Z1dWJ0YVB4R01vZA==
haSharedSecret: bnFsU3VrQTFsRmd0azdvcQ==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -934,7 +934,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: ad2c03695a15547e840a4affe09ef070307393f9c4195ace08231ffaad4f7971
checksum/secret: 492f9045abb64dc1e4f8fa90bb957960ea3ccd8d03b424a3a2fa2a83bfb87531
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
Loading