Commit 5841367
authored
Mount nmcli to avoid the version conflicts between host and OVS container (#295)
We are planning to upgrade the NCP base images from UBI 8 to UBI 9.
In UBI 9, the NetworkManager version is newer than the host, that will
cause the issue that the nmcli cannot work in the OVS container.
So this patch will mount the host's nmcli to overwrite the existing one
in the OVS container. In the future, we can try to not install
NetworkManager in the container.
Testing done:
CIBot passed for UBI 9. (testrunid=4077352)
(cherry picked from commit 224eab0)1 parent f2e8b94 commit 5841367
File tree
2 files changed
+20
-0
lines changed- manifest
- kubernetes/rhel
- openshift4/coreos
2 files changed
+20
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1218 | 1218 | | |
1219 | 1219 | | |
1220 | 1220 | | |
| 1221 | + | |
| 1222 | + | |
| 1223 | + | |
| 1224 | + | |
1221 | 1225 | | |
1222 | 1226 | | |
1223 | 1227 | | |
| |||
1287 | 1291 | | |
1288 | 1292 | | |
1289 | 1293 | | |
| 1294 | + | |
| 1295 | + | |
| 1296 | + | |
| 1297 | + | |
| 1298 | + | |
| 1299 | + | |
1290 | 1300 | | |
1291 | 1301 | | |
1292 | 1302 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1153 | 1153 | | |
1154 | 1154 | | |
1155 | 1155 | | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
1156 | 1160 | | |
1157 | 1161 | | |
1158 | 1162 | | |
| |||
1227 | 1231 | | |
1228 | 1232 | | |
1229 | 1233 | | |
| 1234 | + | |
| 1235 | + | |
| 1236 | + | |
| 1237 | + | |
| 1238 | + | |
| 1239 | + | |
1230 | 1240 | | |
1231 | 1241 | | |
1232 | 1242 | | |
| |||
0 commit comments