Merge pull request #1768 from igorcalabria/iss_1767

fabric8io · Sep 17, 2019 · 84eb247 · 84eb247
2 parents e4bec25 + 23afe5b
commit 84eb247
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ### 4.5-SNAPSHOT
 #### Bugs
+* Fix #1767: Removed fixed override for Okhttp client's `pingInterval`
+
+#### Improvements
+
+#### Dependency Upgrade
+
+#### New Feature
+
+### 4.5.2 (14-09-2019)
+#### Bugs
 * Fix #1759: Portforwarding is broken
 
 #### Improvements

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/Config.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/Config.java
@@ -126,7 +126,7 @@ public class Config {
   public static final Long DEFAULT_SCALE_TIMEOUT = 10 * 60 * 1000L;
   public static final int DEFAULT_LOGGING_INTERVAL = 20 * 1000;
   public static final Long DEFAULT_WEBSOCKET_TIMEOUT = 5 * 1000L;
-  public static final Long DEFAULT_WEBSOCKET_PING_INTERVAL = 1 * 1000L;
+  public static final Long DEFAULT_WEBSOCKET_PING_INTERVAL = 30 * 1000L;
 
   public static final Integer DEFAULT_MAX_CONCURRENT_REQUESTS = 64;
   public static final Integer DEFAULT_MAX_CONCURRENT_REQUESTS_PER_HOST = 5;

diff --git a/...lient/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java b/...lient/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java
@@ -82,7 +82,6 @@ public WatchConnectionManager(final OkHttpClient client, final BaseOperation<T,
     this.maxIntervalExponent = maxIntervalExponent;
 
     this.clonedClient = client.newBuilder()
-      .pingInterval(30, TimeUnit.SECONDS)
       .readTimeout(this.websocketTimeout, TimeUnit.MILLISECONDS)
       .build();
 

diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java
@@ -460,6 +460,13 @@ public void shouldBeUsedTokenSuppliedByProvider() throws Exception {
     assertEquals("PROVIDER_TOKEN", config.getOauthToken());
   }
 
+  @Test
+  public void shouldHonorDefaultWebsocketPingInterval() {
+    Config config = new ConfigBuilder().build();
+
+    assertEquals(30000L, config.getWebsocketPingInterval());
+  }
+
   private void assertConfig(Config config) {
     assertNotNull(config);
     assertTrue(config.isTrustCerts());