Improve controller logic + fix tests flakiness #74
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
8918039
to
147d6da
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
147d6da
to
c8baa45
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
c8baa45
to
a5d3d8c
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
a5d3d8c
to
7dc75f5
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
7dc75f5
to
bc069f6
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
bc069f6
to
81d7a93
Compare
xornivore
reviewed
Dec 29, 2020
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
84c9e69
to
3ea0c7c
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
3ea0c7c
to
1b297b3
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
1b297b3
to
3321493
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
3321493
to
d25a063
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
d25a063
to
993e4bd
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
993e4bd
to
20ce653
Compare
xornivore
approved these changes
Jan 14, 2021
|
|
||
| switch isCanaryActive { |
There was a problem hiding this comment.
can we do if/else instead here?
celenechang
reviewed
Jan 14, 2021
| @@ -425,6 +411,77 @@ func (r *Reconciler) selectNodes(logger logr.Logger, daemonsetSpec *datadoghqv1a | |||
| return nil | |||
| } | |||
|
|
|||
| func isCanaryActive(daemonset *datadoghqv1alpha1.ExtendedDaemonSet, activeERSName string, uptodateERSName string, isCanaryFailed bool) bool { | |||
There was a problem hiding this comment.
nit: uptodateERSName -> upToDateERSName
celenechang
reviewed
Jan 14, 2021
celenechang
reviewed
Jan 14, 2021
| if isCanaryFailed { | ||
| msg := fmt.Sprintf("canary failed with ers: %s", ersName) | ||
| conditions.UpdateExtendedDaemonSetStatusCondition(status, now, datadoghqv1alpha1.ConditionTypeEDSCanaryFailed, corev1.ConditionTrue, "CanaryFailed", msg, updateOptions) | ||
| status.State = datadoghqv1alpha1.ExtendedDaemonSetStatusStateCanaryFailed |
There was a problem hiding this comment.
i think this is being set here and in manageCanaryStatus
There was a problem hiding this comment.
right removing this line
celenechang
reviewed
Jan 14, 2021
| if !isCanaryPaused { | ||
| status.State = datadoghqv1alpha1.ExtendedDaemonSetStatusStateCanary | ||
| } else { | ||
| status.State = datadoghqv1alpha1.ExtendedDaemonSetStatusStateCanaryPaused |
There was a problem hiding this comment.
similarly maybe pausedReason should be set here
There was a problem hiding this comment.
good catch 👍
done
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
406fc26
to
58d14a1
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
58d14a1
to
d158da4
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
d158da4
to
99c4952
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
99c4952
to
32dd743
Compare
celenechang
reviewed
Jan 15, 2021
| msg := fmt.Sprintf("canary paused with ers: %s", ersName) | ||
| conditions.UpdateExtendedDaemonSetStatusCondition(status, now, datadoghqv1alpha1.ConditionTypeEDSCanaryPaused, corev1.ConditionTrue, string(pausedReason), msg, updateOptions) | ||
| status.State = datadoghqv1alpha1.ExtendedDaemonSetStatusStateCanaryPaused | ||
| status.Reason = pausedReason |
There was a problem hiding this comment.
these two should be removed also
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
7b9e66a
to
774e90d
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
774e90d
to
1a1c55b
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
1a1c55b
to
0d6dd25
Compare
clamoriniere
force-pushed
the
clamoriniere/fix-tests-flakiness
branch
from
0d6dd25
to
5d8481f
Compare
clamoriniere
added a commit
that referenced
this pull request
Jan 19, 2021
clamoriniere
added a commit
that referenced
this pull request
Jan 19, 2021
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.
What does this PR do?
EDS.status.conditionswith CanaryFailed and CanaryPauseconditions.
paused or failed
ExtendedDaemonsetis not defaulted, we force the Defaulting by updating the ERS status with an error conditions. like this the EDS-controller received an event on an ERS update and requeue the parent EDS.Motivation
Remove test flakiness and improve EDS/ERS lifecycles.
Additional Notes
N/A
Describe your test plan