Update to StatefulSet after 3.5 rebase, fix use of valueFrom for env vars on statefulSets

Author: benjaminapetersen

app/scripts/controllers/deployments.js

@@ -66,9 +66,9 @@ angular.module('openshiftConsole')
         // TODO: keep petset/stateful set here or give it its own page?
         // I lean toward dedicated page.
         watches.push(DataService.watch({
-          resource: 'petsets',
+          resource: 'statefulsets',
           group: 'apps',
-          version: 'v1alpha1'
+          version: 'v1beta1'
         }, context, function(statefulSets) {
           $scope.statefulSets = statefulSets.by('metadata.name');
         }));

app/scripts/controllers/statefulSet.js

@@ -23,6 +23,14 @@ angular
     });
     $scope.emptyMessage = "Loading...";
 
+    var altTextForValueFrom = $filter('altTextForValueFrom');
+    var updateEnvVars = function(statefulSet) {
+      _.each(statefulSet.spec.template.spec.containers, function(container) {
+        _.each(container.env, altTextForValueFrom);
+      });
+      return statefulSet;
+    };
+
     AlertMessageService.getAlerts().forEach(function(alert) {
       $scope.alerts[alert.name] = alert.data;
     });
@@ -39,9 +47,9 @@ angular
     };
 
     var resourceGroupVersion = {
-      resource: 'petsets',// TODO: statefulSets
+      resource: 'statefulsets',
       group: 'apps',
-      version: 'v1alpha1'
+      version: 'v1beta1'
     };
 
     ProjectsService
