Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(manifest): more status banners #4475

Merged
merged 1 commit into from Nov 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions app/scripts/modules/core/src/manifest/manifestWriter.service.ts
Expand Up @@ -48,6 +48,26 @@ export class ManifestWriter {
description
});
}

public resumeRolloutManifest(command: any, application: Application): IPromise<ITask> {
const description = 'Resume rollout of manifest';
command.type = 'resumeRolloutManifest';
return this.taskExecutor.executeTask({
job: [command],
application,
description
});
}

public pauseRolloutManifest(command: any, application: Application): IPromise<ITask> {
const description = 'Pause rollout of manifest';
command.type = 'pauseRolloutManifest';
return this.taskExecutor.executeTask({
job: [command],
application,
description
});
}
}

export const MANIFEST_WRITER = 'spinnaker.core.manifest.write.service';
Expand Down
4 changes: 4 additions & 0 deletions app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts
Expand Up @@ -19,6 +19,8 @@ import { KUBERNETES_V2_SERVER_GROUP_RESIZE_CTRL } from './serverGroup/details/re
import { KUBERNETES_V2_SERVER_GROUP_COMMAND_BUILDER } from './serverGroup/serverGroupCommandBuilder.service';
import { KUBERNETES_V2_SERVER_GROUP_MANAGER_DETAILS_CTRL } from './serverGroupManager/details/details.controller';
import { KUBERNETES_MANIFEST_UNDO_ROLLOUT_CTRL } from './manifest/rollout/undo.controller';
import { KUBERNETES_MANIFEST_PAUSE_ROLLOUT_CTRL } from './manifest/rollout/pause.controller';
import { KUBERNETES_MANIFEST_RESUME_ROLLOUT_CTRL } from './manifest/rollout/resume.controller';
import { KUBERNETES_MANIFEST_STATUS } from './manifest/status/status.component';
import { KUBERNETES_MANIFEST_SERVICE } from './manifest/manifest.service';

