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

USHIFT-2224: Rename CRI-O configs to include prefix #2932

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

pmtk
Copy link
Member

@pmtk pmtk commented Jan 25, 2024

Renaming existing CRI-O configs to later introduce 12-microshift-multus.conf that will override cni_default_network

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 25, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 25, 2024

@pmtk: This pull request references USHIFT-2224 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 task to target the "4.16.0" version, but no target version was set.

In response to this:

Renaming existing CRI-O configs to later introduce 12-microshift-multus.conf that will override cni_default_network

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2024
%endif

%ifarch x86_64
install -p -m644 packaging/crio.conf.d/microshift_amd64.conf %{buildroot}%{_sysconfdir}/crio/crio.conf.d/microshift.conf
install -p -m644 packaging/crio.conf.d/10-microshift_amd64.conf %{buildroot}%{_sysconfdir}/crio/crio.conf.d/10-microshift.conf
Copy link
Contributor

@ggiguash ggiguash Jan 25, 2024

Choose a reason for hiding this comment

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

What happens if we have an existing package with crio/crio.conf.d/microshift.conf file installed and we uograde to a new one? Do we end up having both files?

Copy link
Member Author

Choose a reason for hiding this comment

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

I checked that and seems that updating is actually removing old and installing new (notice cleanup is done against older c831 version):

  Upgrading        : microshift-4.16.0_0.nightly_2024_01_31_073538_20240202100244_acd1e6272-1.el9.x86_64                                                           4/12
  Running scriptlet: microshift-4.16.0_0.nightly_2024_01_31_073538_20240202100244_acd1e6272-1.el9.x86_64                                                           4/12
  Running scriptlet: microshift-4.16.0_0.nightly_2024_01_31_073538_20240201204716_c8318134a-1.el9.x86_64                                                           9/12
  Cleanup          : microshift-4.16.0_0.nightly_2024_01_31_073538_20240201204716_c8318134a-1.el9.x86_64                                                           9/12
  Verifying        : microshift-4.16.0_0.nightly_2024_01_31_073538_20240202100244_acd1e6272-1.el9.x86_64                                                           1/12
  Verifying        : microshift-4.16.0_0.nightly_2024_01_31_073538_20240201204716_c8318134a-1.el9.x86_64                                                           2/12

Also, contents of the etc/crio/crio.conf.d are as expected:

$ ls /etc/crio/crio.conf.d/
microshift.conf  microshift-ovn.conf

# after update

$ ls /etc/crio/crio.conf.d/
10-microshift.conf  11-microshift-ovn.conf

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 27, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 2, 2024
@ggiguash
Copy link
Contributor

ggiguash commented Feb 3, 2024

/lgtm

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 3, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2024
@ggiguash
Copy link
Contributor

ggiguash commented Feb 3, 2024

/lgtm cancel
Needs rebase

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 5, 2024
@ggiguash
Copy link
Contributor

ggiguash commented Feb 5, 2024

/lgtm

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

openshift-ci bot commented Feb 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

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

/retest-required

Remaining retests: 0 against base HEAD 90d246c and 2 for PR HEAD d8ed04d in total

Copy link
Contributor

openshift-ci bot commented Feb 5, 2024

@pmtk: 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 096d0be into openshift:main Feb 5, 2024
10 checks passed
@pmtk pmtk deleted the 2224-rename-crio-configs branch May 17, 2024 05:22
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

4 participants