Merge pull request #13424 from hakman/automated-cherry-pick-of-#13378…

…-upstream-release-1.23 Automated cherry pick of #13378: Do not return a '-1' exit if no keys found and json/yaml
kubernetes · Mar 28, 2022 · d978b68 · d978b68
2 parents fd4e9c3 + 9356bc1
commit d978b68
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cmd/kops/get_sshpublickeys.go b/cmd/kops/get_sshpublickeys.go
@@ -105,12 +105,12 @@ func RunGetSSHPublicKeys(ctx context.Context, f *util.Factory, out io.Writer, op
 		items = append(items, item)
 	}
 
-	if len(items) == 0 {
-		return fmt.Errorf("no SSH public key found")
-	}
 	switch options.Output {
 
 	case OutputTable:
+		if len(items) == 0 {
+			return fmt.Errorf("no SSH public key found")
+		}
 		t := &tables.Table{}
 		t.AddColumn("ID", func(i *SSHKeyItem) string {
 			return i.ID