Skip to content

Commit

Permalink
no-op image verify for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
jottofar committed Jun 1, 2020
1 parent a3d615f commit 97530da
Showing 1 changed file with 21 additions and 18 deletions.
39 changes: 21 additions & 18 deletions pkg/cvo/updatepayload.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,26 +82,29 @@ func (r *payloadRetriever) RetrievePayload(ctx context.Context, update configv1.
}

var info PayloadInfo
/*
// verify the provided payload
var releaseDigest string
if index := strings.LastIndex(update.Image, "@"); index != -1 {
releaseDigest = update.Image[index+1:]
}
if err := r.verifier.Verify(ctx, releaseDigest); err != nil {
vErr := &payload.UpdateError{
Reason: "ImageVerificationFailed",
Message: fmt.Sprintf("The update cannot be verified: %v", err),
Nested: err,
}
if !update.Force {
return PayloadInfo{}, vErr
// verify the provided payload
var releaseDigest string
if index := strings.LastIndex(update.Image, "@"); index != -1 {
releaseDigest = update.Image[index+1:]
}
klog.Warningf("An image was retrieved from %q that failed verification: %v", update.Image, vErr)
info.VerificationError = vErr
} else {
info.Verified = true
}
if err := r.verifier.Verify(ctx, releaseDigest); err != nil {
vErr := &payload.UpdateError{
Reason: "ImageVerificationFailed",
Message: fmt.Sprintf("The update cannot be verified: %v", err),
Nested: err,
}
if !update.Force {
return PayloadInfo{}, vErr
}
klog.Warningf("An image was retrieved from %q that failed verification: %v", update.Image, vErr)
info.VerificationError = vErr
} else {
info.Verified = true
}
*/
info.Verified = true

// download the payload to the directory
var err error
Expand Down

0 comments on commit 97530da

Please sign in to comment.