Expand Down Expand Up @@ -48,6 +50,8 @@ module(KUBERNETES_V2_MODULE, [
KUBERNETES_MANIFEST_DELETE_CTRL,
KUBERNETES_MANIFEST_SCALE_CTRL,
KUBERNETES_MANIFEST_UNDO_ROLLOUT_CTRL,
KUBERNETES_MANIFEST_PAUSE_ROLLOUT_CTRL,
KUBERNETES_MANIFEST_RESUME_ROLLOUT_CTRL,
KUBERNETES_MANIFEST_ENTRY,
KUBERNETES_MANIFEST_STATUS,
KUBERNETES_MANIFEST_SERVICE,
Expand Down
@@ -0,0 +1,73 @@
import { copy, IController, module } from 'angular'
import { IModalServiceInstance } from 'angular-ui-bootstrap';

import {
Application,
MANIFEST_WRITER,
ManifestWriter,
TASK_MONITOR_BUILDER,
TaskMonitor,
TaskMonitorBuilder
} from '@spinnaker/core';
import { IManifestCoordinates } from '../IManifestCoordinates';

interface IPauseRolloutCommand {
name: string;
location: string;
account: string;
reason: string;
}

class KubernetesManifestPauseRolloutController implements IController {
public taskMonitor: TaskMonitor;
public command: IPauseRolloutCommand;
public verification = {
verified: false
};

constructor(coordinates: IManifestCoordinates,
taskMonitorBuilder: TaskMonitorBuilder,
private $uibModalInstance: IModalServiceInstance,
private manifestWriter: ManifestWriter,
private application: Application) {
'ngInject';

this.taskMonitor = taskMonitorBuilder.buildTaskMonitor({
title: `Pause rollout of ${coordinates.name} in ${coordinates.namespace}`,
application: application,
modalInstance: $uibModalInstance,
});

this.command = {
name: coordinates.name,
location: coordinates.namespace,
account: coordinates.account,
reason: null,
};
}

public isValid(): boolean {
return this.verification.verified;
}

public cancel(): void {
this.$uibModalInstance.dismiss();
};

public pauseRollout(): void {
this.taskMonitor.submit(() => {
const payload = copy(this.command) as any;
payload.cloudProvider = 'kubernetes';

return this.manifestWriter.pauseRolloutManifest(payload, this.application);
});
}
}

export const KUBERNETES_MANIFEST_PAUSE_ROLLOUT_CTRL = 'spinnaker.kubernetes.v2.manifest.pauseRollout.controller';

module(KUBERNETES_MANIFEST_PAUSE_ROLLOUT_CTRL, [
TASK_MONITOR_BUILDER,
MANIFEST_WRITER,
])
.controller('kubernetesV2ManifestPauseRolloutCtrl', KubernetesManifestPauseRolloutController);
23 changes: 23 additions & 0 deletions app/scripts/modules/kubernetes/src/v2/manifest/rollout/pause.html
@@ -0,0 +1,23 @@
<div modal-page class="confirmation-modal">
<task-monitor monitor="ctrl.taskMonitor"></task-monitor>
<form role="form" name="pauseRolloutForm">
<modal-close dismiss="$dismiss()"></modal-close>
<div class="modal-header">
<h3>Pause rollout of {{ctrl.command.name | robotToHuman}} in {{ctrl.command.location}}</h3>
</div>
<div class="modal-body confirmation-modal">
<task-reason command="ctrl.command"></task-reason>
</div>
<div class="modal-footer">
<user-verification account="ctrl.command.account" verification="ctrl.verification"></user-verification>
<button type="submit" ng-click="ctrl.pauseRollout()" style="display:none"></button> <!-- Allows form submission via enter keypress-->
<button class="btn btn-default" ng-click="ctrl.cancel()">Cancel</button>
<button type="submit"
class="btn btn-primary"
ng-click="ctrl.pauseRollout()"
ng-disabled="!ctrl.isValid() || !pauseRolloutForm.$valid">
Submit
</button>
</div>
</form>
</div>
@@ -0,0 +1,73 @@
import { copy, IController, module } from 'angular'
import { IModalServiceInstance } from 'angular-ui-bootstrap';

import {
Application,
MANIFEST_WRITER,
ManifestWriter,
TASK_MONITOR_BUILDER,
TaskMonitor,
TaskMonitorBuilder
} from '@spinnaker/core';
import { IManifestCoordinates } from '../IManifestCoordinates';

interface IResumeRolloutCommand {
name: string;
location: string;
account: string;
reason: string;
}

class KubernetesManifestResumeRolloutController implements IController {
public taskMonitor: TaskMonitor;
public command: IResumeRolloutCommand;
public verification = {
verified: false
};

constructor(coordinates: IManifestCoordinates,
taskMonitorBuilder: TaskMonitorBuilder,
private $uibModalInstance: IModalServiceInstance,
private manifestWriter: ManifestWriter,
private application: Application) {
'ngInject';

this.taskMonitor = taskMonitorBuilder.buildTaskMonitor({
title: `Resume rollout of ${coordinates.name} in ${coordinates.namespace}`,
application: application,
modalInstance: $uibModalInstance,
});

this.command = {
name: coordinates.name,
location: coordinates.namespace,
account: coordinates.account,
reason: null,
};
}

public isValid(): boolean {
return this.verification.verified;
}

public cancel(): void {
this.$uibModalInstance.dismiss();
};

public resumeRollout(): void {
this.taskMonitor.submit(() => {
const payload = copy(this.command) as any;
payload.cloudProvider = 'kubernetes';

return this.manifestWriter.resumeRolloutManifest(payload, this.application);
});
}
}

export const KUBERNETES_MANIFEST_RESUME_ROLLOUT_CTRL = 'spinnaker.kubernetes.v2.manifest.resumeRollout.controller';

module(KUBERNETES_MANIFEST_RESUME_ROLLOUT_CTRL, [
TASK_MONITOR_BUILDER,
MANIFEST_WRITER,
])
.controller('kubernetesV2ManifestResumeRolloutCtrl', KubernetesManifestResumeRolloutController);
23 changes: 23 additions & 0 deletions app/scripts/modules/kubernetes/src/v2/manifest/rollout/resume.html
@@ -0,0 +1,23 @@
<div modal-page class="confirmation-modal">
<task-monitor monitor="ctrl.taskMonitor"></task-monitor>
<form role="form" name="resumeRolloutForm">
<modal-close dismiss="$dismiss()"></modal-close>
<div class="modal-header">
<h3>Resume rollout of {{ctrl.command.name | robotToHuman}} in {{ctrl.command.location}}</h3>
</div>
<div class="modal-body confirmation-modal">
<task-reason command="ctrl.command"></task-reason>
</div>
<div class="modal-footer">
<user-verification account="ctrl.command.account" verification="ctrl.verification"></user-verification>
<button type="submit" ng-click="ctrl.resumeRollout()" style="display:none"></button> <!-- Allows form submission via enter keypress-->
<button class="btn btn-default" ng-click="ctrl.cancel()">Cancel</button>
<button type="submit"
class="btn btn-primary"
ng-click="ctrl.resumeRollout()"
ng-disabled="!ctrl.isValid() || !resumeRolloutForm.$valid">
Submit
</button>
</div>
</form>
</div>
Expand Up @@ -11,10 +11,18 @@ class KubernetesManifestStatusComponent implements IComponentOptions {
public controller: any = KubernetesManifestStatusCtrl;
public controllerAs = 'ctrl';
public template = `
<div class="band band-active" ng-if="!ctrl.status.stable"
uib-tooltip="{{ctrl.status.message}}">
<div class="band band-warning" ng-if="!ctrl.status.available.state"
uib-tooltip="{{ctrl.status.available.message}}">
Not Fully Available
</div>
<div class="band band-active" ng-if="!ctrl.status.stable.state"
uib-tooltip="{{ctrl.status.stable.message}}">
Transitioning
</div>
<div class="band band-info" ng-if="ctrl.status.paused.state"
uib-tooltip="{{ctrl.status.paused.message}}">
Rollout Paused
</div>
`;
}

Expand Down
Expand Up @@ -30,6 +30,38 @@ class KubernetesServerGroupManagerDetailsController implements IController {
});
}

