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.

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

Jump to bottom

bug 1804717: Cleanup switch to managing openshift-apiserver pods with a deployment #324

Merged
merged 3 commits into from Feb 27, 2020
Merged

bug 1804717: Cleanup switch to managing openshift-apiserver pods with a deployment #324

merged 3 commits into from Feb 27, 2020

Conversation

marun
Copy link
Contributor

@marun marun commented Feb 27, 2020

This PR addresses comments and otherwise unresolved issues from #313

  • Sets the replica count according to the number of master nodes
  • Ensures the operator doesn't report degraded if the number of available nodes exceeds the desired replica count (a likely scenario during rollout)
  • Removes the unintentionally applied previousGeneration label from the deployment
  • Updates previously unnoticed daemonset-derived variable names.

cc: @deads2k @sttts @tnozicka

@openshift-ci-robot
Copy link

@marun: This pull request references Bugzilla bug 1804717, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is MODIFIED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

bug 1804717: Cleanup switch to managing openshift-apiserver pods with a deployment

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 27, 2020
@marun marun mentioned this pull request Feb 27, 2020
Merged
@marun
Copy link
Contributor Author

marun commented Feb 27, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 27, 2020
@openshift-ci-robot
Copy link

@marun: This pull request references Bugzilla bug 1804717, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 27, 2020
@marun
Copy link
Contributor Author

marun commented Feb 27, 2020

/retest

deads2k
deads2k reviewed Feb 27, 2020
View reviewed changes
pkg/operator/workloadcontroller/workload_controller.go Outdated
@@ -85,6 +94,17 @@ func NewWorkloadController(
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "OpenShiftAPIServerOperator"),
}

// This function supports determining the number of master nodes
// to allow setting the deployment replica count to match.
c.countNodes = func(nodeSelector map[string]string) (*int32, error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Too big for an anonymous function. Make this an actual function on the OpenshfitAPIServerOperator. Then assign this function to countNodes here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@deads2k
Copy link
Contributor

deads2k commented Feb 27, 2020

/lgtm
/hold

hold for the factorization update.

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 27, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2020
@deads2k
Copy link
Contributor

deads2k commented Feb 27, 2020

/hold cancel
/lgtm

if this causes multiple rollouts, we may have to reconsider, but it seems like a reasonable way to be flexible for now.

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Feb 27, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, marun

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit d47d6d6 into openshift:master Feb 27, 2020
@openshift-ci-robot
Copy link

@marun: All pull requests linked via external trackers have merged. Bugzilla bug 1804717 has been moved to the MODIFIED state.

In response to this:

bug 1804717: Cleanup switch to managing openshift-apiserver pods with a deployment

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@marun marun mentioned this pull request Feb 27, 2020
Merged
@marun marun deleted the cleanup-ds-to-deploy branch March 2, 2020 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k deads2k left review comments

@mfojtik mfojtik Awaiting requested review from mfojtik

Assignees

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@marun @openshift-ci-robot @deads2k @openshift-merge-robot