Revert "Suppress socket read timeout for watches"

This reverts commit 2e2c9f8.

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/builders/WatchBuilder.java

@@ -91,7 +91,8 @@ private class ListNamespacedServiceCall implements BiFunction<ApiClient, CallPar
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      setReadTimeout(client);
+      // Ensure that client doesn't time out before call or watch
+      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
 
       try {
         return new CoreV1Api(client)
@@ -135,7 +136,8 @@ private class ListPodCall implements BiFunction<ApiClient, CallParams, Call> {
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      setReadTimeout(client);
+      // Ensure that client doesn't time out before call or watch
+      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
 
       try {
         return new CoreV1Api(client)
@@ -179,7 +181,8 @@ private class ListJobCall implements BiFunction<ApiClient, CallParams, Call> {
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      setReadTimeout(client);
+      // Ensure that client doesn't time out before call or watch
+      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
 
       try {
         return new BatchV1Api(client)
@@ -223,7 +226,8 @@ private class ListEventCall implements BiFunction<ApiClient, CallParams, Call> {
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      setReadTimeout(client);
+      // Ensure that client doesn't time out before call or watch
+      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
 
       try {
         return new CoreV1Api(client)
@@ -258,11 +262,6 @@ public WatchI<Domain> createDomainWatch(String namespace) throws ApiException {
         ClientPool.getInstance(), callParams, Domain.class, new ListDomainsCall(namespace));
   }
 
-  private static void setReadTimeout(ApiClient client) {
-    // Ensure that client doesn't time out before call or watch
-    client.getHttpClient().setReadTimeout(0, TimeUnit.SECONDS);
-  }
-
   private class ListDomainsCall implements BiFunction<ApiClient, CallParams, Call> {
     private String namespace;
 
@@ -272,7 +271,8 @@ private class ListDomainsCall implements BiFunction<ApiClient, CallParams, Call>
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      setReadTimeout(client);
+      // Ensure that client doesn't time out before call or watch
+      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
 
       try {
         return new WeblogicApi(client)
@@ -319,7 +319,8 @@ private class ListNamespacedConfigMapCall implements BiFunction<ApiClient, CallP
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      setReadTimeout(client);
+      // Ensure that client doesn't time out before call or watch
+      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
 
       try {
         return new CoreV1Api(client)

operator/src/main/java/oracle/kubernetes/operator/calls/AsyncRequestStep.java

@@ -110,7 +110,6 @@ public NextAction apply(Packet packet) {
 
     AtomicBoolean didResume = new AtomicBoolean(false);
     ApiClient client = helper.take();
-    client.getHttpClient().setReadTimeout(timeoutSeconds, TimeUnit.SECONDS);
     return doSuspend(
         (fiber) -> {
           ApiCallback<T> callback =