From 8c3a513452a82b0ece0a3bac7212a3f7a38f94e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Tue, 19 Sep 2023 12:18:17 +0200 Subject: [PATCH] Kuryr: Fix deriving MTU from previous config PR #1988 introduced a bug causing upgrades to fail, because even when Kuryr MTU was detected from the previous version of the KuryrConfig, CNO would override it to 0. This commit fixes that. --- pkg/network/kuryr.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/network/kuryr.go b/pkg/network/kuryr.go index 7ca95fcdac..6184679bad 100644 --- a/pkg/network/kuryr.go +++ b/pkg/network/kuryr.go @@ -262,9 +262,10 @@ func fillKuryrDefaults(conf, previous *operv1.NetworkSpec) { previous.DefaultNetwork.KuryrConfig.MTU != nil { mtu := *previous.DefaultNetwork.KuryrConfig.MTU kc.MTU = &mtu + } else { + // if it wasn't set, let's make sure we set something + var mtu uint32 = 0 + kc.MTU = &mtu } - // if it wasn't set, let's make sure we set something - var mtu uint32 = 0 - kc.MTU = &mtu } }