add progressing status unit test and updated messages #94
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
size/L
sanchezl
force-pushed
the
statusgeneration
branch
from
24f1d49
to
40ff4eb
Compare
deads2k
reviewed
Dec 17, 2018
| operatorConfig.ObjectMeta.Generation == operatorConfig.Status.ObservedGeneration { | ||
| var progressingMessages []string | ||
| if actualDaemonSet.ObjectMeta.Generation != actualDaemonSet.Status.ObservedGeneration { | ||
| glog.Warningf("daemonset/apiserver.openshift-operator: observed generation is %d, actual generation is %d.", actualDaemonSet.Status.ObservedGeneration, actualDaemonSet.ObjectMeta.Generation) |
There was a problem hiding this comment.
if it's important enough to log, its important enough for an event.
deads2k
reviewed
Dec 17, 2018
| operatorConfig.ObjectMeta.Generation == operatorConfig.Status.ObservedGeneration { | ||
| var progressingMessages []string | ||
| if actualDaemonSet.ObjectMeta.Generation != actualDaemonSet.Status.ObservedGeneration { | ||
| glog.Warningf("daemonset/apiserver.openshift-operator: observed generation is %d, actual generation is %d.", actualDaemonSet.Status.ObservedGeneration, actualDaemonSet.ObjectMeta.Generation) |
There was a problem hiding this comment.
this isn't a warning. V(2) at best.
deads2k
reviewed
Dec 17, 2018
| progressingMessages = append(progressingMessages, "The operator is process of updating a DaemonSet") | ||
| } | ||
| if operatorConfig.ObjectMeta.Generation != operatorConfig.Status.ObservedGeneration { | ||
| glog.Warningf("openshiftapiserveroperatorconfigs/instance: observed generation is %d, actual generation is %d.", operatorConfig.Status.ObservedGeneration, operatorConfig.ObjectMeta.Generation) |
deads2k
reviewed
Dec 17, 2018
deads2k
reviewed
Dec 17, 2018
| f() | ||
| } | ||
|
|
||
| type mockRecorder struct { |
There was a problem hiding this comment.
Move this to a subpackage under spot where the in memory one is. TestingEventRecorder and NewTestingEventRecorder
There was a problem hiding this comment.
Opened issue and will use InMemoryRecorder for now.
sanchezl
force-pushed
the
statusgeneration
branch
2 times, most recently
from
1e0c348
to
dce3d83
Compare
deads2k
reviewed
Dec 17, 2018
| operatorConfig.ObjectMeta.Generation == operatorConfig.Status.ObservedGeneration { | ||
| var progressingMessages []string | ||
| if actualDaemonSet.ObjectMeta.Generation != actualDaemonSet.Status.ObservedGeneration { | ||
| progressingMessages = append(progressingMessages, fmt.Sprintf("daemonset/apiserver.openshift-operator: observed generation is %d, actual generation is %d.", actualDaemonSet.Status.ObservedGeneration, actualDaemonSet.ObjectMeta.Generation)) |
There was a problem hiding this comment.
observed generation is, desired generation is
deads2k
reviewed
Dec 17, 2018
| progressingMessages = append(progressingMessages, fmt.Sprintf("daemonset/apiserver.openshift-operator: observed generation is %d, actual generation is %d.", actualDaemonSet.Status.ObservedGeneration, actualDaemonSet.ObjectMeta.Generation)) | ||
| } | ||
| if operatorConfig.ObjectMeta.Generation != operatorConfig.Status.ObservedGeneration { | ||
| progressingMessages = append(progressingMessages, fmt.Sprintf("openshiftapiserveroperatorconfigs/instance: observed generation is %d, actual generation is %d.", operatorConfig.Status.ObservedGeneration, operatorConfig.ObjectMeta.Generation)) |
There was a problem hiding this comment.
observed and desired, not actual. They are both actual
deads2k
reviewed
Dec 17, 2018
|
|
||
| } | ||
|
|
||
| func assertNotPanic(t *testing.T, f func()) { |
|
nits, then lgtm |
sanchezl
force-pushed
the
statusgeneration
branch
from
dce3d83
to
d46671f
Compare
|
/test e2e-aws |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deads2k, sanchezl The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.