Merge pull request #14043 from hakman/automated-cherry-pick-of-#14041…

…-upstream-release-1.23 Automated cherry pick of #14041: Check keyset existence before attempting to distrust
kubernetes · Jul 28, 2022 · 7a185f9 · 7a185f9
2 parents 9c5eea6 + bc213ad
commit 7a185f9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cmd/kops/distrust_keypair.go b/cmd/kops/distrust_keypair.go
@@ -148,6 +148,8 @@ func distrustKeypair(out io.Writer, name string, keypairIDs []string, keyStore f
 	keyset, err := keyStore.FindKeyset(name)
 	if err != nil {
 		return err
+	} else if keyset == nil {
+		return fmt.Errorf("keyset not found")
 	}
 
 	if len(keypairIDs) == 0 {