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

OCPBUGS-31878: Propogate hypershift control plane priority class override to multus and preserve container resource requests #2335

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

lucaspalm
Copy link

@lucaspalm lucaspalm commented Apr 12, 2024

What this PR does / why we need it:
The multus-admission-controller component currently does not honor the hypershift custom priority class overrides specified on the hostedcluster. The custom priority class override feature was first introduced to all other hypershift hosted control plane components in openshift/hypershift#2661. Multus was left out at the time due to it not being directly managed by the CPO. These changes extend the hypershift custom priority class override feature to the multus-admission-controller to ensure that this component honors the custom class if it is set. These changes also extend the hypershift control plane component resource preservation support to the multus container as well, where the expected behavior is that any modifications to the container's resource requests are not overwritten on subsequent reconciliations.

Which issue(s) this PR fixes:
https://issues.redhat.com/browse/OCPBUGS-31878

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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 Apr 12, 2024
@openshift-ci-robot
Copy link
Contributor

@lucaspalm: This pull request references Jira Issue OCPBUGS-31878, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

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:

What this PR does / why we need it:
The multus-admission-controller component currently does not honor the hypershift custom priority class overrides specified on the hostedcluster. The custom priority class override feature was first introduced to all other hypershift hosted control plane components in openshift/hypershift#2661. Multus was left out at the time due to it not being directly managed by the CPO. These changes extend the hypershift custom priority class override feature to the multus-admission-controller to ensure that this component honors the custom class if it is set.

Which issue(s) this PR fixes:
https://issues.redhat.com/browse/OCPBUGS-31878

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from dcbw and dougbtv April 12, 2024 20:11
@lucaspalm lucaspalm marked this pull request as draft April 12, 2024 20:20
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 12, 2024
@ricky-rav
Copy link
Contributor

/assign @dougbtv

@lucaspalm lucaspalm changed the title OCPBUGS-31878: Propogate hypershift control plane priority class override to multus OCPBUGS-31878: Propogate hypershift control plane priority class override to multus and preserve container resource requests Apr 16, 2024
@lucaspalm lucaspalm marked this pull request as ready for review April 16, 2024 20:21
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 16, 2024
@lucaspalm
Copy link
Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@lucaspalm: This pull request references Jira Issue OCPBUGS-31878, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from jcaamano and trozet April 16, 2024 20:22
@lucaspalm
Copy link
Author

/retest

1 similar comment
@lucaspalm
Copy link
Author

/retest

@dougbtv
Copy link
Member

dougbtv commented Apr 18, 2024

/approve

Copy link
Contributor

openshift-ci bot commented Apr 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dougbtv, lucaspalm

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 Apr 18, 2024
@lucaspalm
Copy link
Author

/retest-required

1 similar comment
@lucaspalm
Copy link
Author

/retest-required

@lucaspalm lucaspalm force-pushed the OCPBUGS-31878 branch 3 times, most recently from 3d830f0 to 26c6930 Compare April 24, 2024 16:12
@lucaspalm
Copy link
Author

/retest

@riendeau
Copy link

/retest

@riendeau
Copy link

/retest-required

1 similar comment
@riendeau
Copy link

/retest-required

@riendeau
Copy link

/test e2e-hypershift-ovn

Copy link
Contributor

openshift-ci bot commented May 21, 2024

@riendeau: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test 4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade
  • /test 4.16-upgrade-from-stable-4.15-images
  • /test e2e-aws-live-migration-sdn-ovn
  • /test e2e-aws-ovn-hypershift-conformance
  • /test e2e-aws-ovn-network-migration
  • /test e2e-aws-ovn-upgrade
  • /test e2e-aws-ovn-windows
  • /test e2e-azure-ovn-upgrade
  • /test e2e-gcp-ovn
  • /test e2e-gcp-ovn-upgrade
  • /test e2e-metal-ipi-ovn-ipv6
  • /test images
  • /test lint
  • /test unit
  • /test verify

