diff --git a/pkg/cmd/admin/image/verify-signature.go b/pkg/cmd/admin/image/verify-signature.go index f742a10f3184..ef074c04a935 100644 --- a/pkg/cmd/admin/image/verify-signature.go +++ b/pkg/cmd/admin/image/verify-signature.go @@ -79,7 +79,7 @@ func (o *VerifyImageSignatureOptions) Complete(f *clientcmd.Factory, cmd *cobra. // .gnupg/pubring.gpg will be ignored. if len(o.PublicKeyFilename) > 0 { if o.Remove { - return kcmdutil.UsageError(cmd, "cannot use public key when removing verifications status") + return kcmdutil.UsageError(cmd, "cannot use public key when removing verification status") } if o.PublicKey, err = ioutil.ReadFile(o.PublicKeyFilename); err != nil { return err @@ -174,10 +174,10 @@ func (o *VerifyImageSignatureOptions) verifyImageIdentity(reference, digest stri return nil } -// removeImageSignature removes the current image signature from the Image object by +// clearSignatureVerificationStatus removes the current image signature from the Image object by // erasing all signature fields that were previously set (when image signature was // previously verified). -func (o *VerifyImageSignatureOptions) removeImageSignature(s *imageapi.ImageSignature) { +func (o *VerifyImageSignatureOptions) clearSignatureVerificationStatus(s *imageapi.ImageSignature) { s.Conditions = []imageapi.SignatureCondition{} s.IssuedBy = nil } @@ -196,7 +196,7 @@ func (o *VerifyImageSignatureOptions) Run() error { // signatures. // TODO: This should probably need to handle removal of a single signature. if o.Remove { - o.removeImageSignature(&img.Signatures[i]) + o.clearSignatureVerificationStatus(&img.Signatures[i]) continue } @@ -220,7 +220,7 @@ func (o *VerifyImageSignatureOptions) Run() error { // If we have error and --confirm then remove the signature from the image which // changes the image to "unverified" state. if signatureErr != nil || signatureContentErr != nil || identityError != nil { - o.removeImageSignature(&img.Signatures[i]) + o.clearSignatureVerificationStatus(&img.Signatures[i]) continue }