public pauseRolloutServerGroupManager(): void {
this.$uibModal.open({
templateUrl: require('../../manifest/rollout/pause.html'),
controller: 'kubernetesV2ManifestPauseRolloutCtrl',
controllerAs: 'ctrl',
resolve: {
coordinates: {
name: this.serverGroupManager.name,
namespace: this.serverGroupManager.namespace,
account: this.serverGroupManager.account
},
application: this.app
}
});
}

public resumeRolloutServerGroupManager(): void {
this.$uibModal.open({
templateUrl: require('../../manifest/rollout/resume.html'),
controller: 'kubernetesV2ManifestResumeRolloutCtrl',
controllerAs: 'ctrl',
resolve: {
coordinates: {
name: this.serverGroupManager.name,
namespace: this.serverGroupManager.namespace,
account: this.serverGroupManager.account
},
application: this.app
}
});
}

public undoRolloutServerGroupManager(): void {
this.$uibModal.open({
templateUrl: require('../../manifest/rollout/undo.html'),
Expand Down
Expand Up @@ -40,6 +40,16 @@ <h3 select-on-dbl-click>
Undo Rollout
</a>
</li>
<li ng-if="ctrl.status.paused.state">
<a href ng-click="ctrl.resumeRolloutServerGroupManager()">
Resume Rollout
</a>
</li>
<li ng-if="!ctrl.status.paused.state && !ctrl.status.stable.state">
<a href ng-click="ctrl.pauseRolloutServerGroupManager()">
Pause Rollout
</a>
</li>
<li role="presentation" class="divider"></li>
<li>
<a href ng-click="ctrl.editServerGroupManager()">
Expand Down