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

Enable user to provide spark job template as input for jobservice deployment #1285

Merged
merged 2 commits into from
Jan 26, 2021
Merged

Enable user to provide spark job template as input for jobservice deployment #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
763639b
Enable user to provide spark job template as input for jobservice dep…
khorshuheng Jan 25, 2021
19d347c
Peg mypy version for CI
khorshuheng Jan 26, 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
16 changes: 16 additions & 0 deletions infra/charts/feast/charts/feast-jobservice/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{{- if .Values.sparkOperator.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ template "feast-jobservice.fullname" . }}-spark-template
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "feast-jobservice.name" . }}
component: jobservice
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
jobTemplate.yaml: |
{{- toYaml .Values.sparkOperator.jobTemplate | nindent 4 }}
{{- end }}
17 changes: 15 additions & 2 deletions infra/charts/feast/charts/feast-jobservice/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,43 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}

{{- if .Values.secrets }}
{{- if or .Values.secrets .Values.sparkOperator.enabled }}
volumes:
{{- end }}
{{- range $secret := .Values.secrets }}
- name: {{ $secret }}
secret:
secretName: {{ $secret }}
{{- end }}
{{- if .Values.sparkOperator.enabled }}
- name: {{ template "feast-jobservice.fullname" . }}-spark-template
configMap:
name: {{ template "feast-jobservice.fullname" . }}-spark-template
{{- end }}

containers:
- name: {{ .Chart.Name }}
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.image.pullPolicy }}

{{- if .Values.secrets }}
{{- if or .Values.secrets .Values.sparkOperator.enabled }}
volumeMounts:
{{- end }}
{{- range $secret := .Values.secrets }}
- name: {{ $secret }}
mountPath: "/etc/secrets/{{ $secret }}"
readOnly: true
{{- end }}
{{- if .Values.sparkOperator.enabled }}
- name: {{ template "feast-jobservice.fullname" . }}-spark-template
mountPath: "/etc/configs"
{{- end }}

env:
{{- if .Values.sparkOperator.enabled }}
- name: FEAST_SPARK_K8S_JOB_TEMPLATE_PATH
value: /etc/configs/jobTemplate.yaml
{{- end }}
{{- range $key, $value := .Values.envOverrides }}
- name: {{ printf "%s" $key | replace "." "_" | upper | quote }}
{{- if eq (kindOf $value) "map" }}
Expand Down
9 changes: 9 additions & 0 deletions infra/charts/feast/charts/feast-jobservice/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ gcpServiceAccount:
# gcpProjectId -- Project ID to use when using Google Cloud services such as BigQuery, Cloud Storage and Dataflow
gcpProjectId: ""

sparkOperator:
# sparkOperator.enabled -- Flag to create and mount custom job template on the jobservice deployment as configmap
enabled: false
# sparkOperator.jobTemplate -- Content of the job template, in yaml format
jobTemplate: {}

prometheus:
# prometheus.enabled -- Flag to enable scraping of metrics
enabled: true
Expand Down Expand Up @@ -124,3 +130,6 @@ envOverrides: {}

# podLabels -- Labels to be added to Feast Job Service pods
podLabels: {}

# secrets -- Arbitrary secrets to mount on the job service pod, on /etc/secrets/<secret name>
secrets: []
2 changes: 1 addition & 1 deletion sdk/python/requirements-ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pandas~=1.0.0
mock==2.0.0
pandavro==1.5.*
moto
mypy
mypy==0.790
mypy-protobuf
avro==1.10.0
gcsfs
Expand Down