Skip to content

Commit 851a739

Browse files
benjaminapetersenbenjaminapetersen
committed
Updates
1 parent ecd6687 commit 851a739

File tree

6 files changed

+49
-58
lines changed

6 files changed

+49
-58
lines changed

‎app/scripts/app.js

-3
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,6 @@ angular
409409
.when('/project/:project/browse/deployments-replicationcontrollers/:rc', {
410410
redirectTo: '/project/:project/browse/rc/:rc'
411411
})
412-
.when('/project/:project/browse/pet-sets/:petset', {
413-
redirectTo: '/project/:project/browse/stateful-sets/:statefulset'
414-
})
415412
.otherwise({
416413
redirectTo: '/'
417414
});

‎app/scripts/controllers/deployments.js

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ angular.module('openshiftConsole')
7070
group: 'apps',
7171
version: 'v1alpha1'
7272
}, context, function(statefulSets) {
73-
console.log('statefulSets?', statefulSets.by('metadata.name'));
7473
$scope.statefulSets = statefulSets.by('metadata.name');
7574
}));
7675

‎app/scripts/controllers/statefulSet.js

+35-35
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

3-
// TODO: statefulSetController rename
4-
// Kube docs: http://kubernetes.io/docs/user-guide/statefulSet/
53
angular
64
.module('openshiftConsole')
75
.controller('StatefulSetController', function(
@@ -14,15 +12,13 @@ angular
1412
ProjectsService) {
1513

1614
$scope.projectName = $routeParams.project;
17-
$scope.statefulSetName = $routeParams.statefulset || $routeParams.petset; // TODO: eliminate petset fallback
15+
$scope.statefulSetName = $routeParams.statefulset;
1816
$scope.forms = {};
1917
$scope.alerts = {};
20-
// TODO: update getBreadcrumbs, currently returns:
21-
// Pet Sets > hello-statefulSet
22-
// But the link for `Pet Sets` isn't valid. Where do we want these to live?
18+
// TODO: StatefulSet isn't a thing, should fall back to Deployments?
2319
$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({
2420
name: $scope.statefulSetName,
25-
kind: 'statefulSet', // TODO: update to statefulSet
21+
kind: 'statefulSet',
2622
namespace: $routeParams.project
2723
});
2824
$scope.emptyMessage = "Loading...";
@@ -39,9 +35,7 @@ angular
3935
if (!pods || !selector) {
4036
return;
4137
}
42-
return _.filter(pods, function(pod) {
43-
return selector.matches(pod);
44-
});
38+
return selector.select(pods);
4539
};
4640

4741
var resourceGroupVersion = {
@@ -55,32 +49,38 @@ angular
5549
.then(_.spread(function(project, context) {
5650
projectContext = context;
5751

58-
watches.push(DataService.watchObject(resourceGroupVersion, $scope.statefulSetName, context, function(statefulSet) {
59-
console.log('statefulSet', statefulSet);
60-
angular.extend($scope, {
61-
resourceGroupVersion: resourceGroupVersion,
62-
statefulSet: statefulSet,
63-
loaded: true,
64-
projectContext: context
65-
// TODO: support scaling
66-
// scale: function() {},
67-
// isScalable: function() { return true; }
52+
DataService
53+
.get(resourceGroupVersion, $scope.statefulSetName, context)
54+
.then(function(statefulSet) {
55+
angular.extend($scope, {
56+
statefulSet: statefulSet,
57+
projectContext: context,
58+
loaded: true
59+
});
60+
watches.push(DataService.watchObject(resourceGroupVersion, $scope.statefulSetName, context, function(statefulSet) {
61+
angular.extend($scope, {
62+
resourceGroupVersion: resourceGroupVersion,
63+
statefulSet: statefulSet
64+
// TODO: support scaling
65+
// scale: function() {},
66+
// isScalable: function() { return true; }
67+
});
68+
var pods;
69+
var selector;
70+
$scope.$watch('statefulSet.spec.selector', function() {
71+
selector = new LabelSelector($scope.statefulSet.spec.selector);
72+
$scope.podsForStatefulSet = updatePods(pods, selector);
73+
}, true);
74+
// TODO: this is leaky. every time the outer watch updates,
75+
// we are creating a new watch on pods:
76+
// - console.log('# of watches?', watches.length); // steadily increments
77+
// we have this in a lot of places...
78+
watches.push(DataService.watch('pods', context, function(podData) {
79+
pods = podData.by('metadata.name');
80+
$scope.podsForStatefulSet = updatePods(pods, selector);
81+
}));
82+
}));
6883
});
69-
var pods;
70-
var selector;
71-
$scope.$watch('statefulSet.spec.selector', function() {
72-
selector = new LabelSelector($scope.statefulSet.spec.selector);
73-
$scope.podsForStatefulSet = updatePods(pods, selector);
74-
}, true);
75-
// TODO: this is leaky. every time the outer watch updates,
76-
// we are creating a new watch on pods:
77-
// - console.log('# of watches?', watches.length); // steadily increments
78-
// we have this in a lot of places...
79-
watches.push(DataService.watch('pods', context, function(podData) {
80-
pods = podData.by('metadata.name');
81-
$scope.podsForStatefulSet = updatePods(pods, selector);
82-
}));
83-
}));
8484
}));
8585

8686
$scope.$on('$destroy', function(){

‎app/scripts/filters/canI.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@ angular
6565
'projects': [
6666
{group: '', resource: 'projects', verbs: ['delete', 'update']}
6767
],
68+
// todo: eliminate when we get the name change to statefulsets
6869
'petsets': [
69-
//resource: 'petsets',group: 'apps',version: 'v1alpha1'
70-
// TODO: are the verbs right here? the others only have 2...
71-
{group: 'apps', resource: 'petsets', verbs: ['create', 'update', 'delete']}
70+
{group: 'apps', resource: 'petsets', verbs: ['update', 'delete']}
71+
],
72+
'statefulsets': [
73+
{group: 'apps', resource: 'statefulsets', verbs: ['update', 'delete']}
7274
]
7375
};
7476
return function(resource) {

‎app/views/browse/stateful-set.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ <h1>
2828
<i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span>
2929
</a>
3030
<ul class="dropdown-menu actions action-button">
31-
<!-- TODO: kinda works, but cant seem to edit. neat. -->
3231
<li ng-if="resourceGroupVersion | canI : 'update'">
3332
<a ng-href="{{statefulSet | editYamlURL}}" role="button">Edit YAML</a>
3433
</li>
@@ -78,16 +77,18 @@ <h1>
7877
<dd ng-if-end>{{statefulSet | annotation:'deploymentStatusReason'}}</dd>
7978
<dt>Replicas:</dt>
8079
<dd>
81-
<!-- Enable scaling if this is a plain replication controller or it's the active deployment,
82-
as long as it doesn't have an HPA. -->
83-
<!-- TODO: replicaSets have a donut to the right -->
80+
<!--
81+
statefulSets do not have history
82+
& are always scalable unless there are HPAs involved
83+
-->
84+
<!-- TODO: DONUT -->
8485
<replicas status="statefulSet.status.replicas"
8586
spec="statefulSet.spec.replicas"
8687
disable-scaling="!isScalable()"
8788
scale-fn="scale(replicas)"
8889
deployment="statefulSet">
8990
</replicas>
90-
<!-- Do we have autoscalers for these?
91+
<!-- TODO: HPA as a follow-on PR
9192
<span ng-if="autoscalers.length">(autoscaled)</span>
9293
-->
9394
</dd>
@@ -126,7 +127,6 @@ <h3>Container {{container.name}} Environment Variables</h3>
126127
There are no environment variables for this container.
127128
</span>
128129
</p>
129-
<!-- TODO: add the canI filter -->
130130
<key-value-editor
131131
entries="container.env"
132132
key-placeholder="Name"
@@ -136,7 +136,6 @@ <h3>Container {{container.name}} Environment Variables</h3>
136136
cannot-delete
137137
cannot-sort
138138
show-header></key-value-editor>
139-
140139
</div>
141140
</ng-form>
142141
</div>
@@ -159,6 +158,7 @@ <h3>Container {{container.name}} Environment Variables</h3>
159158
<uib-tab active="selectedTab.events">
160159
<uib-tab-heading>Events</uib-tab-heading>
161160
<div class="resource-events">
161+
<!-- TODO: resource-kind: StatefulSet update -->
162162
<events
163163
resource-kind="PetSet"
164164
resource-name="{{statefulSet.metadata.name}}"

‎app/views/deployments.html

+2-9
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,23 @@ <h3>StatefulSets</h3>
3434
<thead>
3535
<tr>
3636
<th>Name</th>
37-
<th>Generation</th>
3837
<th>Status</th>
3938
<th>Created</th>
40-
<th>Trigger</th>
4139
</tr>
4240
</thead>
4341
<tbody ng-repeat="(statefulSetName, statefulSet) in statefulSets">
4442
<tr>
4543
<td data-title="Name">
4644
<a ng-href="{{statefulSet | navigateResourceURL}}">{{statefulSet.metadata.name}}</a>
4745
</td>
48-
<td data-title="Generation">{{statefulSet.metadata.generation}}</td>
4946
<td data-title="Status">
5047
<status-icon status="statefulSet | deploymentStatus"></status-icon>
51-
{{statefulSet | deploymentStatus}}
52-
<span ng-if="(statefulSet | deploymentStatus) == 'Active' || (statefulSet | deploymentStatus) == 'Running'">,
53-
<span ng-if="statefulSet.spec.replicas !== statefulSet.status.replicas">{{statefulSet.status.replicas}}/</span>
54-
{{statefulSet.spec.replicas}} replica<span ng-if="statefulSet.spec.replicas != 1">s</span>
55-
</span>
48+
{{statefulSet | deploymentStatus}}<span ng-if="(statefulSet | deploymentStatus) === 'Active' || (statefulSet | deploymentStatus) === 'Running'">,
49+
<span ng-if="statefulSet.spec.replicas !== statefulSet.status.replicas">{{statefulSet.status.replicas}}/</span>{{statefulSet.spec.replicas}} replica<span ng-if="statefulSet.spec.replicas !== 1">s</span></span>
5650
</td>
5751
<td data-title="Created">
5852
<span am-time-ago="statefulSet.metadata.creationTimestamp"></span>
5953
</td>
60-
<td data-title="Trigger">-</td>
6154
</tr>
6255
</tbody>
6356
</table>

0 commit comments

Comments
 (0)