Merge pull request #1396 from yue9944882/csr

Feat: CSR support and e2e test

Author: k8s-ci-robot

e2e/src/test/groovy/io/kubernetes/client/e2e/csr/CSRTest.groovy

@@ -0,0 +1,54 @@
+package io.kubernetes.client.e2e.csr
+
+import io.kubernetes.client.openapi.ApiClient
+import io.kubernetes.client.openapi.models.V1CertificateSigningRequest
+import io.kubernetes.client.util.CSRUtils
+import io.kubernetes.client.util.ClientBuilder
+import io.kubernetes.client.util.version.Version
+import spock.lang.Specification
+import spock.util.concurrent.PollingConditions
+
+import java.security.KeyPairGenerator
+import java.security.SecureRandom
+
+class CSRTest extends Specification {
+    def "Build client instance via CSR should work"() {
+        // initialize test environment
+        given:
+        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA")
+        keyGen.initialize(2048, new SecureRandom())
+        ApiClient bootstrapApiClient = ClientBuilder.defaultClient()
+
+        // generating key-pair
+        when:
+        def keyPair = keyGen.generateKeyPair()
+        then:
+        keyPair != null
+
+        // sign new CSR
+        when:
+        def csrBytes = CSRUtils.sign(keyPair, "foo")
+        then:
+        csrBytes != null
+
+        // creates CSR object against cluster
+        when:
+        def newCsr = CSRUtils.newV1CertificateSigningRequest("foo", csrBytes)
+        def created = CSRUtils.createIfAbsent(bootstrapApiClient, newCsr)
+        then:
+        created
+
+        // reload certificates from CSR
+        when:
+        CSRUtils.approve(bootstrapApiClient, "foo")
+        def signedApiClient = ClientBuilder.fromCertificateSigningRequest(bootstrapApiClient, keyPair.getPrivate(), newCsr)
+        then:
+        signedApiClient != null
+
+        // use the new client to get "/version"
+        when:
+        def v = new Version(signedApiClient).getVersion()
+        then:
+        v != null
+    }
+}

extended/src/main/java/io/kubernetes/client/extended/wait/Wait.java

@@ -12,64 +12,5 @@
 */
 package io.kubernetes.client.extended.wait;
 
-import java.time.Duration;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
-
-public class Wait {
-
-  /**
-   * Poll tries a condition func until it returns true, an exception, or the timeout is reached.
-   *
-   * @param interval the check interval
-   * @param timeout the timeout period
-   * @param condition the condition func
-   */
-  public static boolean poll(Duration interval, Duration timeout, Supplier<Boolean> condition) {
-    return poll(interval, interval, timeout, condition);
-  }
-
-  /**
-   * Poll tries a condition func until w/ the initial delay specified.
-   *
-   * @param initialDelay the initial delay
-   * @param interval the check interval
-   * @param timeout the timeout period
-   * @param condition the condition
-   * @return returns true if gracefully finished
-   */
-  public static boolean poll(
-      Duration initialDelay, Duration interval, Duration timeout, Supplier<Boolean> condition) {
-    ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
-    AtomicBoolean result = new AtomicBoolean(false);
-    long dueDate = System.currentTimeMillis() + timeout.toMillis();
-    ScheduledFuture<?> future =
-        executorService.scheduleAtFixedRate(
-            () -> {
-              try {
-                result.set(condition.get());
-              } catch (Exception e) {
-                result.set(false);
-              }
-            },
-            initialDelay.toMillis(),
-            interval.toMillis(),
-            TimeUnit.MILLISECONDS);
-    try {
-      while (System.currentTimeMillis() < dueDate) {
-        if (result.get()) {
-          future.cancel(true);
-          return true;
-        }
-      }
-    } catch (Exception e) {
-      return result.get();
-    }
-    future.cancel(true);
-    return result.get();
-  }
-}
+@Deprecated
+public class Wait extends io.kubernetes.client.util.wait.Wait {}