feat: specifyin target kube version in annotation (#32)

Author: csviri

core/src/main/java/io/javaoperatorsdk/jenvtest/junit/EnableKubeAPIServer.java

@@ -13,4 +13,11 @@
 @Retention(RUNTIME)
 public @interface EnableKubeAPIServer {
 
+  String NOT_SET = "NOT_SET";
+
+  /**
+   * The target Kube API Version. Sample: 1.26.1
+   */
+  String kubeAPIVersion() default NOT_SET;
+
 }

core/src/main/java/io/javaoperatorsdk/jenvtest/junit/KubeAPIServerExtension.java

@@ -1,21 +1,54 @@
 package io.javaoperatorsdk.jenvtest.junit;
 
+import java.lang.reflect.AnnotatedElement;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import io.javaoperatorsdk.jenvtest.JenvtestException;
 import io.javaoperatorsdk.jenvtest.KubeAPIServer;
+import io.javaoperatorsdk.jenvtest.KubeAPIServerConfigBuilder;
+
+import static io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer.NOT_SET;
 
 public class KubeAPIServerExtension implements BeforeAllCallback, AfterAllCallback {
 
+  private static final Logger log = LoggerFactory.getLogger(KubeAPIServerExtension.class);
+
   private KubeAPIServer kubeApiServer;
 
   @Override
   public void beforeAll(ExtensionContext extensionContext) throws Exception {
-    kubeApiServer = new KubeAPIServer();
+    String targetVersion = extensionContext.getElement().map(this::annotatedElementToVersion)
+        .orElse(null);
+
+    var builder = KubeAPIServerConfigBuilder.anAPIServerConfig();
+    if (targetVersion != null) {
+      log.debug("Using api version: {}", targetVersion);
+      builder.withApiServerVersion(targetVersion);
+    }
+    kubeApiServer = new KubeAPIServer(builder.build());
     kubeApiServer.start();
   }
 
+  private String annotatedElementToVersion(AnnotatedElement ae) {
+    var annotations = Arrays.stream(ae.getAnnotations())
+        .filter(a -> a.annotationType().isAssignableFrom(EnableKubeAPIServer.class))
+        .collect(Collectors.toList());
+    if (annotations.size() > 1) {
+      throw new JenvtestException(
+          "Only one instance of @EnableKubeAPIServer annotation is allowed");
+    }
+    EnableKubeAPIServer target = (EnableKubeAPIServer) annotations.get(0);
+    var version = target.kubeAPIVersion();
+    return NOT_SET.equals(version) ? null : version;
+  }
+
   @Override
   public void afterAll(ExtensionContext extensionContext) throws Exception {
     kubeApiServer.stop();

samples/src/test/java/io/javaoperatorsdk/jenvtest/JUnitExtensionTargetVersionTest.java

@@ -0,0 +1,24 @@
+package io.javaoperatorsdk.jenvtest;
+
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
+
+import static io.javaoperatorsdk.jenvtest.TestUtils.simpleTest;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@EnableKubeAPIServer(kubeAPIVersion = TestUtils.NON_LATEST_API_SERVER_VERSION)
+class JUnitExtensionTargetVersionTest {
+
+  @Test
+  void simpleTestWithTargetVersion() {
+    var client = new KubernetesClientBuilder().build();
+
+    simpleTest(client);
+
+    String kubeVersion = client.getKubernetesVersion().getGitVersion().substring(1);
+    assertThat(kubeVersion).isEqualTo(TestUtils.NON_LATEST_API_SERVER_VERSION);
+  }
+
+}

samples/src/test/java/io/javaoperatorsdk/jenvtest/JUnitExtensionTest.java

@@ -1,20 +1,16 @@
 package io.javaoperatorsdk.jenvtest;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 
+import static io.javaoperatorsdk.jenvtest.TestUtils.simpleTest;
+
 @EnableKubeAPIServer
 class JUnitExtensionTest {
 
   @Test
   void testCommunication() {
-    var client = new KubernetesClientBuilder().build();
-    client.resource(TestUtils.testConfigMap()).createOrReplace();
-    var cm = client.resource(TestUtils.testConfigMap()).get();
-
-    Assertions.assertThat(cm).isNotNull();
+    simpleTest();
   }
 }

samples/src/test/java/io/javaoperatorsdk/jenvtest/KubeApiServerTest.java

@@ -1,11 +1,9 @@
 package io.javaoperatorsdk.jenvtest;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.fabric8.kubernetes.client.KubernetesClientBuilder;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import static io.javaoperatorsdk.jenvtest.TestUtils.NON_LATEST_API_SERVER_VERSION;
+import static io.javaoperatorsdk.jenvtest.TestUtils.simpleTest;
 
 class KubeApiServerTest {
 
@@ -17,20 +15,14 @@ void trivialCase() {
   @Test
   void apiServerWithSpecificVersion() {
     testWithAPIServer(new KubeAPIServer(KubeAPIServerConfigBuilder.anAPIServerConfig()
-        .withApiServerVersion("1.26.0")
+        .withApiServerVersion(NON_LATEST_API_SERVER_VERSION)
         .build()));
   }
 
 
   void testWithAPIServer(KubeAPIServer kubeApi) {
     kubeApi.start();
-
-    var client = new KubernetesClientBuilder().build();
-    client.resource(TestUtils.testConfigMap()).create();
-    var cm = client.resource(TestUtils.testConfigMap()).get();
-
-    Assertions.assertThat(cm).isNotNull();
-
+    simpleTest();
     kubeApi.stop();
   }
 }

samples/src/test/java/io/javaoperatorsdk/jenvtest/TestUtils.java

@@ -2,12 +2,22 @@
 
 import java.util.Map;
 
+import org.assertj.core.api.Assertions;
+
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 
 public class TestUtils {
 
+  /**
+   * Used in multiple tests so no multiple additional binaries are downloaded, therefore increases
+   * duration of tests.
+   **/
+  public static final String NON_LATEST_API_SERVER_VERSION = "1.26.0";
+
   public static ConfigMap testConfigMap() {
     return new ConfigMapBuilder()
         .withMetadata(new ObjectMetaBuilder()
@@ -18,4 +28,16 @@ public static ConfigMap testConfigMap() {
         .build();
   }
 
+  public static void simpleTest() {
+    simpleTest(new KubernetesClientBuilder().build());
+  }
+
+  public static void simpleTest(KubernetesClient client) {
+
+    client.resource(TestUtils.testConfigMap()).create();
+    var cm = client.resource(TestUtils.testConfigMap()).get();
+
+    Assertions.assertThat(cm).isNotNull();
+  }
+
 }