-
Notifications
You must be signed in to change notification settings - Fork 659
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
Improve flyte-core helm chart #5362
base: master
Are you sure you want to change the base?
Changes from all commits
fe7c72e
16963fd
0d6bcbc
35494d7
1a939cb
9e3e27c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,17 +60,21 @@ helm install gateway bitnami/contour -n flyte | |
| cloud_events.eventsPublisher.eventTypes[0] | string | `"all"` | | | ||
| cloud_events.eventsPublisher.topicName | string | `"arn:aws:sns:us-east-2:123456:123-my-topic"` | | | ||
| cloud_events.type | string | `"aws"` | | | ||
| cluster_resource_manager | object | `{"config":{"cluster_resources":{"customData":[{"production":[{"projectQuotaCpu":{"value":"5"}},{"projectQuotaMemory":{"value":"4000Mi"}}]},{"staging":[{"projectQuotaCpu":{"value":"2"}},{"projectQuotaMemory":{"value":"3000Mi"}}]},{"development":[{"projectQuotaCpu":{"value":"4"}},{"projectQuotaMemory":{"value":"3000Mi"}}]}],"refreshInterval":"5m","standaloneDeployment":false,"templatePath":"/etc/flyte/clusterresource/templates"}},"enabled":true,"nodeSelector":{},"podAnnotations":{},"podEnv":{},"podLabels":{},"resources":{},"service_account_name":"flyteadmin","standaloneDeployment":false,"templates":[{"key":"aa_namespace","value":"apiVersion: v1\nkind: Namespace\nmetadata:\n name: {{ namespace }}\nspec:\n finalizers:\n - kubernetes\n"},{"key":"ab_project_resource_quota","value":"apiVersion: v1\nkind: ResourceQuota\nmetadata:\n name: project-quota\n namespace: {{ namespace }}\nspec:\n hard:\n limits.cpu: {{ projectQuotaCpu }}\n limits.memory: {{ projectQuotaMemory }}\n"}]}` | 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 | object | `{"config":{"cluster_resources":{"customData":[{"production":[{"projectQuotaCpu":{"value":"5"}},{"projectQuotaMemory":{"value":"4000Mi"}}]},{"staging":[{"projectQuotaCpu":{"value":"2"}},{"projectQuotaMemory":{"value":"3000Mi"}}]},{"development":[{"projectQuotaCpu":{"value":"4"}},{"projectQuotaMemory":{"value":"3000Mi"}}]}],"refreshInterval":"5m","standaloneDeployment":false,"templatePath":"/etc/flyte/clusterresource/templates"}},"enabled":true,"nameOverride":null,"nodeSelector":{},"podAnnotations":{},"podEnv":[],"podLabels":{},"resources":{},"serviceAccount":{"annotations":{},"create":true,"imagePullSecrets":[]},"service_account_name":"flyteadmin","standaloneDeployment":false,"templates":[{"key":"aa_namespace","value":"apiVersion: v1\nkind: Namespace\nmetadata:\n name: {{ namespace }}\nspec:\n finalizers:\n - kubernetes\n"},{"key":"ab_project_resource_quota","value":"apiVersion: v1\nkind: ResourceQuota\nmetadata:\n name: project-quota\n namespace: {{ namespace }}\nspec:\n hard:\n limits.cpu: {{ projectQuotaCpu }}\n limits.memory: {{ projectQuotaMemory }}\n"}]}` | 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.config | object | `{"cluster_resources":{"customData":[{"production":[{"projectQuotaCpu":{"value":"5"}},{"projectQuotaMemory":{"value":"4000Mi"}}]},{"staging":[{"projectQuotaCpu":{"value":"2"}},{"projectQuotaMemory":{"value":"3000Mi"}}]},{"development":[{"projectQuotaCpu":{"value":"4"}},{"projectQuotaMemory":{"value":"3000Mi"}}]}],"refreshInterval":"5m","standaloneDeployment":false,"templatePath":"/etc/flyte/clusterresource/templates"}}` | Configmap for ClusterResource parameters | | ||
| cluster_resource_manager.config.cluster_resources | object | `{"customData":[{"production":[{"projectQuotaCpu":{"value":"5"}},{"projectQuotaMemory":{"value":"4000Mi"}}]},{"staging":[{"projectQuotaCpu":{"value":"2"}},{"projectQuotaMemory":{"value":"3000Mi"}}]},{"development":[{"projectQuotaCpu":{"value":"4"}},{"projectQuotaMemory":{"value":"3000Mi"}}]}],"refreshInterval":"5m","standaloneDeployment":false,"templatePath":"/etc/flyte/clusterresource/templates"}` | ClusterResource parameters Refer to the [structure](https://pkg.go.dev/github.com/lyft/[email protected]/pkg/runtime/interfaces#ClusterResourceConfig) to customize. | | ||
| cluster_resource_manager.config.cluster_resources.refreshInterval | string | `"5m"` | How frequently to run the sync process | | ||
| cluster_resource_manager.config.cluster_resources.standaloneDeployment | bool | `false` | Starts the cluster resource manager in standalone mode with requisite auth credentials to call flyteadmin service endpoints | | ||
| cluster_resource_manager.enabled | bool | `true` | Enables the Cluster resource manager component | | ||
| cluster_resource_manager.nodeSelector | object | `{}` | nodeSelector for ClusterResource deployment | | ||
| cluster_resource_manager.podAnnotations | object | `{}` | Annotations for ClusterResource pods | | ||
| cluster_resource_manager.podEnv | object | `{}` | Additional ClusterResource container environment variables | | ||
| cluster_resource_manager.podEnv | list | `[]` | Additional ClusterResource container environment variables | | ||
| cluster_resource_manager.podLabels | object | `{}` | Labels for ClusterResource pods | | ||
| cluster_resource_manager.resources | object | `{}` | Resources for ClusterResource deployment | | ||
| cluster_resource_manager.serviceAccount | object | `{"annotations":{},"create":true,"imagePullSecrets":[]}` | Configuration for service accounts for ClusterResource, will ignore service_account_name if set | | ||
| cluster_resource_manager.serviceAccount.annotations | object | `{}` | Annotations for ServiceAccount attached to the ClusterResource | | ||
| cluster_resource_manager.serviceAccount.create | bool | `true` | Should a service account be created for the ClusterResource | | ||
| cluster_resource_manager.serviceAccount.imagePullSecrets | list | `[]` | ImagePullSecrets to automatically assign to the service ClusterResource | | ||
| cluster_resource_manager.service_account_name | string | `"flyteadmin"` | Service account name to run with | | ||
| cluster_resource_manager.templates | list | `[{"key":"aa_namespace","value":"apiVersion: v1\nkind: Namespace\nmetadata:\n name: {{ namespace }}\nspec:\n finalizers:\n - kubernetes\n"},{"key":"ab_project_resource_quota","value":"apiVersion: v1\nkind: ResourceQuota\nmetadata:\n name: project-quota\n namespace: {{ namespace }}\nspec:\n hard:\n limits.cpu: {{ projectQuotaCpu }}\n limits.memory: {{ projectQuotaMemory }}\n"}]` | Resource templates that should be applied | | ||
| cluster_resource_manager.templates[0] | object | `{"key":"aa_namespace","value":"apiVersion: v1\nkind: Namespace\nmetadata:\n name: {{ namespace }}\nspec:\n finalizers:\n - kubernetes\n"}` | Template for namespaces resources | | ||
|
@@ -133,7 +137,7 @@ helm install gateway bitnami/contour -n flyte | |
| datacatalog.image.tag | string | `"v1.12.1-rc0"` | Docker image tag | | ||
| datacatalog.nodeSelector | object | `{}` | nodeSelector for Datacatalog deployment | | ||
| datacatalog.podAnnotations | object | `{}` | Annotations for Datacatalog pods | | ||
| datacatalog.podEnv | object | `{}` | Additional Datacatalog container environment variables | | ||
| datacatalog.podEnv | list | `[]` | Additional Datacatalog container environment variables | | ||
| datacatalog.podLabels | object | `{}` | Labels for Datacatalog pods | | ||
| datacatalog.priorityClassName | string | `""` | Sets priorityClassName for datacatalog pod(s). | | ||
| datacatalog.replicaCount | int | `1` | Replicas count for Datacatalog deployment | | ||
|
@@ -211,13 +215,17 @@ helm install gateway bitnami/contour -n flyte | |
| flyteconsole.imagePullSecrets | list | `[]` | ImagePullSecrets to assign to the Flyteconsole deployment | | ||
| flyteconsole.nodeSelector | object | `{}` | nodeSelector for Flyteconsole deployment | | ||
| flyteconsole.podAnnotations | object | `{}` | Annotations for Flyteconsole pods | | ||
| flyteconsole.podEnv | object | `{}` | Additional Flyteconsole container environment variables | | ||
| flyteconsole.podEnv | list | `[]` | Additional Flyteconsole container environment variables | | ||
| flyteconsole.podLabels | object | `{}` | Labels for Flyteconsole pods | | ||
| flyteconsole.priorityClassName | string | `""` | Sets priorityClassName for flyte console pod(s). | | ||
| flyteconsole.replicaCount | int | `1` | Replicas count for Flyteconsole deployment | | ||
| flyteconsole.resources | object | `{"limits":{"cpu":"500m","memory":"250Mi"},"requests":{"cpu":"10m","memory":"50Mi"}}` | Default resources requests and limits for Flyteconsole deployment | | ||
| flyteconsole.securityContext | object | `{"fsGroupChangePolicy":"OnRootMismatch","runAsNonRoot":true,"runAsUser":1000,"seLinuxOptions":{"type":"spc_t"}}` | Sets securityContext for flyteconsole pod(s). | | ||
| flyteconsole.service | object | `{"annotations":{},"type":"ClusterIP"}` | Service settings for Flyteconsole | | ||
| flyteconsole.serviceAccount | object | `{"annotations":{},"create":true,"imagePullSecrets":[]}` | Configuration for service accounts for FlyteConsole | | ||
| flyteconsole.serviceAccount.annotations | object | `{}` | Annotations for ServiceAccount attached to the console | | ||
| flyteconsole.serviceAccount.create | bool | `true` | Should a service account be created for the console | | ||
| flyteconsole.serviceAccount.imagePullSecrets | list | `[]` | ImagePullSecrets to automatically assign to the service console | | ||
| flyteconsole.tolerations | list | `[]` | tolerations for Flyteconsole deployment | | ||
| flytepropeller.additionalContainers | list | `[]` | Appends additional containers to the deployment spec. May include template values. | | ||
| flytepropeller.additionalVolumeMounts | list | `[]` | Appends additional volume mounts to the main container's spec. May include template values. | | ||
|
@@ -235,7 +243,7 @@ helm install gateway bitnami/contour -n flyte | |
| flytepropeller.manager | bool | `false` | | | ||
| flytepropeller.nodeSelector | object | `{}` | nodeSelector for Flytepropeller deployment | | ||
| flytepropeller.podAnnotations | object | `{}` | Annotations for Flytepropeller pods | | ||
| flytepropeller.podEnv | object | `{}` | Additional Flytepropeller container environment variables | | ||
| flytepropeller.podEnv | list | `[]` | Additional Flytepropeller container environment variables | | ||
| flytepropeller.podLabels | object | `{}` | Labels for Flytepropeller pods | | ||
| flytepropeller.priorityClassName | string | `""` | Sets priorityClassName for propeller pod(s). | | ||
| flytepropeller.replicaCount | int | `1` | Replicas count for Flytepropeller deployment | | ||
|
@@ -265,7 +273,7 @@ helm install gateway bitnami/contour -n flyte | |
| flytescheduler.image.tag | string | `"v1.12.1-rc0"` | Docker image tag | | ||
| flytescheduler.nodeSelector | object | `{}` | nodeSelector for Flytescheduler deployment | | ||
| flytescheduler.podAnnotations | object | `{}` | Annotations for Flytescheduler pods | | ||
| flytescheduler.podEnv | object | `{}` | Additional Flytescheduler container environment variables | | ||
| flytescheduler.podEnv | list | `[]` | Additional Flytescheduler container environment variables | | ||
| flytescheduler.podLabels | object | `{}` | Labels for Flytescheduler pods | | ||
| flytescheduler.priorityClassName | string | `""` | Sets priorityClassName for flyte scheduler pod(s). | | ||
| flytescheduler.resources | object | `{"limits":{"cpu":"250m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}}` | Default resources requests and limits for Flytescheduler deployment | | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,5 +34,4 @@ data: | |
clusters: | ||
{{- tpl (toYaml .) $ | nindent 6 }} | ||
{{- end }} | ||
|
||
{{- end }} | ||
{{- end }} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: syncresources | ||
name: {{ template "flyteclusterresourcesync.name" . }} | ||
namespace: {{ template "flyte.namespace" . }} | ||
labels: {{ include "flyteclusterresourcesync.labels" . | nindent 4 }} | ||
spec: | ||
|
@@ -55,7 +55,7 @@ spec: | |
- mountPath: /var/run/credentials | ||
name: cluster-secrets | ||
{{- end }} | ||
serviceAccountName: {{ .Values.cluster_resource_manager.service_account_name }} | ||
serviceAccountName: {{ .Values.cluster_resource_manager.serviceAccount.create | ternary (include "flyteclusterresourcesync.name" .) .Values.cluster_resource_manager.service_account_name }} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Attempted to keep backwards compatibility here. |
||
volumes: {{- include "databaseSecret.volume" . | nindent 8 }} | ||
- configMap: | ||
name: clusterresource-template | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{{- if .Values.cluster_resource_manager.enabled }} | ||
{{- if .Values.cluster_resource_manager.serviceAccount.create }} | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: {{ template "flyteclusterresourcesync.name" . }} | ||
namespace: {{ template "flyte.namespace" . }} | ||
labels: {{ include "flyteclusterresourcesync.labels" . | nindent 4 }} | ||
{{- with .Values.cluster_resource_manager.serviceAccount.annotations }} | ||
annotations: {{ tpl (toYaml .) $ | nindent 4 }} | ||
{{- end}} | ||
{{- with .Values.cluster_resource_manager.serviceAccount.imagePullSecrets }} | ||
imagePullSecrets: {{ tpl (toYaml .) $ | nindent 2 }} | ||
{{- end }} | ||
{{- end }} | ||
{{- end }} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{{- if .Values.flyteconsole.enabled }} | ||
{{- if .Values.flyteconsole.serviceAccount.create }} | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: {{ template "flyteconsole.name" . }} | ||
namespace: {{ template "flyte.namespace" . }} | ||
labels: {{ include "flyteconsole.labels" . | nindent 4 }} | ||
{{- with .Values.flyteconsole.serviceAccount.annotations }} | ||
annotations: {{ tpl (toYaml .) $ | nindent 4 }} | ||
{{- end}} | ||
{{- with .Values.flyteconsole.serviceAccount.imagePullSecrets }} | ||
imagePullSecrets: {{ tpl (toYaml .) $ | nindent 2 }} | ||
{{- end }} | ||
{{- end }} | ||
{{- end }} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,5 +17,5 @@ imagePullSecrets: {{ tpl (toYaml .) $ | nindent 2 }} | |
{{- end }} | ||
|
||
--- | ||
{{- end }} | ||
{{- end }} | ||
{{- end }} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -171,7 +171,7 @@ flytescheduler: | |
# -- Annotations for Flytescheduler pods | ||
podAnnotations: {} | ||
# -- Additional Flytescheduler container environment variables | ||
podEnv: {} | ||
podEnv: [] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These are mapped to arrays, so it gives a warning when you set them in the values.yaml. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah thanks! 👍 That's my mistake and I probably missed this when I added it because we're setting |
||
# -- Labels for Flytescheduler pods | ||
podLabels: {} | ||
# -- nodeSelector for Flytescheduler deployment | ||
|
@@ -243,7 +243,7 @@ datacatalog: | |
# -- Annotations for Datacatalog pods | ||
podAnnotations: {} | ||
# -- Additional Datacatalog container environment variables | ||
podEnv: {} | ||
podEnv: [] | ||
# -- Labels for Datacatalog pods | ||
podLabels: {} | ||
# -- nodeSelector for Datacatalog deployment | ||
|
@@ -338,7 +338,7 @@ flytepropeller: | |
# -- Annotations for Flytepropeller pods | ||
podAnnotations: {} | ||
# -- Additional Flytepropeller container environment variables | ||
podEnv: {} | ||
podEnv: [] | ||
# -- Labels for Flytepropeller pods | ||
podLabels: {} | ||
# -- nodeSelector for Flytepropeller deployment | ||
|
@@ -408,10 +408,18 @@ flyteconsole: | |
service: | ||
annotations: {} | ||
type: ClusterIP | ||
# -- Configuration for service accounts for FlyteConsole | ||
serviceAccount: | ||
# -- Should a service account be created for the console | ||
create: true | ||
# -- Annotations for ServiceAccount attached to the console | ||
annotations: {} | ||
# -- ImagePullSecrets to automatically assign to the service console | ||
imagePullSecrets: [] | ||
# -- Annotations for Flyteconsole pods | ||
podAnnotations: {} | ||
# -- Additional Flyteconsole container environment variables | ||
podEnv: {} | ||
podEnv: [] | ||
# -- Labels for Flyteconsole pods | ||
podLabels: {} | ||
# -- nodeSelector for Flyteconsole deployment | ||
|
@@ -912,12 +920,22 @@ cluster_resource_manager: | |
# -- Enables the Cluster resource manager component | ||
enabled: true | ||
standaloneDeployment: false | ||
# nameOverride String to override flyteclusterresourcesync.name template | ||
nameOverride: | ||
# -- Service account name to run with | ||
service_account_name: flyteadmin | ||
# -- Configuration for service accounts for ClusterResource, will ignore service_account_name if set | ||
serviceAccount: | ||
# -- Should a service account be created for the ClusterResource | ||
create: true | ||
# -- Annotations for ServiceAccount attached to the ClusterResource | ||
annotations: {} | ||
# -- ImagePullSecrets to automatically assign to the service ClusterResource | ||
imagePullSecrets: [] | ||
# -- Annotations for ClusterResource pods | ||
podAnnotations: {} | ||
# -- Additional ClusterResource container environment variables | ||
podEnv: {} | ||
podEnv: [] | ||
# -- Labels for ClusterResource pods | ||
podLabels: {} | ||
# -- nodeSelector for ClusterResource deployment | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will technically recreate the deployment when it renames, not sure if that is an issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does this re-create the deployment? or does this create a new deployment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
new, it will tear down the old deployment and make a new one. it renames this to
flyteclusterresourcesync
https://github.com/flyteorg/flyte/blob/master/charts/flyte-core/templates/_helpers.tpl#L62