Skip to content

Commit

Permalink
[wip] Helm components (#921)
Browse files Browse the repository at this point in the history
Signed-off-by: Haytham Abuelfutuh <[email protected]>
  • Loading branch information
kumare3 authored and EngHabu committed May 6, 2021
1 parent b68013f commit 87a6005
Show file tree
Hide file tree
Showing 9 changed files with 583 additions and 395 deletions.
12 changes: 12 additions & 0 deletions helm/templates/admin/cluster_resource_configmap.yaml
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
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
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
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 }}
- 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

This file was deleted.

2 changes: 1 addition & 1 deletion helm/templates/datacatalog/configmap.yaml
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

0 comments on commit 87a6005

Please sign in to comment.