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-29652: nmstate, configure nmstate to keep service yamls #4190

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

qinqon
Copy link
Contributor

@qinqon qinqon commented Feb 15, 2024

When nmstate/nmstate#2546 land to RHCOS the nmstate service will go back to previous behaviour, the /etc/nmstate/*.yml files are moved to .applied files, so we need to configure nmstate to keep the those files, if we don't do so MCO complains at in place upgrades since the file system has change.

The original in place problem is described at nmstate/nmstate#2499:

At some envs like openshift machine-config-operator moving configuration files can break in place upgrades. This change use symlinks instead of rename to mark a .yml file as applied so the original file is preserved.

And the original issue was:
https://issues.redhat.com/browse/RHEL-19680

When [1] land to RHCOS the nmstate service will go back to previous
behaviour, the /etc/nmstate/*.yml files are moved to .applied
files, so we need to configure nmstate to keep the those files, if we
don't do so MCO complains at in place upgrades since the file system has
change.

[1] nmstate/nmstate#2546

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
@qinqon qinqon changed the title nmstate: Configure nmstate to keep service yamls NO_JIRA: nmstate, configure nmstate to keep service yamls Feb 15, 2024
@qinqon
Copy link
Contributor Author

qinqon commented Feb 15, 2024

/retest

Copy link
Contributor

@mkowalski mkowalski left a comment

Choose a reason for hiding this comment

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

Looks good. https://github.com/nmstate/nmstate/pull/2546/files#diff-ae6ab4ca7ea12f71746b70b459afebc7a9141af402bd09c239daa567c8f4bdd7R27 confirms that this is really syntax used by nmstate, so let's get it in

@mkowalski
Copy link
Contributor

/lgtm
/approve

@mkowalski
Copy link
Contributor

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@mkowalski: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

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.

@mkowalski
Copy link
Contributor

/retitle NO-JIRA: nmstate, configure nmstate to keep service yamls

@mkowalski
Copy link
Contributor

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@mkowalski: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

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 added the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2024
@openshift-ci openshift-ci bot changed the title NO_JIRA: nmstate, configure nmstate to keep service yamls NO-JIRA: nmstate, configure nmstate to keep service yamls Feb 15, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 15, 2024
@openshift-ci-robot
Copy link
Contributor

@qinqon: This pull request explicitly references no jira issue.

In response to this:

When nmstate/nmstate#2546 land to RHCOS the nmstate service will go back to previous behaviour, the /etc/nmstate/*.yml files are moved to .applied files, so we need to configure nmstate to keep the those files, if we don't do so MCO complains at in place upgrades since the file system has change.

The original in place problem is described at nmstate/nmstate#2499:

At some envs like openshift machine-config-operator moving configuration files can break in place upgrades. This change use symlinks instead of rename to mark a .yml file as applied so the original file is preserved.

And the original issue was:
https://issues.redhat.com/browse/RHEL-19680

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.

@qinqon
Copy link
Contributor Author

qinqon commented Feb 15, 2024

/cc @Ksinny can you approve this ?

@qinqon
Copy link
Contributor Author

qinqon commented Feb 15, 2024

/cc @sinnykumari can you approve this ?

@sinnykumari
Copy link
Contributor

LGTM
/approve

Copy link
Contributor

openshift-ci bot commented Feb 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mkowalski, qinqon, sinnykumari

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 Feb 15, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 53a9e00 and 2 for PR HEAD 9c347de in total

@qinqon
Copy link
Contributor Author

qinqon commented Feb 15, 2024

/retest

Copy link
Contributor

openshift-ci bot commented Feb 15, 2024

@qinqon: The following test 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/okd-scos-e2e-aws-ovn 9c347de link false /test okd-scos-e2e-aws-ovn

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 4026f55 into openshift:master Feb 15, 2024
15 of 16 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-config-operator-container-v4.16.0-202402160210.p0.g4026f55.assembly.stream.el8 for distgit ose-machine-config-operator.
All builds following this will include this PR.

@qinqon
Copy link
Contributor Author

qinqon commented Feb 16, 2024

/cherry-pick release-4.15

@openshift-cherrypick-robot

@qinqon: new pull request created: #4192

In response to this:

/cherry-pick release-4.15

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.

@qinqon qinqon changed the title NO-JIRA: nmstate, configure nmstate to keep service yamls OCPBUGS-29652: nmstate, configure nmstate to keep service yamls Feb 19, 2024
@openshift-ci-robot
Copy link
Contributor

@qinqon: Jira Issue OCPBUGS-29652 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

In response to this:

When nmstate/nmstate#2546 land to RHCOS the nmstate service will go back to previous behaviour, the /etc/nmstate/*.yml files are moved to .applied files, so we need to configure nmstate to keep the those files, if we don't do so MCO complains at in place upgrades since the file system has change.

The original in place problem is described at nmstate/nmstate#2499:

At some envs like openshift machine-config-operator moving configuration files can break in place upgrades. This change use symlinks instead of rename to mark a .yml file as applied so the original file is preserved.

And the original issue was:
https://issues.redhat.com/browse/RHEL-19680

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.

@qinqon
Copy link
Contributor Author

qinqon commented Feb 19, 2024

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@qinqon: Jira Issue OCPBUGS-29652 is in an unrecognized state (MODIFIED) and will not be moved to the MODIFIED state.

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.

@qinqon
Copy link
Contributor Author

qinqon commented Feb 19, 2024

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@qinqon: Jira Issue OCPBUGS-29652: All pull requests linked via external trackers have merged:

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

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.

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants