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

[release-4.13] Bug OCPBUGS-13313: Backport cpu partitioning siteconfig #1495

Conversation

eggfoobar
Copy link
Contributor

@eggfoobar eggfoobar commented May 8, 2023

PR back ports #1441 and #1497

/assign @imiller0

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 8, 2023

@eggfoobar: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.13] Backport cpu partitioning siteconfig

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 openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 8, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 8, 2023

Hi @eggfoobar. Thanks for your PR.

I'm waiting for a openshift-kni member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@imiller0
Copy link
Contributor

imiller0 commented May 8, 2023

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 8, 2023
@eggfoobar eggfoobar force-pushed the backport-cpu-partitioning-siteconfig branch from 6ecc7bd to 1923b89 Compare May 8, 2023 14:03
add new flag for cpu partitioning mode
add deprecation warning for situations where cpuset is defined for nodes

Signed-off-by: ehila <ehila@redhat.com>
Signed-off-by: ehila <ehila@redhat.com>
Signed-off-by: ehila <ehila@redhat.com>
@eggfoobar eggfoobar force-pushed the backport-cpu-partitioning-siteconfig branch from 1923b89 to 01d845d Compare May 8, 2023 15:46
@imiller0
Copy link
Contributor

imiller0 commented May 8, 2023

/hold
pending timing of this backport relative to 4.13 release

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 8, 2023
Signed-off-by: ehila <ehila@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 9, 2023

@eggfoobar: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.13] Backport cpu partitioning siteconfig

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.

@imiller0 imiller0 changed the title [release-4.13] Backport cpu partitioning siteconfig [release-4.13] Bug OCPBUGS-13301: Backport cpu partitioning siteconfig May 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 9, 2023

@eggfoobar: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.13] Bug OCPBUGS-13301: Backport cpu partitioning siteconfig

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 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 9, 2023
@openshift-ci-robot
Copy link
Collaborator

@eggfoobar: This pull request references Jira Issue OCPBUGS-13301, which is invalid:

  • expected the bug to target the "4.13.0" version, but it targets "4.13.z" instead
  • expected Jira Issue OCPBUGS-13301 to depend on a bug targeting a version in 4.14.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

PR back ports #1441 and #1497

/assign @imiller0

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.

@imiller0
Copy link
Contributor

imiller0 commented May 9, 2023

/jira refresh

@openshift-ci-robot
Copy link
Collaborator

@imiller0: This pull request references Jira Issue OCPBUGS-13301, which is invalid:

  • expected Jira Issue OCPBUGS-13301 to depend on a bug targeting a version in 4.14.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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

In response to this:

/jira 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.

@imiller0 imiller0 changed the title [release-4.13] Bug OCPBUGS-13301: Backport cpu partitioning siteconfig [release-4.13] Bug OCPBUGS-13313: Backport cpu partitioning siteconfig May 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 9, 2023

@eggfoobar: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.13] Bug OCPBUGS-13313: Backport cpu partitioning siteconfig

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
Copy link
Collaborator

@eggfoobar: This pull request references Jira Issue OCPBUGS-13313, which is invalid:

  • expected Jira Issue OCPBUGS-13313 to depend on a bug targeting a version in 4.14.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

PR back ports #1441 and #1497

/assign @imiller0

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.

@imiller0
Copy link
Contributor

/unhold
4.13 GA artifacts are built. Backport can merge for z-stream.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 15, 2023
@imiller0
Copy link
Contributor

/jira refresh

@openshift-ci-robot
Copy link
Collaborator

@imiller0: This pull request references Jira Issue OCPBUGS-13313, which is invalid:

  • expected dependent Jira Issue OCPBUGS-13301 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ASSIGNED instead
  • expected dependent Jira Issue OCPBUGS-13310 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ON_QA instead
  • expected dependent Jira Issue OCPBUGS-13310 to target a version in 4.14.0, but it targets "4.13.z" instead

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

In response to this:

/jira 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.

@imiller0
Copy link
Contributor

imiller0 commented Aug 1, 2023

Just to confirm: If the user continues to use cpuset (and not cpuPartitioningMode) in their SiteConfig the tool will continue to generate the MachineConfigs. In this case workload partitioning continues to be enabled "the old way" and there is no actual impact, correct?

@eggfoobar
Copy link
Contributor Author

That's correct, because of this logic below we still get the old way for SNO and then you can go down the new path with techpreview on 4.13 for non SNO deployments. We also do have some unit tests in place to that will validate that behavior.

if clusterSpec.ClusterType == SNO {
for node := range clusterSpec.Nodes {
cpuSet := clusterSpec.Nodes[node].Cpuset
role := clusterSpec.Nodes[node].Role
if cpuSet != "" {
k, v, err := scbuilder.getWorkloadManifest(cpuSet, role)
if err != nil {
errStr := fmt.Sprintf("Error could not read WorkloadManifest %s %s\n", clusterSpec.ClusterName, err)
return dataMap, errors.New(errStr)
} else {
data, err := addZTPAnnotationToManifest(v.(string))
if err != nil {
return dataMap, err
}
dataMap[k] = data
// Exclude the workload manifest
doNotMerge[k] = true
}
}
}
}

Copy link
Contributor

@imiller0 imiller0 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 2, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 2, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eggfoobar, imiller0

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 2, 2023
@imiller0
Copy link
Contributor

imiller0 commented Aug 7, 2023

/jira refresh

@openshift-ci-robot
Copy link
Collaborator

@imiller0: This pull request references Jira Issue OCPBUGS-13313, which is invalid:

  • expected dependent Jira Issue OCPBUGS-16409 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is New instead
  • expected dependent Jira Issue OCPBUGS-13310 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ASSIGNED instead
  • expected dependent Jira Issue OCPBUGS-13310 to target a version in 4.14.0, but it targets "4.13.z" instead

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

In response to this:

/jira 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.

@imiller0
Copy link
Contributor

imiller0 commented Aug 7, 2023

/jira refresh

@openshift-ci-robot
Copy link
Collaborator

@imiller0: This pull request references Jira Issue OCPBUGS-13313, which is invalid:

  • expected dependent Jira Issue OCPBUGS-16409 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is New instead

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

In response to this:

/jira 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.

@imiller0
Copy link
Contributor

imiller0 commented Aug 7, 2023

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 7, 2023
@openshift-ci-robot
Copy link
Collaborator

@imiller0: This pull request references Jira Issue OCPBUGS-13313, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-13301 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-13301 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
  • bug has dependents

Requesting review from QA contact:
/cc @dgonyier

In response to this:

/jira 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
Copy link
Contributor

openshift-ci bot commented Aug 7, 2023

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: dgonyier.

Note that only openshift-kni members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@imiller0: This pull request references Jira Issue OCPBUGS-13313, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-13301 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-13301 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
  • bug has dependents

Requesting review from QA contact:
/cc @dgonyier

In response to this:

/jira 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.

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-merge-robot openshift-merge-robot merged commit bbd0904 into openshift-kni:release-4.13 Aug 7, 2023
4 checks passed
@openshift-ci-robot
Copy link
Collaborator

@eggfoobar: Jira Issue OCPBUGS-13313: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-13313 has been moved to the MODIFIED state.

In response to this:

PR back ports #1441 and #1497

/assign @imiller0

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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants