Use apps API group for deployments

Author: spadgett

app/scripts/constants.js

@@ -109,6 +109,7 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
     {resource: 'builds', group: ''},
     {resource: 'configmaps', group: ''},
     {resource: 'daemonsets', group: 'extensions'},
+    {resource: 'deployments', group: 'apps'},
     {resource: 'deployments', group: 'extensions'},
     {resource: 'deploymentconfigs', group: ''},
     {resource: 'endpoints', group: ''},

app/scripts/controllers/deployment.js

@@ -41,7 +41,7 @@ angular.module('openshiftConsole')
     $scope.healthCheckURL = Navigate.healthCheckURL($routeParams.project,
                                                     "Deployment",
                                                     $routeParams.deployment,
-                                                    "extensions");
+                                                    "apps");
 
     var previousEnvConflict = false;
     var updateEnvironment = function(current, previous) {
@@ -108,7 +108,7 @@ angular.module('openshiftConsole')
 
         var saveEnvPromise;
         DataService.get({
-          group: 'extensions',
+          group: 'apps',
           resource: 'deployments'
         }, $routeParams.deployment, context, { errorNotification: false }).then(
           // success
@@ -120,7 +120,7 @@ angular.module('openshiftConsole')
             $scope.saveEnvVars = function() {
               EnvironmentService.compact($scope.updatedDeployment);
               saveEnvPromise = DataService.update({
-                group: 'extensions',
+                group: 'apps',
                 resource: 'deployments'
               }, $routeParams.deployment, $scope.updatedDeployment, context);
               saveEnvPromise.then(function success(){
@@ -151,7 +151,7 @@ angular.module('openshiftConsole')
 
             // If we found the item successfully, watch for changes on it
             watches.push(DataService.watchObject({
-              group: 'extensions',
+              group: 'apps',
               resource: 'deployments'
             }, $routeParams.deployment, context, function(deployment, action) {
               if (action === "DELETED") {

app/scripts/controllers/deployments.js

@@ -133,7 +133,7 @@ angular.module('openshiftConsole')
         }));
 
         watches.push(DataService.watch({
-          group: "extensions",
+          group: "apps",
           resource: "deployments"
         }, context, function(deploymentData) {
           deploymentsByUID = $scope.unfilteredDeployments = deploymentData.by("metadata.uid");

app/scripts/controllers/overview.js

@@ -1265,7 +1265,7 @@ function OverviewController($scope,
     }));
 
     watches.push(DataService.watch({
-      group: "extensions",
+      group: "apps",
       resource: "deployments"
     }, context, function(deploymentData) {
       deploymentsByUID = deploymentData.by('metadata.uid');

app/scripts/controllers/replicaSet.js

@@ -286,7 +286,7 @@ angular.module('openshiftConsole')
           }
 
           DataService.list({
-            group: 'extensions',
+            group: 'apps',
             resource: 'deployments'
           }, context).then(function(resp) {
             var deployments = resp.by('metadata.name');
@@ -303,10 +303,10 @@ angular.module('openshiftConsole')
             $scope.healthCheckURL = Navigate.healthCheckURL($routeParams.project,
                                                             "Deployment",
                                                             $scope.deployment.metadata.name,
-                                                            "extensions");
+                                                            "apps");
 
             watches.push(DataService.watchObject({
-              group: 'extensions',
+              group: 'apps',
               resource: 'deployments'
             }, $scope.deployment.metadata.name, context, function(deployment, action) {
               if (action === "DELETED") {

app/scripts/directives/bindService.js

@@ -105,7 +105,7 @@
         sortApplications();
       });
       DataService.list({
-        group: 'extensions',
+        group: 'apps',
         resource: 'deployments'
       }, context).then(function(deploymentData) {
         deployments = _.toArray(deploymentData.by('metadata.name'));

app/scripts/filters/canI.js

@@ -17,7 +17,7 @@ angular
       ],
       'deployments': [
         {group: 'autoscaling', resource: 'horizontalpodautoscalers', verbs: ['create', 'update']},
-        {group: 'extensions',  resource: 'deployments',              verbs: ['create', 'update']}
+        {group: 'apps',        resource: 'deployments',              verbs: ['create', 'update']}
       ],
       'deploymentConfigs': [
         {group: 'autoscaling', resource: 'horizontalpodautoscalers', verbs: ['create', 'update']},

app/scripts/filters/resources.js

@@ -1303,7 +1303,7 @@ angular.module('openshiftConsole')
         return true;
       }
 
-      if (rgv.resource === 'deployments' && rgv.group === 'extensions') {
+      if (rgv.resource === 'deployments' && (rgv.group === 'apps' || rgv.group === 'extensions')) {
         return true;
       }
 

app/views/browse/_replica-set-actions.html

@@ -7,7 +7,7 @@
      class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
      data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
   <ul class="dropdown-menu dropdown-menu-right actions action-button">
-    <li ng-if="deployment && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
+    <li ng-if="deployment && ({ group: 'apps', resource: 'deployments' } | canI : 'update')">
       <a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
          role="button">Add Storage</a>
     </li>
@@ -23,15 +23,15 @@
          ng-if="deployment"
          role="button">Add Autoscaler</a>
     </li>
-    <li ng-if="deployment && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
+    <li ng-if="deployment && ({ group: 'apps', resource: 'deployments' } | canI : 'update')">
       <a ng-href="project/{{projectName}}/set-limits?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
          role="button">Edit Resource Limits</a>
     </li>
     <li ng-if="!deployment && ({ group: 'extensions', resource: 'replicasets' } | canI : 'update')">
       <a ng-href="project/{{projectName}}/set-limits?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions"
          role="button">Edit Resource Limits</a>
     </li>
-    <li ng-if="(!deployment && ({ group: 'extensions', resource: 'replicasets' } | canI : 'update')) || (deployment && ({group: 'extensions', resource: 'deployments' } | canI : 'update'))">
+    <li ng-if="(!deployment && ({ group: 'extensions', resource: 'replicasets' } | canI : 'update')) || (deployment && ({group: 'apps', resource: 'deployments' } | canI : 'update'))">
       <a ng-href="{{healthCheckURL}}" role="button">Edit Health Checks</a>
     </li>
     <li ng-if="{ group: 'extensions', resource: 'replicasets' } | canI : 'update'">

app/views/browse/_replica-set-details.html

@@ -99,12 +99,12 @@ <h4>Volumes</h4>
       <div ng-if="kind === 'ReplicaSet'">
         <div ng-if="deployment">
           <volumes volumes="replicaSet.spec.template.spec.volumes" namespace="project.metadata.name"></volumes>
-          <div ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'update'">
-            <a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions">Add Storage</a>
+          <div ng-if="{ group: 'apps', resource: 'deployments' } | canI : 'update'">
+            <a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=apps">Add Storage</a>
             <span class="action-divider" aria-hidden="true">|</span>
-            <a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=Deployment&name={{deployment.metadata.name}}">Add Config Files</a>
+            <a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=Deployment&name={{deployment.metadata.name}}&group=apps">Add Config Files</a>
           </div>
-          <div ng-if="!replicaSet.spec.template.spec.volumes.length && !({ group: 'extensions', resource: 'deployments' } | canI : 'update')">none</div>
+          <div ng-if="!replicaSet.spec.template.spec.volumes.length && !({ group: 'apps', resource: 'deployments' } | canI : 'update')">none</div>
         </div>
         <div ng-if="!deployment">
           <div ng-if="resource | canI : 'update'">
@@ -192,7 +192,7 @@ <h3>Autoscaling</h3>
          ng-href="project/{{projectName}}/edit/autoscaler?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions"
          role="button">Add Autoscaler</a>
       <a ng-if="replicaSet.kind === 'ReplicaSet' && deployment"
-         ng-href="project/{{projectName}}/edit/autoscaler?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
+         ng-href="project/{{projectName}}/edit/autoscaler?kind=Deployment&name={{deployment.metadata.name}}&group=apps"
          role="button">Add Autoscaler</a>
       <a ng-if="replicaSet.kind === 'ReplicationController' && !deploymentConfigName"
          ng-href="project/{{projectName}}/edit/autoscaler?kind=ReplicationController&name={{replicaSet.metadata.name}}"