From 3d2fba3c40bc9d8d4afbe9dc553ecd9f8875bbef Mon Sep 17 00:00:00 2001 From: buzuotaxuan Date: Sat, 20 Feb 2021 22:09:10 +0800 Subject: [PATCH] Fix kubernetes.client.opeanapi.ApiException (#6412) --- CHANGES.md | 1 + .../cluster/plugin/kubernetes/NamespacedPodListInformer.java | 2 ++ .../configuration/configmap/ConfigurationConfigmapInformer.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 3f350ed4c..5972344f2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -23,6 +23,7 @@ Release Notes. * Update the Apdex metric combine calculator. * Enhance `MeterSystem` to allow creating metrics with same `metricName` / `function` / `scope`. * Storage plugin supports postgresql. +* Fix kubernetes.client.opeanapi.ApiException. #### UI * Update selector scroller to show in all pages. 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 de618bc90..9f90291a9 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 @@ -22,6 +22,7 @@ import io.kubernetes.client.informer.SharedIndexInformer; import io.kubernetes.client.informer.SharedInformerFactory; import io.kubernetes.client.informer.cache.Lister; import io.kubernetes.client.openapi.ApiClient; +import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.models.V1Pod; import io.kubernetes.client.openapi.models.V1PodList; @@ -77,6 +78,7 @@ public enum NamespacedPodListInformer { ApiClient apiClient = Config.defaultClient(); apiClient.setHttpClient(apiClient.getHttpClient().newBuilder().readTimeout(0, TimeUnit.SECONDS).build()); + Configuration.setDefaultApiClient(apiClient); CoreV1Api coreV1Api = new CoreV1Api(apiClient); factory = new SharedInformerFactory(executorService); 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 d11dfec97..f140438d5 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 @@ -22,6 +22,7 @@ import io.kubernetes.client.informer.SharedIndexInformer; import io.kubernetes.client.informer.SharedInformerFactory; import io.kubernetes.client.informer.cache.Lister; import io.kubernetes.client.openapi.ApiClient; +import io.kubernetes.client.openapi.Configuration; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.models.V1ConfigMap; import io.kubernetes.client.openapi.models.V1ConfigMapList; @@ -67,6 +68,7 @@ public class ConfigurationConfigmapInformer { private void doStartConfigMapInformer(final ConfigmapConfigurationSettings settings) throws IOException { ApiClient apiClient = Config.defaultClient(); apiClient.setHttpClient(apiClient.getHttpClient().newBuilder().readTimeout(0, TimeUnit.SECONDS).build()); + Configuration.setDefaultApiClient(apiClient); CoreV1Api coreV1Api = new CoreV1Api(apiClient); factory = new SharedInformerFactory(executorService);