From 8667d7f3fc23e2688e0b8bc36eb6a0d0711a18f7 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Thu, 9 Dec 2021 12:51:57 +0100 Subject: [PATCH] coreos-base/coreos-init: prevent networkd interference with cbr0 iface This pulls in https://github.com/flatcar-linux/init/pull/55 to set the cbr0 interface to be excluded from networkd (unmanaged) because it is set up manually by kubenet and not through DHCP. --- .../changelog/bugfixes/2021-12-09-set-kubenet-cbr0-unmanaged.md | 1 + .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2021-12-09-set-kubenet-cbr0-unmanaged.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2021-12-09-set-kubenet-cbr0-unmanaged.md b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2021-12-09-set-kubenet-cbr0-unmanaged.md new file mode 100644 index 0000000000..95759ff32a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2021-12-09-set-kubenet-cbr0-unmanaged.md @@ -0,0 +1 @@ +- Excluded the Kubenet cbr0 interface from networkd's DHCP config and set it to Unmanaged to prevent interference and ensure that it is not part of the network online check ([PR#55](https://github.com/flatcar-linux/init/pull/55)) 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 de1299b28c..c5926fb667 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="80b3b3cd021b4120cd9218b33b1f92936abe00bb" # flatcar-master + CROS_WORKON_COMMIT="bf688adbf34cc16b613608a2ee3c4a7f30a54395" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi