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

OCPBUGS-16245: Make nmstateconfig.yaml optional in config-drive #7333

Merged
merged 1 commit into from Jul 20, 2023
Merged

OCPBUGS-16245: Make nmstateconfig.yaml optional in config-drive #7333

merged 1 commit into from Jul 20, 2023

Conversation

zaneb
Copy link
Member

@zaneb zaneb commented Jul 17, 2023

No description provided.

@zaneb zaneb requested a review from bfournie July 17, 2023 01:00
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important 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 Jul 17, 2023
@openshift-ci-robot
Copy link
Contributor

@zaneb: This pull request references Jira Issue OCPBUGS-16245, which is invalid:

  • expected the bug to target the "4.14.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:

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.

@bfournie
Copy link
Contributor

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 17, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bfournie

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 Jul 17, 2023
@bfournie
Copy link
Contributor

/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 Jul 17, 2023
@openshift-ci-robot
Copy link
Contributor

@bfournie: This pull request references Jira Issue OCPBUGS-16245, which is valid. The bug has been moved to the POST state.

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

Requesting review from QA contact:
/cc @mhanss

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 openshift-ci bot requested a review from mhanss July 17, 2023 13:16
andfasano
andfasano reviewed Jul 17, 2023
View reviewed changes
pkg/asset/agent/image/unconfigured_ignition.go
"/etc/assisted/manifests/cluster-deployment.yaml",
"/etc/assisted/manifests/cluster-image-set.yaml",
"/etc/assisted/manifests/agent-cluster-install.yaml",
"/etc/assisted/manifests/infraenv.yaml",
"/etc/assisted/manifests", // optional nmstateconfig.yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

AFAIU the load-config-iso script performs the existence check only on files but not on the folders, something non immediately clear from here, it may be useful to add a note for that

Copy link
Contributor

Choose a reason for hiding this comment

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

When I tested it, for directories, it copied all the files inside the directory. So this is a good way to include nmstateconfig.yaml and have it optional.

rwsu
rwsu reviewed Jul 17, 2023
View reviewed changes
Copy link
Contributor

@rwsu rwsu left a comment

Choose a reason for hiding this comment

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

/lgtm

pkg/asset/agent/image/unconfigured_ignition.go
"/etc/assisted/manifests/cluster-deployment.yaml",
"/etc/assisted/manifests/cluster-image-set.yaml",
"/etc/assisted/manifests/agent-cluster-install.yaml",
"/etc/assisted/manifests/infraenv.yaml",
"/etc/assisted/manifests", // optional nmstateconfig.yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

When I tested it, for directories, it copied all the files inside the directory. So this is a good way to include nmstateconfig.yaml and have it optional.

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

/retest-required

Remaining retests: 0 against base HEAD 7aa0603 and 2 for PR HEAD 631a2b4 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 0b3054a and 1 for PR HEAD 631a2b4 in total

@rwsu
Copy link
Contributor

rwsu commented Jul 18, 2023

/retest-required

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD c8467b7 and 0 for PR HEAD 631a2b4 in total

@openshift-ci-robot
Copy link
Contributor

/hold

Revision 631a2b4 was retested 3 times: holding

@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 Jul 19, 2023
@bfournie
Copy link
Contributor

/unhold
/retest

@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 Jul 19, 2023
@zaneb
Copy link
Member Author

zaneb commented Jul 20, 2023

/test e2e-agent-ha-dualstack

@openshift-merge-robot openshift-merge-robot merged commit 1e9209a into openshift:master Jul 20, 2023
25 of 26 checks passed
@openshift-ci-robot
Copy link
Contributor

@zaneb: Jira Issue OCPBUGS-16245: All pull requests linked via external trackers have merged:

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

In response to this:

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.

marcbrown2024 pushed a commit to marcbrown2024/Openshift-installer that referenced this pull request Jul 20, 2023
@openshift-merge-robot @marcbrown2024
Merge pull request openshift#7333 from zaneb/required-config-files
d737d49 
OCPBUGS-16245: Make nmstateconfig.yaml optional in config-drive
marcbrown2024 pushed a commit to marcbrown2024/Openshift-installer that referenced this pull request Jul 20, 2023
@openshift-merge-robot @marcbrown2024
Merge pull request openshift#7333 from zaneb/required-config-files
badf67c 
OCPBUGS-16245: Make nmstateconfig.yaml optional in config-drive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rwsu rwsu rwsu left review comments

@andfasano andfasano andfasano left review comments

@bfournie bfournie Awaiting requested review from bfournie

@celebdor celebdor Awaiting requested review from celebdor

@dhellmann dhellmann Awaiting requested review from dhellmann

@mhanss mhanss Awaiting requested review from mhanss

Assignees

@rwsu rwsu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@zaneb @openshift-ci-robot @bfournie @rwsu @andfasano @openshift-merge-robot