feat: update kube config flag (#60)

java-operator-sdk · Mar 31, 2023 · 29cc558 · 29cc558
1 parent f224d7b
commit 29cc558
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java
@@ -44,7 +44,9 @@ public void start() {
     etcdProcess.cleanEtcdData();
     var etcdPort = etcdProcess.startEtcd();
     var apiServerPort = kubeApiServerProcess.startApiServer(etcdPort);
-    kubeConfig.updateKubeConfig(apiServerPort);
+    if (config.isUpdateKubeConfig()) {
+      kubeConfig.updateKubeConfig(apiServerPort);
+    }
     kubeApiServerProcess.waitUntilDefaultNamespaceCreated();
     log.debug("API Server ready to use");
   }

diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServerConfig.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServerConfig.java
@@ -33,12 +33,15 @@ public class KubeAPIServerConfig {
    */
   private final List<String> apiServerFlags;
 
+  private final boolean updateKubeConfig;
+
   KubeAPIServerConfig(String jenvtestDir, String apiServerVersion, boolean offlineMode,
-      List<String> apiServerFlags) {
+      List<String> apiServerFlags, boolean updateKubeConfig) {
     this.jenvtestDir = jenvtestDir;
     this.apiServerVersion = apiServerVersion;
     this.offlineMode = offlineMode;
     this.apiServerFlags = apiServerFlags;
+    this.updateKubeConfig = updateKubeConfig;
   }
 
   public String getJenvtestDir() {
@@ -56,4 +59,8 @@ public boolean isOfflineMode() {
   public List<String> getApiServerFlags() {
     return apiServerFlags;
   }
+
+  public boolean isUpdateKubeConfig() {
+    return updateKubeConfig;
+  }
 }
diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServerConfigBuilder.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServerConfigBuilder.java
@@ -15,6 +15,7 @@ public final class KubeAPIServerConfigBuilder {
   private String jenvtestDir;
   private String apiServerVersion;
   private Boolean offlineMode;
+  private boolean updateKubeConfig = true;
   private final List<String> apiServerFlags = new ArrayList<>(0);
 
   public KubeAPIServerConfigBuilder() {}
@@ -61,22 +62,31 @@ public KubeAPIServerConfig build() {
         this.apiServerVersion = apiServerVersionEnvVar;
       }
     }
-    return new KubeAPIServerConfig(jenvtestDir, apiServerVersion, offlineMode, apiServerFlags);
+    return new KubeAPIServerConfig(jenvtestDir, apiServerVersion, offlineMode, apiServerFlags,
+        updateKubeConfig);
   }
 
-  public void withApiServerFlags(List<String> flags) {
+  public KubeAPIServerConfigBuilder withUpdateKubeConfig(boolean updateKubeConfig) {
+    this.updateKubeConfig = updateKubeConfig;
+    return this;
+  }
+
+  public KubeAPIServerConfigBuilder withApiServerFlags(List<String> flags) {
     apiServerFlags.addAll(flags);
+    return this;
   }
 
-  public void withApiServerFlag(String key, String value) {
+  public KubeAPIServerConfigBuilder withApiServerFlag(String key, String value) {
     checkKeyPrefix(key);
     apiServerFlags.add(key);
     apiServerFlags.add(value);
+    return this;
   }
 
-  public void withApiServerFlag(String key) {
+  public KubeAPIServerConfigBuilder withApiServerFlag(String key) {
     checkKeyPrefix(key);
     apiServerFlags.add(key);
+    return this;
   }
 
   private void checkKeyPrefix(String key) {

diff --git a/samples/src/test/java/io/javaoperatorsdk/jenvtest/KubeApiServerTest.java b/samples/src/test/java/io/javaoperatorsdk/jenvtest/KubeApiServerTest.java
@@ -39,7 +39,9 @@ void usingWildcardVersion() {
 
   @Test
   void creatingClientFromConfigString() {
-    var kubeApi = new KubeAPIServer();
+    var kubeApi = new KubeAPIServer(KubeAPIServerConfigBuilder.anAPIServerConfig()
+        .withUpdateKubeConfig(false)
+        .build());
     kubeApi.start();
 
     var client =