Skip to content

Bug 1827050: Update to use revised ApplyDeployment #354

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
Apr 29, 2020
Merged

Bug 1827050: Update to use revised ApplyDeployment #354

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
5 changes: 0 additions & 5 deletions pkg/operator/workload/workload_openshiftapiserver_v311_00_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,11 +388,6 @@ func manageOpenShiftAPIServerDeployment_v311_00_to_latest(
return nil, false, fmt.Errorf("failed to determine number of master nodes: %v", err)
}
required.Spec.Replicas = masterNodeCount
// Set the replica count as an annotation to ensure that ApplyDeployment
// will update the deployment in the API when the replica count
// changes. Updates are otherwise skipped if the metadata matches and the
// generation is up-to-date.
required.Annotations["openshiftapiservers.operator.openshift.io/replicas"] = fmt.Sprintf("%d", *masterNodeCount)

return resourceapply.ApplyDeployment(client, recorder, required, resourcemerge.ExpectedDeploymentGeneration(required, generationStatus))
}
Expand Down