Skip to content

Commit

Permalink
fix(kubernetes): properly detect if autoscaler is attached to server …
Browse files Browse the repository at this point in the history
…groups (spinnaker#6578)
  • Loading branch information
emptywee authored and christopherthielen committed Feb 20, 2019
1 parent 273e1db commit 629613f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ <h4 class="text-center" ng-if="serverGroup.isDisabled">[SERVER GROUP IS DISABLED
</collapsible-section>
<collapsible-section heading="Replicas" expanded="true">
<dl class="dl-horizontal dl-flex">
<div ng-show="serverGroup.autoscalerStatus === null">
<div ng-show="!serverGroup.autoscalerStatus">
<dt>Current</dt>
<dd>{{serverGroup.instances.length}}</dd>
<dt>Desired</dt>
<dd>{{serverGroup.capacity.desired}}</dd>
</div>
<div ng-show="serverGroup.autoscalerStatus !== null">
<div ng-show="serverGroup.autoscalerStatus">
<dt>Min</dt>
<dd>{{serverGroup.deployDescription.capacity.min}}</dd>
<dt>Max</dt>
Expand All @@ -129,10 +129,10 @@ <h4 class="text-center" ng-if="serverGroup.isDisabled">[SERVER GROUP IS DISABLED
</collapsible-section>
<collapsible-section heading="Horizontal Pod Autoscaling" expanded="true">
<dl class="dl-horizontal dl-flex">
<div ng-show="serverGroup.autoscalerStatus === null">
<div ng-show="!serverGroup.autoscalerStatus">
No autoscaler found.
</div>
<div ng-show="serverGroup.autoscalerStatus !== null">
<div ng-show="serverGroup.autoscalerStatus">
<dt>Desired</dt>
<dd>{{serverGroup.autoscalerStatus.desiredReplicas}}</dd>
<dt>Target CPU</dt>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="modal-header">
<h3>Resize {{serverGroup.name}}</h3>
</div>
<div class="modal-body confirmation-modal" ng-if="serverGroup.autoscalerStatus !== null">
<div class="modal-body confirmation-modal" ng-if="serverGroup.autoscalerStatus">
<div class="form-horizontal">
<div class="form-group form-inline">
<div class="col-md-3 col-md-offset-3">Min</div>
Expand Down Expand Up @@ -86,7 +86,7 @@ <h3>Resize {{serverGroup.name}}</h3>
</div>
<task-reason command="command"></task-reason>
</div>
<div class="modal-body confirmation-modal" ng-if="serverGroup.autoscalerStatus === null">
<div class="modal-body confirmation-modal" ng-if="!serverGroup.autoscalerStatus">
<div class="form-horizontal">
<div class="form-group form-inline">
<div class="col-md-3 sm-label-right">
Expand Down

0 comments on commit 629613f

Please sign in to comment.