Now noting when the default spark image is used so we can make a bett…

…er decision when possibly overriding it via a configmap entry. Fixes issue radanalyticsio#90.
crobby · Dec 13, 2017 · 8ec8eef · 8ec8eef
1 parent 56bb7d5
commit 8ec8eef
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/app/scripts/clusterops.js b/app/scripts/clusterops.js
@@ -178,11 +178,6 @@ angular.module('openshiftConsole')
             successThreshold: 1,
             failureThreshold: 3
           };
-          container.resources = {
-            limits: {
-              memory: "700Mi"
-            }
-          };
         }
 
         var replicas;
@@ -399,7 +394,13 @@ angular.module('openshiftConsole')
               finalConfig["workerConfigName"] = cm.data["sparkworkerconfig"];
             }
             if (cm.data["sparkimage"]) {
-              finalConfig["sparkImage"] = cm.data["sparkimage"];
+              if (origConfig.sparkImage  && !origConfig.sparkDefaultUsed) {
+                finalConfig["sparkImage"] = origConfig.sparkImage;
+              } else {
+                finalConfig["sparkImage"] = cm.data["sparkimage"];
+              }
+            } else {
+              finalConfig["sparkImage"] = origConfig.sparkImage;
             }
             if (cm.data["exposeui"]) {
               finalConfig["exposewebui"] = cm.data["exposeui"];
@@ -416,9 +417,6 @@ angular.module('openshiftConsole')
             if (origConfig.masterConfigName) {
               finalConfig["masterConfigName"] = origConfig.masterConfigName;
             }
-            if (origConfig.sparkImage) {
-              finalConfig["sparkImage"] = origConfig.sparkImage;
-            }
             deferred.resolve(finalConfig);
           }).catch(function () {
             if (origConfig.workerConfigName) {

diff --git a/app/scripts/createcluster.js b/app/scripts/createcluster.js
@@ -102,6 +102,7 @@ angular.module('oshinkoConsole')
           exposewebui: advanced ? $scope.fields.exposewebui : true,
           metrics: advanced ? $scope.fields.enablemetrics : true,
           sparkImage: advanced && $scope.fields.sparkimage !== "" ? $scope.fields.sparkimage  : "radanalyticsio/openshift-spark",
+          sparkDefaultUsed: $scope.advanced && $scope.fields.sparkimage !== "" ? false  : true
         };
 
         return ProjectsService

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -310,7 +310,7 @@ timeoutSeconds:1,
 periodSeconds:10,
 successThreshold:1,
 failureThreshold:3
-}) :(i.livenessProbe = {
+}) :i.livenessProbe = {
 httpGet:{
 path:"/",
 port:8081,
@@ -320,11 +320,7 @@ timeoutSeconds:1,
 periodSeconds:10,
 successThreshold:1,
 failureThreshold:3
-}, i.resources = {
-limits:{
-memory:"700Mi"
-}
-});
+};
 var j;
 j = a.scaling.autoscaling ? a.scaling.minReplicas || 1 :a.scaling.replicas;
 var k = {
@@ -482,7 +478,7 @@ return c.create("routes", null, f, b);
 function s(a, d) {
 var e = b.defer(), f = {};
 return f.clusterName = a.clusterName, a.configName ? c.get("configmaps", a.configName, d, null).then(function(b) {
-b.data.workercount && (f.workerCount = parseInt(b.data.workercount)), b.data.mastercount && (f.masterCount = parseInt(b.data.mastercount)), b.data.sparkmasterconfig && (f.masterConfigName = b.data.sparkmasterconfig), b.data.sparkworkerconfig && (f.workerConfigName = b.data.sparkworkerconfig), b.data.sparkimage && (f.sparkImage = b.data.sparkimage), b.data.exposeui && (f.exposewebui = b.data.exposeui), b.data.metrics && (f.metrics = b.data.metrics), a.workerCount && a.workerCount >= 0 && (f.workerCount = a.workerCount), a.workerConfigName && (f.workerConfigName = a.workerConfigName), a.masterConfigName && (f.masterConfigName = a.masterConfigName), a.sparkImage && (f.sparkImage = a.sparkImage), e.resolve(f);
+b.data.workercount && (f.workerCount = parseInt(b.data.workercount)), b.data.mastercount && (f.masterCount = parseInt(b.data.mastercount)), b.data.sparkmasterconfig && (f.masterConfigName = b.data.sparkmasterconfig), b.data.sparkworkerconfig && (f.workerConfigName = b.data.sparkworkerconfig), b.data.sparkimage ? a.sparkImage && !a.sparkDefaultUsed ? f.sparkImage = a.sparkImage :f.sparkImage = b.data.sparkimage :f.sparkImage = a.sparkImage, b.data.exposeui && (f.exposewebui = b.data.exposeui), b.data.metrics && (f.metrics = b.data.metrics), a.workerCount && a.workerCount >= 0 && (f.workerCount = a.workerCount), a.workerConfigName && (f.workerConfigName = a.workerConfigName), a.masterConfigName && (f.masterConfigName = a.masterConfigName), e.resolve(f);
 })["catch"](function() {
 a.workerConfigName && (f.workerConfigName = a.workerConfigName), a.masterConfigName && (f.masterConfigName = a.masterConfigName), a.sparkImage && (f.sparkImage = a.sparkImage), f.exposewebui = a.exposewebui, f.metrics = a.metrics, f.workerCount = a.workerCount, f.masterCount = a.masterCount, e.resolve(f);
 }) :(a.workerConfigName && (f.workerConfigName = a.workerConfigName), a.masterConfigName && (f.masterConfigName = a.masterConfigName), a.sparkImage && (f.sparkImage = a.sparkImage), f.exposewebui = a.exposewebui, f.metrics = a.metrics, f.workerCount = a.workerCount, f.masterCount = a.masterCount, e.resolve(f)), f.workerCount < 0 && (f.workerCount = 1), e.promise;
@@ -579,7 +575,8 @@ masterConfigName:c ? b.fields.masterconfigname :null,
 workerConfigName:c ? b.fields.workerconfigname :null,
 exposewebui:!c || b.fields.exposewebui,
 metrics:!c || b.fields.enablemetrics,
-sparkImage:c && "" !== b.fields.sparkimage ? b.fields.sparkimage :"radanalyticsio/openshift-spark"
+sparkImage:c && "" !== b.fields.sparkimage ? b.fields.sparkimage :"radanalyticsio/openshift-spark",
+sparkDefaultUsed:!b.advanced || "" === b.fields.sparkimage
 };
 return f.get(h.project).then(_.spread(function(c, f) {
 return b.project = c, b.context = f, a.all([ j(g.clusterName, g.workersInt), i(g.configName, "cluster-config-name", "cluster configuration", b.context), i(g.masterConfigName, "cluster-masterconfig-name", "master spark configuration", b.context), i(g.workerConfigName, "cluster-workerconfig-name", "worker spark configuration", b.context) ]).then(function() {