Skip to content

Commit 9186228

Browse files
committed
pkg/cvo: Log failures to merge release metadata
Make it easier to understand when the cluster-version operator does not update status.desired.channels and such [1]. [1]: https://issues.redhat.com/browse/OTA-1627
1 parent a077100 commit 9186228

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

pkg/cvo/cvo.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,24 @@ func mergeReleaseMetadata(release configv1.Release, getAvailableUpdates func() *
918918
}
919919
}
920920
}
921-
if update != nil {
921+
if update == nil {
922+
var versionMatch *configv1.Release
923+
if availableUpdates.Current.Version == merged.Version {
924+
versionMatch = &availableUpdates.Current
925+
} else {
926+
for i, u := range availableUpdates.Updates {
927+
if u.Version == merged.Version {
928+
versionMatch = &availableUpdates.Updates[i]
929+
break
930+
}
931+
}
932+
}
933+
if versionMatch == nil {
934+
klog.V(2).Infof("No available update found matching the digest of %q or the version %q", merged.Image, merged.Version)
935+
} else {
936+
klog.V(2).Infof("No available update found matching the digest of %q, although there was a match for version %q with a different tag or digest %q", merged.Image, merged.Version, versionMatch.Image)
937+
}
938+
} else {
922939
if merged.Version == "" {
923940
merged.Version = update.Version
924941
}

0 commit comments

Comments
 (0)