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

Jump to bottom

[wip] Helm components #921

Merged
merged 5 commits into from
Apr 20, 2021
Merged

[wip] Helm components #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d51dd3e
wip
kumare3 Apr 16, 2021
c43e115
More improvements to helm configuration
kumare3 Apr 17, 2021
3db25d2
Updated templates
kumare3 Apr 20, 2021
d42a18b
Working template
kumare3 Apr 20, 2021
169c12e
EKS and sandbox config cleaned up
kumare3 Apr 20, 2021
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
12 changes: 12 additions & 0 deletions helm/templates/admin/cluster_resource_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{{- if .Values.cluster_resource_manager.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
name: clusterresource-template
namespace: {{ template "flyte.namespace" . }}
labels: {{ include "flyteadmin.labels" . | nindent 4 }}
data:
{{- range .Values.cluster_resource_manager.templates }}
{{ .key }}.yaml: | {{ .value | nindent 4 }}
{{- end }}
{{- end }}
23 changes: 16 additions & 7 deletions helm/templates/admin/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ metadata:
namespace: {{ template "flyte.namespace" . }}
labels: {{ include "flyteadmin.labels" . | nindent 4 }}
data:
{{- with .Values.configmap.cluster_resources }}
cluster_resources.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.configmap.db }}
{{- with .Values.db }}
db.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.configmap.domain }}
Expand All @@ -17,13 +14,25 @@ data:
{{- with .Values.configmap.logger }}
logger.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.configmap.remote_data }}
remote_data.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.configmap.server }}
server.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
storage.yaml: | {{ include "storage" . | nindent 4 }}
{{- with .Values.configmap.task_resource_defaults }}
task_resource_defaults.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.workflow_notifications.enabled }}
{{- with .Values.workflow_notifications.config }}
notifications.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- if .Values.cluster_resource_manager.enabled }}
{{- with .Values.cluster_resource_manager.config }}
cluster_resources.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- if .Values.workflow_scheduler.enabled }}
{{- with .Values.workflow_scheduler.config }}
scheduler.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions helm/templates/admin/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.cluster_resource_manager.enabled }}
apiVersion: batch/v1beta1
kind: CronJob
metadata:
Expand Down Expand Up @@ -38,3 +39,4 @@ spec:
- configMap:
name: flyte-admin-config
name: config-volume
{{- end }}
4 changes: 4 additions & 0 deletions helm/templates/admin/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ spec:
volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
- mountPath: /etc/flyte/config
name: config-volume
{{- if .Values.cluster_resource_manager.enabled }}
- command:
- flyteadmin
- --config
Expand All @@ -67,6 +68,7 @@ spec:
name: resource-templates
- mountPath: /etc/flyte/config
name: config-volume
{{- end }}
containers:
- command:
- flyteadmin
Expand Down Expand Up @@ -115,9 +117,11 @@ spec:
- configMap:
name: flyte-admin-config
name: config-volume
{{- if .Values.cluster_resource_manager.enabled }}
Copy link
Member

Choose a reason for hiding this comment

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

We should think about naming conventions at some point. Right now we have camel case and mixed.

- configMap:
name: clusterresource-template
name: resource-templates
{{- end }}
{{- with .Values.flyteadmin.nodeSelector }}
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
Expand Down
27 changes: 0 additions & 27 deletions helm/templates/common/configmap.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion helm/templates/datacatalog/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: {{ template "flyte.namespace" . }}
labels: {{ include "datacatalog.labels" . | nindent 4 }}
data:
{{- with .Values.configmap.db }}
{{- with .Values.db }}
db.yaml: | {{ toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.configmap.logger }}
Expand Down
Loading