From 8b1fbbb25e25552beedba61040db97043fa9ab7c Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 4 Oct 2023 11:23:05 +0200 Subject: [PATCH 1/3] coreos-init: Disable RoutesToDNS setting Pull in this PR https://github.com/flatcar/init/pull/109/ to disable a systemd-networkd setting causing unexpected routes to appear. Signed-off-by: Jeremi Piotrowski --- ...eos-init-0.0.1-r181.ebuild => coreos-init-0.0.1-r182.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r181.ebuild => coreos-init-0.0.1-r182.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r181.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r182.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r181.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r182.ebuild 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 2a39fb928d..60287acfeb 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="5b0c6050c8f3e0daf940ca7000d5924a8f73052d" # flatcar-3602-backport + CROS_WORKON_COMMIT="325e7ede6dc51e6ed7ef1f39876b48e0736c0989" # flatcar-3602-backport KEYWORDS="amd64 arm arm64 x86" fi From 22cab0fb37d281a7214b52dc0aefa4494bbe8ea8 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 4 Oct 2023 11:25:04 +0200 Subject: [PATCH 2/3] bootengine: Disable RoutesToDNS Pull in this PR https://github.com/flatcar/bootengine/pull/74 to disable a systemd-networkd setting causing unexpected routes to appear. Signed-off-by: Jeremi Piotrowski --- ...ootengine-0.0.38-r14.ebuild => bootengine-0.0.38-r15.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-r14.ebuild => bootengine-0.0.38-r15.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r14.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r15.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r14.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r15.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 4ad532e892..71559a685c 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="3c28749ae0289365047b1f9520d1789646196df1" # flatcar-3602-backport + CROS_WORKON_COMMIT="5db3a7eaf06e0d01937689b8bac619db8634b5a4" # flatcar-3602-backport KEYWORDS="amd64 arm arm64 x86" fi From cc48fce1056f35dc65ea41d1b3d5fc6ce4881ccc Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 4 Oct 2023 11:31:06 +0200 Subject: [PATCH 3/3] changelog: Add entry for RoutesToDNS default setting change Signed-off-by: Jeremi Piotrowski --- changelog/bugfixes/2023-10-04-azure-multinic.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/bugfixes/2023-10-04-azure-multinic.md diff --git a/changelog/bugfixes/2023-10-04-azure-multinic.md b/changelog/bugfixes/2023-10-04-azure-multinic.md new file mode 100644 index 0000000000..bf051071a5 --- /dev/null +++ b/changelog/bugfixes/2023-10-04-azure-multinic.md @@ -0,0 +1 @@ +- Disabled systemd-networkd's RoutesToDNS setting by default to fix provisioning failures observed in VMs with multiple network interfaces on Azure ([scripts#1206](https://github.com/flatcar/scripts/pull/1206))