Allow flytepropeller manager to have different resource request from …

…flyte propeller (#5974) This can be good since the flytepropeller-manager pod does no work and needs next to no resources Signed-off-by: Christoph Paulik <christoph@planet.com> Signed-off-by: Eduardo Apolinario <eapolinario@users.noreply.github.com> Co-authored-by: Eduardo Apolinario <eapolinario@users.noreply.github.com>
flyteorg · Dec 26, 2024 · c06f188 · c06f188
1 parent bf38993
commit c06f188
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md
@@ -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 |

diff --git 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
@@ -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

diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml
@@ -823,7 +823,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: YUNORVNVRjBKVFpMTjVzZg==
+  haSharedSecret: ZVg2MDdXYnJyNXlYUWlLSA==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1420,7 +1420,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 89b23b61fb0b3e8423af547ebb08fefb82a79836f1eaaf90e838ebcb71bb2a1b
+        checksum/secret: 4d048d7850540d6862f070a28041c7c814d011e537872aecce2159789db2db79
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml
@@ -805,7 +805,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: YmtheFJhUGp0WTh5dEo4Ug==
+  haSharedSecret: VXRnT3hJaE9CMEZldDJubg==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1369,7 +1369,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 249d45f57d99d60d9ba687a2b5451154fa1e5a1be8c5e399d769b7e0c73c5aaa
+        checksum/secret: 8a6224d331e9ccebb789367315d7f9677d9f4c7886640c8baeea547432cca5ad
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml
@@ -499,7 +499,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: UU1hc3Z1dWJ0YVB4R01vZA==
+  haSharedSecret: bnFsU3VrQTFsRmd0azdvcQ==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -934,7 +934,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: ad2c03695a15547e840a4affe09ef070307393f9c4195ace08231ffaad4f7971
+        checksum/secret: 492f9045abb64dc1e4f8fa90bb957960ea3ccd8d03b424a3a2fa2a83bfb87531
       labels:
         app: docker-registry
         release: flyte-sandbox