From 52c69e2eb2a82036c61f813122f9570ed7df4d51 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 12 Sep 2023 14:51:35 +0200 Subject: [PATCH 1/3] coreos-init: Exclude mana VF from network management The flatcar/init commits includes a change to the azure sriov config file that excludes devices managed by the mana driver from networkd management, just like mlx4 and mlx5 devices. Signed-off-by: Jeremi Piotrowski --- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index d64229d6076..3717cd882a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="2815942c231c6556356eea59a8c15d9685338a06" # flatcar-master + CROS_WORKON_COMMIT="53b0aa5d291d26f3a14c6f392ff20fdd5003a0f2" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From c9e99b37a87264ffab870e81f360cd8297bb8395 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 12 Sep 2023 14:59:33 +0200 Subject: [PATCH 2/3] changelog: Add entry for mana vf support Signed-off-by: Jeremi Piotrowski --- changelog/changes/2023-09-12-azure-mana-vf.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2023-09-12-azure-mana-vf.md diff --git a/changelog/changes/2023-09-12-azure-mana-vf.md b/changelog/changes/2023-09-12-azure-mana-vf.md new file mode 100644 index 00000000000..9a3ec7aa1d8 --- /dev/null +++ b/changelog/changes/2023-09-12-azure-mana-vf.md @@ -0,0 +1 @@ +- Add support for Microsoft Azure Network Adapter (MANA) NICs on Azure ([scripts#1131](https://github.com/flatcar/scripts/pull/1131)) From eb5db9b58d9cb297bd3651c8f923f452547e7b1b Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 15 Sep 2023 11:28:57 +0200 Subject: [PATCH 3/3] bootengine: Exclude mana VF from network management The flatcar/bootengine commit includes a change to the azure sriov config file that excludes devices managed by the mana driver from networkd management, just like mlx4 and mlx5 devices. Signed-off-by: Jeremi Piotrowski --- ...ootengine-0.0.38-r18.ebuild => bootengine-0.0.38-r19.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r18.ebuild => bootengine-0.0.38-r19.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r18.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r19.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r18.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r19.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 37eb3dcbd30..0a65632d7f3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="1066c7f5155f9846da3f83473be9c8768524b52c" # flatcar-master + CROS_WORKON_COMMIT="487ae88d11f034da5d81ea8517f637ac416735cf" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi