From b416fb4f86273e7d6a86270bb26d074d4ab2472f Mon Sep 17 00:00:00 2001 From: Christoph Paulik Date: Fri, 18 Oct 2024 10:03:53 +0200 Subject: [PATCH] Allow flytepropeller manager to have different resource request from flyte propeller This can be good since the flytepropeller-manager pod does no work and needs next to no resources Signed-off-by: Christoph Paulik --- charts/flyte-core/README.md | 1 + charts/flyte-core/templates/propeller/deployment.yaml | 4 ++++ charts/flyte-core/values.yaml | 11 +++++++++++ docker/sandbox-bundled/manifests/complete-agent.yaml | 4 ++-- docker/sandbox-bundled/manifests/complete.yaml | 4 ++-- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md index 6aed892810..0ec5d92192 100644 --- a/charts/flyte-core/README.md +++ b/charts/flyte-core/README.md @@ -254,6 +254,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.13.2"` | | | 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 | diff --git a/charts/flyte-core/templates/propeller/deployment.yaml b/charts/flyte-core/templates/propeller/deployment.yaml index 4308f2d6fa..c72db0e7b3 100644 --- a/charts/flyte-core/templates/propeller/deployment.yaml +++ b/charts/flyte-core/templates/propeller/deployment.yaml @@ -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 diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml index 9faaed731a..bbcc39d57a 100755 --- a/charts/flyte-core/values.yaml +++ b/charts/flyte-core/values.yaml @@ -319,6 +319,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 diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 028f719e71..6262b1640a 100644 --- a/docker/sandbox-bundled/manifests/complete-agent.yaml +++ b/docker/sandbox-bundled/manifests/complete-agent.yaml @@ -819,7 +819,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: SlI1TDFkTXBMaThuc0hlSQ== + haSharedSecret: MUpQYWd3RWdMbE9rTmZ3Uw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1416,7 +1416,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: ffc8aa05a602edd8f9b1d7ef35aa1cc5e383bceb9b91307eef99e86f53e13d4e + checksum/secret: c98dbe32a67a71797ba99a1e7f1c5d9ce159daba1ce9213f307de36307182e75 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index c8b8e1c93a..7d19b5321a 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -801,7 +801,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: YjdMdE9yejJzZ2xXSDFBRQ== + haSharedSecret: UVc1NklJQVV6SUJrdWx4bw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1365,7 +1365,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 956ac1b58c049a630c94605eedaba7ba9de3fc01233701ef403ab4bf24fe2a7a + checksum/secret: 8bb91d4715c3fa73d3ba293ae280b3712cdea39180b99789415d590927199169 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 1038da1f64..90aa424daf 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: YUpzb25xNTM1eml3Rmpueg== + haSharedSecret: QmRyWnpiSHhzcW1PNWxoMA== proxyPassword: "" proxyUsername: "" kind: Secret @@ -934,7 +934,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 2720f13bd64051a7acb512e59e426b9f6c5f6c3c7d1d9a3a423e2df4cf9bab46 + checksum/secret: 95c3da89befe34c739968c1c0f2fd8f7e204c84d2d7012364be5149bc00a22cf labels: app: docker-registry release: flyte-sandbox