Skip to content

Commit 4b14bd5

Browse files
committed
fix: release_isc reset, archive refactored
Signed-off-by: Paul Bastide <[email protected]>
1 parent 6756e1d commit 4b14bd5

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

internal/e2e/templates/isc_templates/release_isc.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ kind: ImageSetConfiguration
33
apiVersion: mirror.openshift.io/v2alpha1
44
mirror:
55
platform:
6-
architectures:
7-
- "multi"
8-
- "ppc64le"
9-
- "amd64"
106
channels:
117
- name: {{.}}
128
graph: true

internal/pkg/archive/archive.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,15 @@ func (o *MirrorArchive) addImagesDiff(ctx context.Context, collectedImages []v2a
144144
return nil, fmt.Errorf("unable to find blobs corresponding to %s: %w", img.Destination, err)
145145
}
146146

147-
if err := handleSignatureErrors(img, err); err != nil {
147+
// Handle signature errors - only return error if it's a fatal signature error
148+
if sigHandleErr := handleSignatureErrors(img, err); sigHandleErr != nil {
148149
var archiveErr *ArchiveError
149-
if errors.As(err, &archiveErr) && archiveErr.ReleaseErr != nil {
150+
if errors.As(sigHandleErr, &archiveErr) && archiveErr.ReleaseErr != nil {
151+
// For release images, signature errors should not be fatal
152+
// Log the error but continue processing
153+
o.logger.Warn("signature error for release image %s: %v", img.Destination, archiveErr.ReleaseErr)
154+
} else if errors.As(sigHandleErr, &archiveErr) {
155+
// For other image types, return the error
150156
return nil, archiveErr
151157
}
152158
}

0 commit comments

Comments
 (0)