The following commands are available to trigger optional jobs:

  • /test 4.16-upgrade-from-stable-4.15-e2e-aws-ovn-upgrade
  • /test 4.16-upgrade-from-stable-4.15-e2e-azure-ovn-upgrade
  • /test 4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-upgrade
  • /test e2e-aws-hypershift-ovn-kubevirt
  • /test e2e-aws-live-migration-sdn-ovn-rollback
  • /test e2e-aws-ovn-ipsec-upgrade
  • /test e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • /test e2e-aws-ovn-serial
  • /test e2e-aws-ovn-shared-to-local-gateway-mode-migration
  • /test e2e-aws-ovn-single-node
  • /test e2e-aws-ovn-techpreview-serial
  • /test e2e-aws-sdn-upgrade
  • /test e2e-azure-ovn
  • /test e2e-azure-ovn-dualstack
  • /test e2e-azure-ovn-manual-oidc
  • /test e2e-gcp-ovn-techpreview
  • /test e2e-metal-ipi-ovn-ipv6-ipsec
  • /test e2e-network-mtu-migration-ovn-ipv4
  • /test e2e-network-mtu-migration-ovn-ipv6
  • /test e2e-openstack-ovn
  • /test e2e-ovn-hybrid-step-registry
  • /test e2e-ovn-ipsec-step-registry
  • /test e2e-ovn-step-registry
  • /test e2e-vsphere-ovn
  • /test e2e-vsphere-ovn-dualstack
  • /test e2e-vsphere-ovn-dualstack-primaryv6
  • /test e2e-vsphere-ovn-windows
  • /test okd-scos-images
  • /test qe-perfscale-aws-ovn-medium-cluster-density
  • /test qe-perfscale-aws-ovn-medium-node-density-cni
  • /test qe-perfscale-aws-ovn-small-cluster-density
  • /test qe-perfscale-aws-ovn-small-node-density-cni
  • /test security

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-cluster-network-operator-master-4.16-upgrade-from-stable-4.15-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.16-upgrade-from-stable-4.15-e2e-azure-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-4.16-upgrade-from-stable-4.15-images
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-hypershift-ovn-kubevirt
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-live-migration-sdn-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-live-migration-sdn-ovn-rollback
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-hypershift-conformance
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-local-to-shared-gateway-mode-migration
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-network-migration
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-serial
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-shared-to-local-gateway-mode-migration
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-single-node
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-ovn-windows
  • pull-ci-openshift-cluster-network-operator-master-e2e-aws-sdn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-azure-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-azure-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-gcp-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-gcp-ovn-upgrade
  • pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-ipv6
  • pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-ipv6-ipsec
  • pull-ci-openshift-cluster-network-operator-master-e2e-network-mtu-migration-ovn-ipv4
  • pull-ci-openshift-cluster-network-operator-master-e2e-network-mtu-migration-ovn-ipv6
  • pull-ci-openshift-cluster-network-operator-master-e2e-openstack-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-hybrid-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-ipsec-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-ovn-step-registry
  • pull-ci-openshift-cluster-network-operator-master-e2e-vsphere-ovn
  • pull-ci-openshift-cluster-network-operator-master-e2e-vsphere-ovn-dualstack
  • pull-ci-openshift-cluster-network-operator-master-e2e-vsphere-ovn-dualstack-primaryv6
  • pull-ci-openshift-cluster-network-operator-master-images
  • pull-ci-openshift-cluster-network-operator-master-lint
  • pull-ci-openshift-cluster-network-operator-master-security
  • pull-ci-openshift-cluster-network-operator-master-unit
  • pull-ci-openshift-cluster-network-operator-master-verify

In response to this:

/test e2e-hypershift-ovn

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-sigs/prow repository.

@riendeau
Copy link

/retest

3 similar comments
@riendeau
Copy link

/retest

@riendeau
Copy link

/retest

@riendeau
Copy link

/retest

Copy link
Contributor

openshift-ci bot commented May 23, 2024

@lucaspalm: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-hypershift-ovn 26c6930 link true /test e2e-hypershift-ovn
ci/prow/security 4d60be9 link false /test security
ci/prow/e2e-azure-ovn 4d60be9 link false /test e2e-azure-ovn
ci/prow/e2e-vsphere-ovn-dualstack-primaryv6 4d60be9 link false /test e2e-vsphere-ovn-dualstack-primaryv6

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants