From febf6226e5af5c6a0a1d39aa814c060eb9acdcf5 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-r188.ebuild => coreos-init-0.0.1-r189.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-r188.ebuild => coreos-init-0.0.1-r189.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r188.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r189.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r188.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r189.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 385cd711a7..4893550770 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="c01a33756a8fd9c672283d5a4ca56807dec4b9ff" # flatcar-master + CROS_WORKON_COMMIT="58b5c3ca766b31ab3f5c88492941c74c575d99c2" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From a383ce5b5fb22732010d98dbd74d345238d60786 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-r21.ebuild => bootengine-0.0.38-r22.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-r21.ebuild => bootengine-0.0.38-r22.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r21.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r22.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r21.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r22.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 fa2d604d2f..e91cefd9ff 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="9eaeae2fbbdef1d6364a95192bf8e5b35dca8ed1" # flatcar-master + CROS_WORKON_COMMIT="49aa12ae92a40918dbdf40769b2bff2b12942133" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From ab3a160f55764ab5abc27fcf4729124ceee8aa19 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))