From cf563fcf58af63fcafe4bdac44a76c54680afd5e Mon Sep 17 00:00:00 2001
From: Evan <31562192+EvanLjp@users.noreply.github.com>
Date: Tue, 3 Nov 2020 17:54:33 +0800
Subject: [PATCH] Fixed unit of time mixing problem in kubernetes-client
 (#5777)

---
 CHANGES.md                                               | 1 +
 .../plugin/kubernetes/NamespacedPodListInformer.java     | 2 +-
 .../configmap/ConfigurationConfigmapInformer.java        | 2 +-
 .../receiver/envoy/als/k8s/K8SServiceRegistry.java       | 9 +++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d81e37e0ef..70c753d1b7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,7 @@ Release Notes.
 * Support choose files to active the meter analyzer.
 * Improve Kubernetes service registry for ALS analysis.
 * Improve the queryable tags generation. Remove the duplicated tags to reduce the storage payload.
+* Fix the excessive timeout period set by the kubernetes-client.
 
 #### UI
 
diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/NamespacedPodListInformer.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/NamespacedPodListInformer.java
index 0b4c93fe9f..de618bc90a 100644
--- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/NamespacedPodListInformer.java
+++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/NamespacedPodListInformer.java
@@ -83,7 +83,7 @@ public enum NamespacedPodListInformer {
         SharedIndexInformer<V1Pod> podSharedIndexInformer = factory.sharedIndexInformerFor(
             params -> coreV1Api.listNamespacedPodCall(
                 podConfig.getNamespace(), null, null, null, null,
-                podConfig.getLabelSelector(), Integer.MAX_VALUE, params.resourceVersion, params.timeoutSeconds,
+                podConfig.getLabelSelector(), Integer.MAX_VALUE, params.resourceVersion, 300,
                 params.watch, null
             ),
             V1Pod.class, V1PodList.class
diff --git a/oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigurationConfigmapInformer.java b/oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigurationConfigmapInformer.java
index 101fcfd02e..d11dfec978 100644
--- a/oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigurationConfigmapInformer.java
+++ b/oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigurationConfigmapInformer.java
@@ -73,7 +73,7 @@ public class ConfigurationConfigmapInformer {
         SharedIndexInformer<V1ConfigMap> configMapSharedIndexInformer = factory.sharedIndexInformerFor(
             params -> coreV1Api.listNamespacedConfigMapCall(
                 settings.getNamespace(), null, null, null, null, settings.getLabelSelector()
-                , 1, params.resourceVersion, params.timeoutSeconds, params.watch, null
+                , 1, params.resourceVersion, 300, params.watch, null
             ),
             V1ConfigMap.class, V1ConfigMapList.class
         );
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8SServiceRegistry.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8SServiceRegistry.java
index 90a1ee62e9..1f116e9829 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8SServiceRegistry.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8SServiceRegistry.java
@@ -108,7 +108,7 @@ class K8SServiceRegistry {
                 null,
                 null,
                 params.resourceVersion,
-                params.timeoutSeconds,
+                300,
                 params.watch,
                 null
             ),
@@ -142,7 +142,7 @@ class K8SServiceRegistry {
                 null,
                 null,
                 params.resourceVersion,
-                params.timeoutSeconds,
+                300,
                 params.watch,
                 null
             ),
@@ -176,7 +176,7 @@ class K8SServiceRegistry {
                 null,
                 null,
                 params.resourceVersion,
-                params.timeoutSeconds,
+                300,
                 params.watch,
                 null
             ),
@@ -288,7 +288,8 @@ class K8SServiceRegistry {
                     log.error("Failed to evaluate service name.", e);
                     serviceMetaInfo.setServiceName(requireNonNull(service.getMetadata()).getName());
                 }
-                serviceMetaInfo.setServiceInstanceName(String.format("%s.%s", podMetadata.getName(), podMetadata.getNamespace()));
+                serviceMetaInfo.setServiceInstanceName(
+                    String.format("%s.%s", podMetadata.getName(), podMetadata.getNamespace()));
                 serviceMetaInfo.setTags(transformLabelsToTags(podMetadata.getLabels()));
 
                 return serviceMetaInfo;