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

MGMT-17106: Disable ironic vlan creation when static networking config is present #6055

Merged

Conversation

carbonin
Copy link
Member

@carbonin carbonin commented Mar 5, 2024

Previously the ironic agent would define vlan interfaces when it
detected that vlans were present using LLDP

This change only allows this type of reconfiguration if the user didn't
provide static networking config. If a user does provide static
networking config and requires vlans it's expected that they will
configure them manually rather than relying on LLDP-based configuration
from the ironic agent.

This also requires new ICC code to vendor in the change to accept this
parameter when we create the ironic agent ignition.

List all the issues related to this PR

Resolves https://issues.redhat.com/browse/MGMT-17106

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

I don't have the environment to test this, unit tests are all I can do for now.
CI will catch any potential regressions and hopefully QE has the kind of environment required to actually test it.

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see [CONTRIBUTING] guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

Previously the ironic agent would define vlan interfaces when it
detected that vlans were present using LLDP

This change only allows this type of reconfiguration if the user didn't
provide static networking config. If a user does provide static
networking config and requires vlans it's expected that they will
configure them manually rather than relying on LLDP-based configuration
from the ironic agent.

Resolves https://issues.redhat.com/browse/MGMT-17106
@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 5, 2024
@openshift-ci openshift-ci bot requested review from danmanor and eifrach March 5, 2024 22:04
Copy link

openshift-ci bot commented Mar 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carbonin

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 Mar 5, 2024
@carbonin carbonin changed the title Disable ironic vlan creation when static networking config is present MGMT-17106: Disable ironic vlan creation when static networking config is present Mar 5, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 5, 2024

@carbonin: This pull request references MGMT-17106 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.16.0" version, but no target version was set.

In response to this:

Previously the ironic agent would define vlan interfaces when it
detected that vlans were present using LLDP

This change only allows this type of reconfiguration if the user didn't
provide static networking config. If a user does provide static
networking config and requires vlans it's expected that they will
configure them manually rather than relying on LLDP-based configuration
from the ironic agent.

This also requires new ICC code to vendor in the change to accept this
parameter when we create the ironic agent ignition.

List all the issues related to this PR

Resolves https://issues.redhat.com/browse/MGMT-17106

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

I don't have the environment to test this, unit tests are all I can do for now.
CI will catch any potential regressions and hopefully QE has the kind of environment required to actually test it.

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see [CONTRIBUTING] guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 5, 2024
Copy link

codecov bot commented Mar 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.40%. Comparing base (97daf5f) to head (ccb68ea).
Report is 2 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6055      +/-   ##
==========================================
+ Coverage   68.39%   68.40%   +0.01%     
==========================================
  Files         239      239              
  Lines       35454    35457       +3     
==========================================
+ Hits        24247    24253       +6     
+ Misses       9101     9099       -2     
+ Partials     2106     2105       -1     
Files Coverage Δ
internal/ignition/ironic.go 100.00% <100.00%> (ø)

... and 2 files with indirect coverage changes

@eifrach
Copy link
Contributor

eifrach commented Mar 6, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2024
Copy link

openshift-ci bot commented Mar 6, 2024

@carbonin: all tests passed!

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

@openshift-merge-bot openshift-merge-bot bot merged commit 3864109 into openshift:master Mar 6, 2024
14 checks passed
@carbonin carbonin deleted the ironic-inspector-vlan branch March 6, 2024 13:15
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-agent-installer-api-server-container-v4.16.0-202403061739.p0.g3864109.assembly.stream.el8 for distgit ose-agent-installer-api-server.
All builds following this will include this PR.

@gamli75
Copy link
Contributor

gamli75 commented Mar 12, 2024

/cherry-pick release-ocm-2.10

@openshift-cherrypick-robot

@gamli75: new pull request created: #6081

In response to this:

/cherry-pick release-ocm-2.10

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-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants