From 69db97b35c7593461bbcee897f6858a467641b95 Mon Sep 17 00:00:00 2001 From: Luis Sanchez Date: Wed, 7 Jan 2026 10:59:09 -0500 Subject: [PATCH 1/2] fix: correct InsightsDataGather check in ConfigV1ClientShim --- test/extended/util/configv1shim.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/extended/util/configv1shim.go b/test/extended/util/configv1shim.go index 6cedd8c19eaf..12320f2d9425 100644 --- a/test/extended/util/configv1shim.go +++ b/test/extended/util/configv1shim.go @@ -294,8 +294,8 @@ type ConfigV1ClientShim struct { } func (c *ConfigV1ClientShim) InsightsDataGathers() configv1.InsightsDataGatherInterface { - if c.v1Kinds["APIServer"] { - panic(fmt.Errorf("APIServer not implemented")) + if c.v1Kinds["InsightsDataGather"] { + panic(fmt.Errorf("InsightsDataGather not implemented")) } return c.configv1.InsightsDataGathers() } From e0befec9a1013418ecf81f12671c8d9882fef21a Mon Sep 17 00:00:00 2001 From: Luis Sanchez Date: Mon, 19 Jan 2026 14:31:03 -0500 Subject: [PATCH 2/2] fix: configv1.Update no longer directly (e.g.: ==) comparable --- test/e2e/upgrade/monitor.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e/upgrade/monitor.go b/test/e2e/upgrade/monitor.go index 3af70abd15b1..0d002b307513 100644 --- a/test/e2e/upgrade/monitor.go +++ b/test/e2e/upgrade/monitor.go @@ -6,7 +6,6 @@ import ( "encoding/json" "fmt" "math/rand" - "reflect" "strings" "text/tabwriter" "time" @@ -39,7 +38,12 @@ func (m *versionMonitor) Check(initialGeneration int64, desired configv1.Update) m.lastCV = cv if cv.Status.ObservedGeneration > initialGeneration { - if cv.Spec.DesiredUpdate == nil || !reflect.DeepEqual(desired, *cv.Spec.DesiredUpdate) { + // configv1.Update is not directly comparable (e.g., ==), so compare + // only the fields that identify the update target. + if cv.Spec.DesiredUpdate == nil || + desired.Architecture != cv.Spec.DesiredUpdate.Architecture || + desired.Version != cv.Spec.DesiredUpdate.Version || + desired.Image != cv.Spec.DesiredUpdate.Image { return nil, "", fmt.Errorf("desired cluster version was changed by someone else: %v", cv.Spec.DesiredUpdate) } }