Skip to content

Fix missing RolloutCancelled event in notification drawer#2412

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
benjaminapetersen:bug/1490720/deployment-cancelled-in-drawer
Nov 1, 2017
Merged

Fix missing RolloutCancelled event in notification drawer#2412
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
benjaminapetersen:bug/1490720/deployment-cancelled-in-drawer

Conversation

@benjaminapetersen
Copy link
Contributor

@benjaminapetersen benjaminapetersen commented Oct 31, 2017

Fix bugzilla #1490720 (link)

Adds this event to the notification drawer:

screen shot 2017-10-31 at 4 05 47 pm

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 31, 2017
@jwforres
Copy link
Member

jwforres commented Oct 31, 2017

/kind bug
/lgtm

@openshift-ci-robot openshift-ci-robot added kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. labels Oct 31, 2017
spadgett
spadgett reviewed Oct 31, 2017
View reviewed changes
app/scripts/constants.js Outdated
BuildConfigInstantiateFailed: true,
// Deployment
DeploymentCancelled: true,
RolloutCancelled: true,
Copy link
Member

@spadgett spadgett Oct 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: better to keep it alphabetical by type so it's easier to find things

Copy link
Member

@spadgett spadgett Oct 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is for deployment configs, better to move it under that section

Copy link
Contributor Author

@benjaminapetersen benjaminapetersen Oct 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will do.

app/scripts/constants.js Outdated
@@ -189,6 +189,7 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
BuildConfigInstantiateFailed: true,
// Deployment
DeploymentCancelled: true,
Copy link
Member

@spadgett spadgett Oct 31, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this reason exist if RolloutCancelled is for cancelled deployments?

Edit: I'm guessing DeploymentCancelled is for k8s deployments and RolloutCancelled is for deployment configs?

Copy link
Contributor Author

@benjaminapetersen benjaminapetersen Oct 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My doc indicates that it did in my first review of all the events, but I don't see a c.recorder.Eventf with grep -ri 'DeploymentCancellationFailed' pkg so I'm pretty sure its not real. I'll remove this.

Copy link
Member

@spadgett spadgett Oct 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might have changed from 3.6 -> 3.7

@spadgett
Copy link
Member

spadgett commented Oct 31, 2017

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2017
@spadgett
Copy link
Member

spadgett commented Oct 31, 2017

I don't think DeploymentCancelled is a real event reason. I'd like to remove that as part of this PR.

@benjaminapetersen benjaminapetersen force-pushed the bug/1490720/deployment-cancelled-in-drawer branch from b24330c to 90ff922 Compare October 31, 2017 20:51
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2017
@benjaminapetersen
Copy link
Contributor Author

benjaminapetersen commented Oct 31, 2017

Updated.

spadgett
spadgett approved these changes Oct 31, 2017
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @benjaminapetersen for humoring my picky comments

@spadgett
Copy link
Member

spadgett commented Oct 31, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2017
@spadgett
Copy link
Member

spadgett commented Oct 31, 2017

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2017
@spadgett
Copy link
Member

spadgett commented Oct 31, 2017 

Built /dist does not match what is committed, run 'grunt build' and include the results in your commit.
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 354721d..2ae32d6 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -723,11 +723,10 @@ BuildCompleted: !0,
 BuildFailed: !0,
 BuildStarted: !0,
 BuildConfigInstantiateFailed: !0,
-DeploymentCancelled: !0,
-RolloutCancelled: !0,
 Failed: !0,
 DeploymentCreated: !0,
 DeploymentCreationFailed: !0,
+RolloutCancelled: !0,
 FailedRescale: !0,
 SuccessfulRescale: !0,
 BackOff: !0,

@benjaminapetersen
Copy link
Contributor Author

benjaminapetersen commented Nov 1, 2017

/retest

@benjaminapetersen
Copy link
Contributor Author

benjaminapetersen commented Nov 1, 2017

/test

/dist should match.

@spadgett
Copy link
Member

spadgett commented Nov 1, 2017

@benjaminapetersen I can look at the commit and see the dist is wrong :)

@benjaminapetersen benjaminapetersen force-pushed the bug/1490720/deployment-cancelled-in-drawer branch from 90ff922 to e4beed3 Compare November 1, 2017 15:05
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2017
@benjaminapetersen
Copy link
Contributor Author

benjaminapetersen commented Nov 1, 2017

😐 more ☕ ☕ ☕

@spadgett
Copy link
Member

spadgett commented Nov 1, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2017
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Nov 1, 2017

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 5e47231 into openshift:master Nov 1, 2017
@benjaminapetersen benjaminapetersen deleted the bug/1490720/deployment-cancelled-in-drawer branch November 1, 2017 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@spadgett spadgett spadgett approved these changes

@jwforres jwforres Awaiting requested review from jwforres

Assignees

@spadgett spadgett

@jwforres jwforres

Labels

kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@benjaminapetersen @jwforres @spadgett @openshift-merge-robot @openshift-ci-robot