fix(zeppelin): spark master config

datatok · May 23, 2022 · 7c0783f · 7c0783f
1 parent 756bb1e
commit 7c0783f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 31 deletions.
diff --git a/charts/zeppelin/Chart.yaml b/charts/zeppelin/Chart.yaml
@@ -4,7 +4,7 @@ apiVersion: v2
 name: zeppelin
 description: Apache Zeppelin with Apache Spark
 type: application
-version: 0.4.1
+version: 0.4.2
 appVersion: 0.10.1
 engine: gotpl
 home: https://github.com/ebuildy/helm-data-lake

diff --git a/charts/zeppelin/templates/config-interpreter-settings.yaml b/charts/zeppelin/templates/config-interpreter-settings.yaml
@@ -1,16 +1,3 @@
-{{- $sparkMaster := "local[*]" -}}
-{{- $sparkDeployMode := "client" -}}
-{{- $sparkExecutorInstances := 1 -}}
-{{- if eq .Values.spark.executor.mode "local" -}}
-{{- $sparkMaster := printf "local[%s]" .Values.spark.executor.cores -}}
-{{- $sparkDeployMode := "client" -}}
-{{- $sparkExecutorInstances := 1 -}}
-{{- end -}}
-{{- if eq .Values.spark.executor.mode "cluster" -}}
-{{- $sparkMaster := .Values.spark.executor.masterURL -}}
-{{- $sparkDeployMode := .Values.spark.executor.deployMode | default "client" -}}
-{{- $sparkExecutorInstances := .Values.sparkExternal.executor.instances -}}
-{{- end -}}
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -106,16 +93,6 @@ data:
               "value": "100%",
               "type": "number"
             },
-            "spark.submit.deployMode": {
-              "name": "spark.submit.deployMode",
-              "value": "{{ $sparkDeployMode }}",
-              "type": "string"
-            },
-            "spark.executor.instances": {
-              "name": "spark.executor.instances",
-              "value": "{{ $sparkExecutorInstances }}",
-              "type": "number"
-            },
             "zeppelin.spark.importImplicit": {
               "name": "zeppelin.spark.importImplicit",
               "value": true,
@@ -131,11 +108,6 @@ data:
               "value": "1000",
               "type": "number"
             },
-            "master": {
-              "name": "master",
-              "value": "{{ $sparkMaster }}",
-              "type": "string"
-            },
             "zeppelin.pyspark.python": {
               "name": "zeppelin.pyspark.python",
               "value": "python",

diff --git a/charts/zeppelin/values.yaml b/charts/zeppelin/values.yaml
@@ -182,13 +182,12 @@ spark:
     masterURL: ""
     # -- if mode is not local, deploy mode (client / cluster)
     deployMode: client
-    # -- if mode is not local, how many executors to deploy
-    count: 2
     # -- how many cores (* to use all CPUs)
     # -- in `local` mode, this is equivalent to master = local[cores]
     cores: "*"
   # -- Spark configuration
   config: {}
+  #  spark.master: local[*]
   #  spark.hadoop.hive.metastore.uris: thrift://XXXX:9083
   #  spark.executor.memory: 1G
   #  zeppelin.spark.concurrentSQL: "true"