Skip to content

Commit c57af7d

Browse files
Merge pull request #3602 from pacevedom/USHIFT-3736
USHIFT-3736: Force NM configuration to allow ipv6
2 parents 7585166 + 883e66a commit c57af7d

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# ignore known MicroShift-managed devices
2+
[device]
3+
match-device=interface-name:ovn-k8s-*;driver:veth
4+
managed=0

packaging/rpm/microshift.spec

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@ install -p -m644 packaging/crio.conf.d/10-microshift_amd64.conf %{buildroot}%{_s
242242

243243
install -p -m644 packaging/crio.conf.d/11-microshift-ovn.conf %{buildroot}%{_sysconfdir}/crio/crio.conf.d/11-microshift-ovn.conf
244244

245+
install -d -m755 %{buildroot}%{_sysconfdir}/NetworkManager/conf.d
246+
install -p -m644 packaging/NetworkManager.conf.d/10-microshift-ignore-devices.conf %{buildroot}%{_sysconfdir}/NetworkManager/conf.d/10-microshift-ignore-devices.conf
247+
245248
install -d -m755 %{buildroot}/%{_unitdir}
246249
install -p -m644 packaging/systemd/microshift.service %{buildroot}%{_unitdir}/microshift.service
247250

@@ -436,6 +439,7 @@ fi
436439

437440

438441
%files networking
442+
%{_sysconfdir}/NetworkManager/conf.d/10-microshift-ignore-devices.conf
439443
%{_sysconfdir}/crio/crio.conf.d/11-microshift-ovn.conf
440444
%{_sysconfdir}/systemd/system/ovs-vswitchd.service.d/microshift-cpuaffinity.conf
441445
%{_sysconfdir}/systemd/system/ovsdb-server.service.d/microshift-cpuaffinity.conf
@@ -474,6 +478,9 @@ fi
474478
# Use Git command to generate the log and replace the VERSION string
475479
# LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec
476480
%changelog
481+
* Mon Jul 08 2024 Pablo Acevedo Montserrat <[email protected]> 4.17.0
482+
- Add NM configuration file
483+
477484
* Wed Jun 19 2024 Patryk Matuszak <[email protected]> 4.17.0
478485
- Fix CRI-O version to match Kubernetes version
479486

0 commit comments

Comments
 (0)