Skip to content

Commit 27f6af5

Browse files
author
OpenShift Bot
authored
Merge pull request #1813 from spadgett/deployments-app-group
Merged by openshift-bot
2 parents 0d92433 + a60cbe7 commit 27f6af5

13 files changed

+131
-110
lines changed

‎app/scripts/controllers/deployment.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ angular.module('openshiftConsole')
4141
$scope.healthCheckURL = Navigate.healthCheckURL($routeParams.project,
4242
"Deployment",
4343
$routeParams.deployment,
44-
"extensions");
44+
"apps");
4545

4646
var previousEnvConflict = false;
4747
var updateEnvironment = function(current, previous) {
@@ -108,7 +108,7 @@ angular.module('openshiftConsole')
108108

109109
var saveEnvPromise;
110110
DataService.get({
111-
group: 'extensions',
111+
group: 'apps',
112112
resource: 'deployments'
113113
}, $routeParams.deployment, context, { errorNotification: false }).then(
114114
// success
@@ -120,7 +120,7 @@ angular.module('openshiftConsole')
120120
$scope.saveEnvVars = function() {
121121
EnvironmentService.compact($scope.updatedDeployment);
122122
saveEnvPromise = DataService.update({
123-
group: 'extensions',
123+
group: 'apps',
124124
resource: 'deployments'
125125
}, $routeParams.deployment, $scope.updatedDeployment, context);
126126
saveEnvPromise.then(function success(){
@@ -151,7 +151,7 @@ angular.module('openshiftConsole')
151151

152152
// If we found the item successfully, watch for changes on it
153153
watches.push(DataService.watchObject({
154-
group: 'extensions',
154+
group: 'apps',
155155
resource: 'deployments'
156156
}, $routeParams.deployment, context, function(deployment, action) {
157157
if (action === "DELETED") {

‎app/scripts/controllers/deployments.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ angular.module('openshiftConsole')
133133
}));
134134

135135
watches.push(DataService.watch({
136-
group: "extensions",
136+
group: "apps",
137137
resource: "deployments"
138138
}, context, function(deploymentData) {
139139
deploymentsByUID = $scope.unfilteredDeployments = deploymentData.by("metadata.uid");

‎app/scripts/controllers/overview.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ function OverviewController($scope,
12651265
}));
12661266

12671267
watches.push(DataService.watch({
1268-
group: "extensions",
1268+
group: "apps",
12691269
resource: "deployments"
12701270
}, context, function(deploymentData) {
12711271
deploymentsByUID = deploymentData.by('metadata.uid');

‎app/scripts/controllers/replicaSet.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -310,17 +310,17 @@ angular.module('openshiftConsole')
310310
}
311311

312312
DataService.get({
313-
group: 'extensions',
313+
group: 'apps',
314314
resource: 'deployments'
315315
}, deploymentRef.name, context).then(function(deployment) {
316316
$scope.deployment = deployment;
317317
$scope.healthCheckURL = Navigate.healthCheckURL($routeParams.project,
318318
"Deployment",
319319
deployment.metadata.name,
320-
"extensions");
320+
"apps");
321321

322322
watches.push(DataService.watchObject({
323-
group: 'extensions',
323+
group: 'apps',
324324
resource: 'deployments'
325325
}, deployment.metadata.name, context, function(deployment, action) {
326326
if (action === "DELETED") {

‎app/scripts/directives/bindService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
sortApplications();
106106
});
107107
DataService.list({
108-
group: 'extensions',
108+
group: 'apps',
109109
resource: 'deployments'
110110
}, context).then(function(deploymentData) {
111111
deployments = _.toArray(deploymentData.by('metadata.name'));

‎app/scripts/filters/canI.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ angular
1717
],
1818
'deployments': [
1919
{group: 'autoscaling', resource: 'horizontalpodautoscalers', verbs: ['create', 'update']},
20-
{group: 'apps', resource: 'deployments', verbs: ['update']},
21-
{group: 'extensions', resource: 'deployments', verbs: ['create', 'update']}
20+
{group: 'apps', resource: 'deployments', verbs: ['update', 'delete']}
2221
],
2322
'deploymentConfigs': [
2423
{group: 'autoscaling', resource: 'horizontalpodautoscalers', verbs: ['create', 'update']},

‎app/scripts/filters/resources.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ angular.module('openshiftConsole')
13031303
return true;
13041304
}
13051305

1306-
if (rgv.resource === 'deployments' && rgv.group === 'extensions') {
1306+
if (rgv.resource === 'deployments' && (rgv.group === 'apps' || rgv.group === 'extensions')) {
13071307
return true;
13081308
}
13091309

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
88
data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
99
<ul class="dropdown-menu dropdown-menu-right actions action-button">
10-
<li ng-if="deployment && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
10+
<li ng-if="deployment && ({ group: 'apps', resource: 'deployments' } | canI : 'update')">
1111
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
1212
role="button">Add Storage</a>
1313
</li>
@@ -23,15 +23,15 @@
2323
ng-if="deployment"
2424
role="button">Add Autoscaler</a>
2525
</li>
26-
<li ng-if="deployment && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
26+
<li ng-if="deployment && ({ group: 'apps', resource: 'deployments' } | canI : 'update')">
2727
<a ng-href="project/{{projectName}}/set-limits?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
2828
role="button">Edit Resource Limits</a>
2929
</li>
3030
<li ng-if="!deployment && ({ group: 'extensions', resource: 'replicasets' } | canI : 'update')">
3131
<a ng-href="project/{{projectName}}/set-limits?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions"
3232
role="button">Edit Resource Limits</a>
3333
</li>
34-
<li ng-if="(!deployment && ({ group: 'extensions', resource: 'replicasets' } | canI : 'update')) || (deployment && ({group: 'extensions', resource: 'deployments' } | canI : 'update'))">
34+
<li ng-if="(!deployment && ({ group: 'extensions', resource: 'replicasets' } | canI : 'update')) || (deployment && ({group: 'apps', resource: 'deployments' } | canI : 'update'))">
3535
<a ng-href="{{healthCheckURL}}" role="button">Edit Health Checks</a>
3636
</li>
3737
<li ng-if="{ group: 'extensions', resource: 'replicasets' } | canI : 'update'">

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ <h4>Volumes</h4>
9999
<div ng-if="kind === 'ReplicaSet'">
100100
<div ng-if="deployment">
101101
<volumes volumes="replicaSet.spec.template.spec.volumes" namespace="project.metadata.name"></volumes>
102-
<div ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'update'">
103-
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions">Add Storage</a>
102+
<div ng-if="{ group: 'apps', resource: 'deployments' } | canI : 'update'">
103+
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=apps">Add Storage</a>
104104
<span class="action-divider" aria-hidden="true">|</span>
105-
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=Deployment&name={{deployment.metadata.name}}">Add Config Files</a>
105+
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=Deployment&name={{deployment.metadata.name}}&group=apps">Add Config Files</a>
106106
</div>
107-
<div ng-if="!replicaSet.spec.template.spec.volumes.length && !({ group: 'extensions', resource: 'deployments' } | canI : 'update')">none</div>
107+
<div ng-if="!replicaSet.spec.template.spec.volumes.length && !({ group: 'apps', resource: 'deployments' } | canI : 'update')">none</div>
108108
</div>
109109
<div ng-if="!deployment">
110110
<div ng-if="resource | canI : 'update'">
@@ -192,7 +192,7 @@ <h3>Autoscaling</h3>
192192
ng-href="project/{{projectName}}/edit/autoscaler?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions"
193193
role="button">Add Autoscaler</a>
194194
<a ng-if="replicaSet.kind === 'ReplicaSet' && deployment"
195-
ng-href="project/{{projectName}}/edit/autoscaler?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
195+
ng-href="project/{{projectName}}/edit/autoscaler?kind=Deployment&name={{deployment.metadata.name}}&group=apps"
196196
role="button">Add Autoscaler</a>
197197
<a ng-if="replicaSet.kind === 'ReplicationController' && !deploymentConfigName"
198198
ng-href="project/{{projectName}}/edit/autoscaler?kind=ReplicationController&name={{replicaSet.metadata.name}}"

0 commit comments

Comments
 (0)