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

Update deployment conditions #11660

Merged
merged 2 commits into from
Dec 12, 2016
Merged

Update deployment conditions #11660

merged 2 commits into from
Dec 12, 2016

Conversation

0xmichalis
Copy link
Contributor

@mfojtik brings our conditions on par with what has merged in upstream deployment conditions. Not sure if we want it for 1.4.

@0xmichalis
Copy link
Contributor Author

[test]

@0xmichalis
Copy link
Contributor Author

0xmichalis commented Oct 31, 2016

Not sure if we want it for 1.4.

Actually I would like it for 1.4 since it makes lastTransitionTime work correctly.

@0xmichalis
Copy link
Contributor Author

cc: @openshift/api-review

@mfojtik
Copy link
Contributor

mfojtik commented Oct 31, 2016

@Kargakis probably too late for 1.4

@@ -437,6 +437,8 @@ type DeploymentCondition struct {
Type DeploymentConditionType
// Status of the condition, one of True, False, Unknown.
Status kapi.ConditionStatus
// The last time this condition was updated.
LastUpdateTime unversioned.Time
Copy link
Contributor

Choose a reason for hiding this comment

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

I prefer the LastProbeTime from pretty much all types other than deployment since this probably didn't change (update) the condition at all.

Copy link
Contributor

Choose a reason for hiding this comment

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

@deads2k LastProbeTime might be confused with probes (readiness/livenes).

Copy link
Contributor

Choose a reason for hiding this comment

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

@Kargakis what is the difference between LastTransitionTime and LastUpdateTime ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The former is updated only when the Status of the condition transitions, the latter is updated every time the condition is updated.

Copy link
Contributor

Choose a reason for hiding this comment

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

@Kargakis maybe mention that in the godoc?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

LastTransitionTime godoc already mentions when it is updated

// The last time the condition transitioned from one status to another.

@mfojtik mfojtik added this to the 1.5.0 milestone Oct 31, 2016
@smarterclayton
Copy link
Contributor

I want this in 1.4 because this is a net-new API for 1.4 and I don't want to have to go through a deprecation cycle.

@smarterclayton smarterclayton modified the milestones: 1.5.0, 1.4.0 Oct 31, 2016
@smarterclayton
Copy link
Contributor

Oh wait, it's additive only. Yes, 1.5.

@smarterclayton smarterclayton modified the milestones: 1.5.0, 1.4.0 Oct 31, 2016
@0xmichalis
Copy link
Contributor Author

The main thing here is LastTransitionTime working as LastUpdateTime in 1.4
and as it is supposed to work in 1.5. But if you guys are ok with it, then
I'm fine too

On Mon, Oct 31, 2016 at 3:16 PM, Clayton Coleman notifications@github.com
wrote:

Oh wait, it's additive only. Yes, 1.5.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#11660 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ADuFf9EyE6fPNER4F-eZZxGSopg8FV6lks5q5fhMgaJpZM4Kk92q
.

@@ -77,6 +78,10 @@ func SetDeploymentCondition(status *deployapi.DeploymentConfigStatus, condition
if currentCond != nil && currentCond.Status == condition.Status && currentCond.Reason == condition.Reason {
return
}
// Preserve lastTransitionTime if we are not switching between statuses of a condition.
if currentCond != nil && currentCond.Status == condition.Status {
Copy link
Contributor

Choose a reason for hiding this comment

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

We definitely need this for 1.4. I don't know that we need the rest. Can you split this out?

Copy link
Contributor

Choose a reason for hiding this comment

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

i'm fine merging this for 1.4

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Opened #11665

@openshift-bot openshift-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 6, 2016
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 41da0db

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12018/) (Base Commit: de44433)

@mfojtik
Copy link
Contributor

mfojtik commented Dec 12, 2016

LGTM

@0xmichalis
Copy link
Contributor Author

[merge]

@0xmichalis
Copy link
Contributor Author

#8502 [merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 41da0db

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 12, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12018/) (Base Commit: b61cf87) (Image: devenv-rhel7_5526)

@openshift-bot openshift-bot merged commit edac9f2 into openshift:master Dec 12, 2016
@0xmichalis 0xmichalis deleted the update-deployment-conditions branch December 12, 2016 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants