-
Notifications
You must be signed in to change notification settings - Fork 190
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
USHIFT-2224: Rename CRI-O configs to include prefix #2932
Conversation
@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:
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. |
f1c3097
to
2f724b7
Compare
%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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
2f724b7
to
acd1e62
Compare
/lgtm |
/lgtm cancel |
acd1e62
to
8edf5dd
Compare
8edf5dd
to
d8ed04d
Compare
/lgtm |
[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 |
@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. |
Renaming existing CRI-O configs to later introduce
12-microshift-multus.conf
that will overridecni_default_network