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.

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

Increase default project quota in the sandbox and demo #3061

Merged
merged 7 commits into from
Nov 17, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
76 changes: 76 additions & 0 deletions charts/flyte-core/values-sandbox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ configmap:
CONFIG_DIR: /etc/flyte/config
DISABLE_AUTH: "1"

# -- Task default resources configuration
# Refer to the full [structure](https://pkg.go.dev/github.com/lyft/[email protected]/pkg/runtime/interfaces#TaskResourceConfiguration).
task_resource_defaults:
# -- Task default resources parameters
task_resources:
defaults:
cpu: 500m
memory: 500Mi
storage: 500Mi
limits:
cpu: 20
memory: 10Gi
storage: 20Mi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this so low? Do we have to set it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is the default value in value.yaml. Yup, it's optional. I just removed it to make the config simple.

gpu: 10


# -- Kubernetes specific Flyte configuration
k8s:
Expand Down Expand Up @@ -102,3 +117,64 @@ redis:
# --- enable or disable Redis Statefulset installation
enabled: false

# -- Configuration for the Cluster resource manager component. This is an optional component, that enables automatic
# cluster configuration. This is useful to set default quotas, manage namespaces etc that map to a project/domain
cluster_resource_manager:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this block?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC, If we don't add it, the sandbox will use the default config in value.yaml

How did you test this, Kevin?

I rebuilt the sandbox image and ran the command flytectl sandbox start --image pingsutw/sandbox-test to create cluster. Then check if the resource is updated in the configmap.

# -- Enables the Cluster resource manager component
enabled: true
standaloneDeployment: false
# -- Service account name to run with
service_account_name: flyteadmin
# -- Annotations for ClusterResource pods
podAnnotations: {}
# -- Configmap for ClusterResource parameters
config:
# -- ClusterResource parameters
# Refer to the [structure](https://pkg.go.dev/github.com/lyft/[email protected]/pkg/runtime/interfaces#ClusterResourceConfig) to customize.
cluster_resources:
# -- How frequently to run the sync process
refreshInterval: 5m
templatePath: "/etc/flyte/clusterresource/templates"
# -- Starts the cluster resource manager in standalone mode with requisite auth credentials to call flyteadmin service endpoints
standaloneDeployment: false
customData:
- production:
- projectQuotaCpu:
value: "50"
- projectQuotaMemory:
value: "40000Mi"
- staging:
- projectQuotaCpu:
value: "20"
- projectQuotaMemory:
value: "30000Mi"
- development:
- projectQuotaCpu:
value: "40"
- projectQuotaMemory:
value: "30000Mi"

# -- Resource templates that should be applied
templates:
# -- Template for namespaces resources
- key: aa_namespace
value: |
apiVersion: v1
kind: Namespace
metadata:
name: {{ namespace }}
spec:
finalizers:
- kubernetes

- key: ab_project_resource_quota
value: |
apiVersion: v1
kind: ResourceQuota
metadata:
name: project-quota
namespace: {{ namespace }}
spec:
hard:
limits.cpu: {{ projectQuotaCpu }}
limits.memory: {{ projectQuotaMemory }}
17 changes: 11 additions & 6 deletions flyte.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,25 +78,30 @@ cluster_resources:
customData:
- production:
- projectQuotaCpu:
value: "5"
value: "50"
- projectQuotaMemory:
value: "4000Mi"
value: "40000Mi"
- staging:
- projectQuotaCpu:
value: "2"
value: "20"
- projectQuotaMemory:
value: "3000Mi"
value: "30000Mi"
- development:
- projectQuotaCpu:
value: "4"
value: "40"
- projectQuotaMemory:
value: "3000Mi"
value: "30000Mi"
refresh: 5m
task_resources:
defaults:
cpu: 500m
memory: 500Mi
storage: 500Mi
limits:
cpu: 20
memory: 10Gi
storage: 20Mi
gpu: 10
catalog-cache:
endpoint: localhost:8081
insecure: true
Expand Down
17 changes: 11 additions & 6 deletions flyte_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,19 @@ cluster_resources:
customData:
- production:
- projectQuotaCpu:
value: "5"
value: "50"
- projectQuotaMemory:
value: "4000Mi"
value: "40000Mi"
- staging:
- projectQuotaCpu:
value: "2"
value: "20"
- projectQuotaMemory:
value: "3000Mi"
value: "30000Mi"
- development:
- projectQuotaCpu:
value: "4"
value: "40"
- projectQuotaMemory:
value: "3000Mi"
value: "30000Mi"
refresh: 5m
flyte:
admin:
Expand All @@ -104,6 +104,11 @@ task_resources:
cpu: 500m
memory: 500Mi
storage: 500Mi
limits:
cpu: 20
memory: 10Gi
storage: 20Mi
gpu: 10
catalog-cache:
endpoint: localhost:8081
insecure: true
Expand Down
12 changes: 6 additions & 6 deletions flyte_local_k3d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@ cluster_resources:
customData:
- production:
- projectQuotaCpu:
value: "5"
value: "50"
- projectQuotaMemory:
value: "4000Mi"
value: "40000Mi"
- staging:
- projectQuotaCpu:
value: "2"
value: "20"
- projectQuotaMemory:
value: "3000Mi"
value: "30000Mi"
- development:
- projectQuotaCpu:
value: "4"
value: "40"
- projectQuotaMemory:
value: "3000Mi"
value: "30000Mi"
refresh: 5m
flyte:
admin:
Expand Down