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.

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

Bug 1934904: Canary: Schedule canary server pods to worker and infra nodes #564

Merged

Conversation

sgreene570
Copy link
Contributor

This is a manual cherry pick of #560, since #563 ended in merge conflicts.


vendor: Pull in openshift/api/project/v1

These API definitions are needed in pkg/operator/controller/canary/namespace.go.


Canary: Add node-selector annotation to canary namespace

assets/canary/namespace.yaml:

Add the openshift.io/node-selector annotation to the canary namespace yaml file. This will allow the canary daemonset to schedule pods onto infra nodes (in addition to worker nodes) by overriding the default behavior.

pkg/manifests/bindata.go:

Regenerate.

pkg/operator/controller/canary/namespace.go:

Add logic to update the canary namespace resource on a cluster specifically when the namespace's node-selector annotation changes.

pkg/operator/controller/canary/namespace_test.go:

Add a unit test to exercise the new canaryNamespaceChanged function.

pkg/operator/controller/canary/controller.go:

Update ensureCanaryNamespace calling site.


Canary: Add node selector and tolerations to daemonset

assets/canary/daemonset.go:

Add a nodeSelector field to the canary daemonset asset that selects linux nodes. Add a tolerations field to tolerate infra node taints, so that the canary daemonset schedules pods to worker and infra nodes only.

pkg/manifests/bindata.go:

Regenerate

pkg/operator/controller/canary/daemonset.go:

Add logic to update the canary daemonset resource on a cluster specifically when the daemonset's node selector, tolerations, or canary server image reference changes.

pkg/operator/controller/canary/daemonset_test.go

Add unit tests to exercise the new canaryDaemonSetChanged function.

These API definitions are needed in
pkg/operator/controller/canary/namespace.go.
assets/canary/namespace.yaml:

Add the `openshift.io/node-selector` annotation to the canary namespace
yaml file. This will allow the canary daemonset to schedule pods onto
infra nodes (in addition to worker nodes) by overriding the default
behavior.

pkg/manifests/bindata.go:

Regenerate.

pkg/operator/controller/canary/namespace.go:

Add logic to update the canary namespace resource on a cluster
specifically when the namespace's node-selector annotation changes.

pkg/operator/controller/canary/namespace_test.go:

Add a unit test to exercise the new `canaryNamespaceChanged` function.

pkg/operator/controller/canary/controller.go:

Update `ensureCanaryNamespace` calling site.
assets/canary/daemonset.go:

Add a nodeSelector field to the canary daemonset asset that selects
linux nodes. Add a tolerations field to tolerate infra node
taints, so that the canary daemonset schedules pods to worker and infra
nodes only.

pkg/manifests/bindata.go:

Regenerate

pkg/operator/controller/canary/daemonset.go:

Add logic to update the canary daemonset resource on a cluster
specifically when the daemonset's node selector, tolerations, or canary server
image reference changes.

pkg/operator/controller/canary/daemonset_test.go

Add unit tests to exercise the new `canaryDaemonSetChanged` function.

Canary: Update daemonset on canary server image updates
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Mar 4, 2021
@openshift-ci-robot
Copy link
Contributor

@sgreene570: This pull request references Bugzilla bug 1934904, which is invalid:

  • expected dependent Bugzilla bug 1933102 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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:

[release-4.7] Bug 1934904: Canary: Schedule canary server pods to worker and infra nodes

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 the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 4, 2021
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2021
@frobware
Copy link
Contributor

frobware commented Mar 4, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2021
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci-robot
Copy link
Contributor

@openshift-bot: This pull request references Bugzilla bug 1934904, which is invalid:

  • expected dependent Bugzilla bug 1933102 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci-robot
Copy link
Contributor

@openshift-bot: This pull request references Bugzilla bug 1934904, which is invalid:

  • expected dependent Bugzilla bug 1933102 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci-robot
Copy link
Contributor

@openshift-bot: This pull request references Bugzilla bug 1934904, which is invalid:

  • expected dependent Bugzilla bug 1933102 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci-robot
Copy link
Contributor

@openshift-bot: This pull request references Bugzilla bug 1934904, which is invalid:

  • expected dependent Bugzilla bug 1933102 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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-bot
Copy link
Contributor

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

@openshift-ci-robot
Copy link
Contributor

@openshift-bot: This pull request references Bugzilla bug 1934904, which is invalid:

  • expected dependent Bugzilla bug 1933102 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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.

@sgreene570
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Mar 9, 2021
@openshift-ci-robot
Copy link
Contributor

@sgreene570: This pull request references Bugzilla bug 1934904, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1933102 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1933102 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

Requesting review from QA contact:
/cc @quarterpin

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.

@quarterpin
Copy link

/bugzilla cc-qa

@openshift-ci-robot
Copy link
Contributor

@quarterpin: This pull request references Bugzilla bug 1934904, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1933102 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1933102 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

Requesting review from QA contact:
/cc @quarterpin

In response to this:

/bugzilla cc-qa

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.

@quarterpin
Copy link

/lgtm

Verified via pre-merge verification workflow, more reference related to the test can be found in:
https://bugzilla.redhat.com/show_bug.cgi?id=1934904#c1

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: frobware, quarterpin, sgreene570

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:
  • OWNERS [frobware,sgreene570]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@crawford crawford changed the title [release-4.7] Bug 1934904: Canary: Schedule canary server pods to worker and infra nodes Bug 1934904: Canary: Schedule canary server pods to worker and infra nodes Mar 11, 2021
@crawford crawford added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 11, 2021
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@crawford
Copy link

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

3 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 7d81a58 into openshift:release-4.7 Mar 13, 2021
@openshift-ci-robot
Copy link
Contributor

@sgreene570: All pull requests linked via external trackers have merged:

Bugzilla bug 1934904 has been moved to the MODIFIED state.

In response to this:

Bug 1934904: Canary: Schedule canary server pods to worker and infra nodes

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants