support two spark version

spotguides · Jun 21, 2019 · 6f03ef7 · 6f03ef7
1 parent 70e8c7b
commit 6f03ef7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/.banzaicloud/pipeline.yaml b/.banzaicloud/pipeline.yaml
@@ -54,6 +54,19 @@ pipeline:
           enabled:
         zeppelin-spark:
           zeppelin:
+            {{{{- if eq .pipeline.deploy_application.deployment.values.banzaicloud.spark.version "2.3.2" }}}}
+            image:
+              tag: v0.9.0-k8s-1.0.74
+            sparkSubmitOptions:
+              sparkImage:
+                tag: v0.9.0-k8s-1.0.74
+            {{{{- else if eq .pipeline.deploy_application.deployment.values.banzaicloud.spark.version "2.4.3" }}}}
+            image:
+              tag: v0.9.0-k8s-1.0.77
+            sparkSubmitOptions:
+              sparkImage:
+                tag: v0.9.0-k8s-1.0.77
+            {{{{- end }}}}
             userCredentialSecretName: '{{ .CICD_REPO_NAME }}-zeppelin-auth'
             sparkEventLogStorage:
               secretName: '{{ .CICD_REPO_NAME }}-hs-bucket'
@@ -72,6 +85,12 @@ pipeline:
               jmxCollector:
               metricsProperties:
             spark-hs:
+              image:
+                {{{{- if eq .pipeline.deploy_application.deployment.values.banzaicloud.spark.version "2.3.2" }}}}
+                tag: v2.3.2.146
+                {{{{- else if eq .pipeline.deploy_application.deployment.values.banzaicloud.spark.version "2.4.3" }}}}
+                tag: v2.4.3.198
+                {{{{- end }}}}
               sparkEventLogStorage:
                 secretName: '{{ .CICD_REPO_NAME }}-hs-bucket'
               ingress:

diff --git a/.banzaicloud/spotguide.yaml b/.banzaicloud/spotguide.yaml
@@ -59,17 +59,14 @@ questions:
   key: spark_version_enum
   label: 'Spark Version'
   description: ''
-  default: '2.3.2'
+  default: '2.4.3'
   required: true
   group: Spark
   options:
-  - label: '2.3.2'
-    value: v0.9.0-k8s-1.0.74
-  - label: '2.4.0'
-    value: v0.9.0-k8s-1.0.77
+  - '2.3.2'
+  - '2.4.3'
   targets:
-  - deploy_application.deployment.values.zeppelin-spark.zeppelin.image.tag
-  - deploy_application.deployment.values.zeppelin-spark.zeppelin.sparkSubmitOptions.sparkImage.tag
+  - deploy_application.deployment.values.banzaicloud.spark.version
 - type: pipeline
   dataType: string
   controlType: code