Merge pull request #1139 from yue9944882/kubectl-exec-followup

Kubectl exec follow-up & refactors

Author: k8s-ci-robot

examples/src/main/java/io/kubernetes/client/examples/KubectlExample.java

@@ -110,11 +110,14 @@ public static void main(String[] args)
         System.exit(0);
       case "exec":
         name = args[1];
-        String[] command = Arrays.copyOfRange(args, 1, args.length);
+        String[] command = Arrays.copyOfRange(args, 2, args.length);
         KubectlExec e =
-            exec(client).namespace(ns).name(name).container(cli.getOptionValue("c", ""));
-        e.execute();
-        System.exit(e.exitCode());
+            exec(client)
+                .namespace(ns)
+                .name(name)
+                .command(command)
+                .container(cli.getOptionValue("c", ""));
+        System.exit(e.execute());
       default:
         System.out.println("Unknown verb: " + verb);
         System.exit(-1);

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlAnnotate.java

@@ -24,7 +24,7 @@
 import org.apache.commons.lang.StringUtils;
 
 public class KubectlAnnotate<ApiType extends KubernetesObject>
-    extends Kubectl.ResourceBuilder<KubectlAnnotate<ApiType>>
+    extends Kubectl.ResourceBuilder<ApiType, KubectlAnnotate<ApiType>>
     implements Kubectl.Executable<ApiType> {
 
   private final ApiClient apiClient;

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlExec.java

@@ -24,11 +24,10 @@
 import java.io.OutputStream;
 
 public class KubectlExec extends Kubectl.ResourceAndContainerBuilder<V1Pod, KubectlExec>
-    implements Kubectl.Executable<V1Pod> {
+    implements Kubectl.Executable<Integer> {
   private String[] command;
   private boolean stdin;
   private boolean tty;
-  private int result;
 
   KubectlExec(ApiClient client) {
     super(client, V1Pod.class);
@@ -49,12 +48,8 @@ public KubectlExec tty(boolean tty) {
     return this;
   }
 
-  public int exitCode() {
-    return result;
-  }
-
   @Override
-  public V1Pod execute() throws KubectlException {
+  public Integer execute() throws KubectlException {
     V1Pod pod = new V1Pod().metadata(new V1ObjectMeta().name(name).namespace(namespace));
 
     Exec exec = new Exec(apiClient);
@@ -65,11 +60,10 @@ public V1Pod execute() throws KubectlException {
       if (stdin) {
         copyAsync(System.in, proc.getOutputStream());
       }
-      this.result = proc.waitFor();
+      return proc.waitFor();
     } catch (InterruptedException | ApiException | IOException ex) {
       throw new KubectlException(ex);
     }
-    return pod;
   }
 
   private static void copyAsync(InputStream in, OutputStream out) {