-
Notifications
You must be signed in to change notification settings - Fork 972
[K8S][HELM] Add Spark engine configuration support #4776
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| {{/* | ||
| Licensed to the Apache Software Foundation (ASF) under one or more | ||
| contributor license agreements. See the NOTICE file distributed with | ||
| this work for additional information regarding copyright ownership. | ||
| The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| (the "License"); you may not use this file except in compliance with | ||
| the License. You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */}} | ||
|
|
||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ .Release.Name }}-spark | ||
| labels: {{- include "kyuubi.labels" . | nindent 4 }} | ||
| data: | ||
| {{- with .Values.engine.spark.conf.sparkEnv }} | ||
| spark-env.sh: | | ||
| #!/usr/bin/env bash | ||
| {{- tpl . $ | nindent 4 }} | ||
| {{- end }} | ||
|
|
||
| spark-defaults.conf: | | ||
| ## Helm chart provided Spark configurations | ||
| spark.submit.deployMode=cluster | ||
|
|
||
| spark.master={{ .Values.engine.spark.master }} | ||
| spark.kubernetes.namespace={{ .Values.engine.spark.namespace | default .Release.Namespace }} | ||
|
|
||
| spark.kubernetes.authenticate.driver.serviceAccountName={{ .Values.engine.spark.serviceAccount.name | default (printf "%s-spark" .Release.Name) }} | ||
| spark.kubernetes.authenticate.executor.serviceAccountName={{ .Values.engine.spark.serviceAccount.name | default (printf "%s-spark" .Release.Name) }} | ||
|
|
||
| ### Image properties | ||
| spark.kubernetes.container.image={{ .Values.engine.spark.image.repository }}:{{ .Values.engine.spark.image.tag }} | ||
| spark.kubernetes.container.image.pullPolicy={{ .Values.engine.spark.image.pullPolicy }} | ||
| spark.kubernetes.container.image.pullSecrets={{ range .Values.imagePullSecrets }}{{ print .name "," }}{{ end }} | ||
|
|
||
| ### Driver resources | ||
| spark.driver.cores={{ .Values.engine.spark.driver.resources.cores }} | ||
| {{- with .Values.engine.spark.driver.resources.coresRequest }} | ||
| spark.kubernetes.driver.request.cores={{ . }} | ||
| {{- end }} | ||
| {{- with .Values.engine.spark.driver.resources.coresLimit }} | ||
| spark.kubernetes.driver.limit.cores={{ . }} | ||
| {{- end }} | ||
| spark.driver.memory={{ .Values.engine.spark.driver.resources.memory }} | ||
| {{- with .Values.engine.spark.driver.resources.memoryOverhead }} | ||
| spark.driver.memoryOverhead={{ . }} | ||
| {{- end }} | ||
| {{- with .Values.engine.spark.driver.resources.memoryOverheadFactor }} | ||
| spark.driver.memoryOverheadFactor={{ . }} | ||
| {{- end }} | ||
|
|
||
| ### Executor resources | ||
| spark.executor.instances={{ .Values.engine.spark.executor.instances }} | ||
| spark.executor.cores={{ .Values.engine.spark.executor.resources.cores }} | ||
| {{- with .Values.engine.spark.executor.resources.coresRequest }} | ||
| spark.kubernetes.executor.request.cores={{ . }} | ||
| {{- end }} | ||
| {{- with .Values.engine.spark.executor.resources.coresLimit }} | ||
| spark.kubernetes.executor.limit.cores={{ . }} | ||
| {{- end }} | ||
| spark.executor.memory={{ .Values.engine.spark.executor.resources.memory }} | ||
| {{- with .Values.engine.spark.executor.resources.memoryOverhead }} | ||
| spark.executor.memoryOverhead={{ . }} | ||
| {{- end }} | ||
| {{- with .Values.engine.spark.executor.resources.memoryOverheadFactor }} | ||
| spark.executor.memoryOverheadFactor={{ . }} | ||
| {{- end }} | ||
|
|
||
| ## User provided Spark configurations | ||
| {{- with .Values.engine.spark.conf.sparkDefaults }} | ||
| {{- tpl . $ | nindent 4 }} | ||
| {{- end }} | ||
|
|
||
| {{- with .Values.engine.spark.conf.driverPodTemplate }} | ||
| driver-pod-template.yaml: | | ||
| {{- tpl . $ | nindent 4 }} | ||
| {{- end }} | ||
|
|
||
| {{- with .Values.engine.spark.conf.executorPodTemplate }} | ||
| executor-pod-template.yaml: | | ||
| {{- tpl . $ | nindent 4 }} | ||
| {{- end }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| {{/* | ||
| Licensed to the Apache Software Foundation (ASF) under one or more | ||
| contributor license agreements. See the NOTICE file distributed with | ||
| this work for additional information regarding copyright ownership. | ||
| The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| (the "License"); you may not use this file except in compliance with | ||
| the License. You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */}} | ||
|
|
||
| {{- if .Values.engine.spark.rbac.create }} | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: Role | ||
| metadata: | ||
| name: {{ .Release.Name }}-spark | ||
| {{- if .Values.engine.spark.namespace }} | ||
| namespace: {{ .Values.engine.spark.namespace }} | ||
| {{- end }} | ||
| labels: {{- include "kyuubi.labels" . | nindent 4 }} | ||
| rules: | ||
| - apiGroups: [""] | ||
| resources: ["configmaps", "pods", "services"] | ||
| verbs: ["list", "create", "get", "watch", "delete"] | ||
| {{- end }} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
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.
IMO this is kind of over-engineering stuff.
One advantage of Kyuubi is, it almost transparently supports all Spark features, users who are familiar w/ Spark, should easy to understand how Kyuubi works and how to configure the Spark engine.
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.
Seems we can put everything in
spark-defaults.conftovalues.yaml'ssparkDefaultsblock, in Spark native configuration.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.
You are right, it is over-engineered implementation and it might confuse users about what to configure and where.
I would like to find some balance between convenient basic configuration and flexibility, but obviously it is not the best implementation.