@@ -53,14 +61,14 @@ angular
           .get(resourceGroupVersion, $scope.statefulSetName, context)
           .then(function(statefulSet) {
             angular.extend($scope, {
-              statefulSet: statefulSet,
+              statefulSet: updateEnvVars(statefulSet),
               projectContext: context,
               loaded: true
             });
             watches.push(DataService.watchObject(resourceGroupVersion, $scope.statefulSetName, context, function(statefulSet) {
               angular.extend($scope, {
                 resourceGroupVersion: resourceGroupVersion,
-                statefulSet: statefulSet
+                statefulSet: updateEnvVars(statefulSet)
                 // TODO: support scaling
                 // scale: function() {},
                 // isScalable: function() { return true; }

app/scripts/filters/canI.js

@@ -65,10 +65,6 @@ angular
       'projects': [
         {group: '', resource: 'projects', verbs: ['delete', 'update']}
       ],
-      // todo: eliminate when we get the name change to statefulsets
-      'petsets': [
-        {group: 'apps', resource: 'petsets', verbs: ['update', 'delete']}
-      ],
       'statefulsets': [
         {group: 'apps', resource: 'statefulsets', verbs: ['update', 'delete']}
       ]

dist/scripts/scripts.js

@@ -362,9 +362,9 @@ reloadOnSearch:!1
 }).when("/project/:project/edit/dc/:deploymentconfig", {
 templateUrl:"views/edit/deployment-config.html",
 controller:"EditDeploymentConfigController"
-}).when("/project/:project/browse/petsets/:petset", {
-templateUrl:"views/browse/pet-set.html",
-controller:"PetSetController",
+}).when("/project/:project/browse/stateful-sets/:statefulset", {
+templateUrl:"views/browse/stateful-set.html",
+controller:"StatefulSetController",
 reloadOnSearch:!1
 }).when("/project/:project/browse/rs/:replicaSet", {
 templateUrl:"views/browse/replica-set.html",
@@ -2243,7 +2243,8 @@ i.segment("images").segmentCoded(h.substring(0, m)).segmentCoded(h.substring(m +
 break;
 
 case "PetSet":
-i.segment("petsets").segmentCoded(h);
+case "StatefulSet":
+i.segment("stateful-sets").segmentCoded(h);
 break;
 
 case "PersistentVolumeClaim":
@@ -5844,11 +5845,11 @@ details:"The active filters are hiding all deployments."
 }) :void delete a.alerts.deployments;
 }
 a.project = c, o.push(e.watch({
-resource:"petsets",
+resource:"statefulsets",
 group:"apps",
-version:"v1alpha1"
+version:"v1beta1"
 }, d, function(b) {
-console.log("petsets?", b.by("metadata.name")), a.petsets = b.by("metadata.name");
+a.statefulSets = b.by("metadata.name");
 })), o.push(e.watch("replicationcontrollers", d, function(c, d, e) {
 a.replicationControllers = c.by("metadata.name");
 var j, k;
@@ -6421,39 +6422,48 @@ e.then(g);
 g.unwatchAll(w);
 });
 }));
-} ]), angular.module("openshiftConsole").controller("PetSetController", [ "$filter", "$scope", "$routeParams", "AlertMessageService", "BreadcrumbsService", "DataService", "ProjectsService", function(a, b, c, d, e, f, g) {
-b.projectName = c.project, b.petSetName = c.petset, b.forms = {}, b.alerts = {}, b.breadcrumbs = e.getBreadcrumbs({
-name:c.petset,
-kind:"PetSet",
+} ]), angular.module("openshiftConsole").controller("StatefulSetController", [ "$filter", "$scope", "$routeParams", "AlertMessageService", "BreadcrumbsService", "DataService", "ProjectsService", function(a, b, c, d, e, f, g) {
+b.projectName = c.project, b.statefulSetName = c.statefulset, b.forms = {}, b.alerts = {}, b.breadcrumbs = e.getBreadcrumbs({
+name:b.statefulSetName,
+kind:"statefulSet",
 namespace:c.project
-}), b.emptyMessage = "Loading...", d.getAlerts().forEach(function(a) {
+}), b.emptyMessage = "Loading...";
+var h = a("altTextForValueFrom"), i = function(a) {
+return _.each(a.spec.template.spec.containers, function(a) {
+_.each(a.env, h);
+}), a;
+};
+d.getAlerts().forEach(function(a) {
 b.alerts[a.name] = a.data;
 }), d.clearAlerts();
-var h, i = [], j = function(a, b) {
-if (a && b) return _.filter(a, function(a) {
-return b.matches(a);
-});
-}, k = {
-resource:"petsets",
+var j, k = [], l = function(a, b) {
+if (a && b) return b.select(a);
+}, m = {
+resource:"statefulsets",
 group:"apps",
-version:"v1alpha1"
+version:"v1beta1"
 };
-g.get(c.project).then(_.spread(function(a, d) {
-h = d, i.push(f.watchObject(k, c.petset, d, function(a) {
+g.get(c.project).then(_.spread(function(a, c) {
+j = c, f.get(m, b.statefulSetName, c).then(function(a) {
 angular.extend(b, {
-resourceGroupVersion:k,
-petSet:a,
+statefulSet:i(a),
+projectContext:c,
 loaded:!0
-});
-var c, e;
-b.$watch("petSet.spec.selector", function() {
-e = new LabelSelector(b.petSet.spec.selector), b.podsForPetSet = j(c, e);
-}, !0), i.push(f.watch("pods", d, function(a) {
-c = a.by("metadata.name"), b.podsForPetSet = j(c, e);
+}), k.push(f.watchObject(m, b.statefulSetName, c, function(a) {
+angular.extend(b, {
+resourceGroupVersion:m,
+statefulSet:i(a)
+});
+var d, e;
+b.$watch("statefulSet.spec.selector", function() {
+e = new LabelSelector(b.statefulSet.spec.selector), b.podsForStatefulSet = l(d, e);
+}, !0), k.push(f.watch("pods", c, function(a) {
+d = a.by("metadata.name"), b.podsForStatefulSet = l(d, e);
 }));
 }));
+});
 })), b.$on("$destroy", function() {
-f.unwatchAll(i);
+f.unwatchAll(k);
 });
 } ]), angular.module("openshiftConsole").controller("ServicesController", [ "$routeParams", "$scope", "AlertMessageService", "DataService", "ProjectsService", "$filter", "LabelFilter", "Logger", function(a, b, c, d, e, f, g, h) {
 b.projectName = a.project, b.services = {}, b.unfilteredServices = {}, b.routesByService = {}, b.routes = {}, b.labelSuggestions = {}, b.alerts = b.alerts || {}, b.emptyMessage = "Loading...", b.emptyMessageRoutes = "Loading...", c.getAlerts().forEach(function(a) {
@@ -14211,14 +14221,14 @@ group:"",
 resource:"projects",
 verbs:[ "delete", "update" ]
 } ],
-petsets:[ {
+statefulsets:[ {
 group:"apps",
-resource:"petsets",
-verbs:[ "create", "update", "delete" ]
+resource:"statefulsets",
+verbs:[ "update", "delete" ]
 } ]
 };
 return function(c) {
-return console.log("canIDoAny", c), _.some(b[c], function(b) {
+return _.some(b[c], function(b) {
 return _.some(b.verbs, function(c) {
 return a({
 resource:b.resource,