Skip to content

Commit a6cf93c

Browse files
committed
refactor: check release metadata arch earlier
Address Hongkai's review point from openshift#1185 (comment)
1 parent ca30fcb commit a6cf93c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

pkg/payload/payload.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,19 +308,20 @@ func loadPayloadMetadata(releaseDir, releaseImage string) (*Update, error) {
308308
if err != nil {
309309
return nil, err
310310
}
311-
release.Image = releaseImage
312-
313-
imageRef, err := loadImageReferences(releaseDir)
314-
if err != nil {
315-
return nil, err
316-
}
317311

318312
arch := string(release.Architecture)
319313
if arch == "" {
320314
arch = runtime.GOARCH
321315
klog.V(2).Infof("Architecture from %s (%s) retrieved from runtime: %q", cincinnatiJSONFile, release.Version, arch)
322316
}
323317

318+
release.Image = releaseImage
319+
320+
imageRef, err := loadImageReferences(releaseDir)
321+
if err != nil {
322+
return nil, err
323+
}
324+
324325
if imageRef.Name != release.Version {
325326
return nil, fmt.Errorf("Version from %s (%s) differs from %s (%s)", imageReferencesFile, imageRef.Name, cincinnatiJSONFile, release.Version)
326327
}

0 commit comments

Comments
 (0)