Skip to content

fix the progressing check #93

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Dec 14, 2018
Merged

fix the progressing check #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/operator/workload_controller_openshiftapiserver_v311_00.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ func syncOpenShiftAPIServer_v311_00_to_latest(c OpenShiftAPIServerOperator, orig
})
}

if actualDaemonSet.ObjectMeta.Generation == operatorConfig.Status.ObservedGeneration {
// If the daemonset is up to date and the operatorConfig are up to date, then we are no longer progressing
if actualDaemonSet.ObjectMeta.Generation == actualDaemonSet.Status.ObservedGeneration &&
operatorConfig.ObjectMeta.Generation == operatorConfig.Status.ObservedGeneration {
v1helpers.SetOperatorCondition(&operatorConfig.Status.Conditions, operatorv1.OperatorCondition{
Type: operatorv1.OperatorStatusTypeProgressing,
Status: operatorv1.ConditionFalse,
Expand Down