From e2bed6504e55e45bebb84aece3c29a76c493b5ab Mon Sep 17 00:00:00 2001 From: Min Kim <291271447@qq.com> Date: Wed, 19 May 2021 21:59:06 +0800 Subject: [PATCH] Bump k8s java-client to 11.0.2 (#792) * bump k8s client to 11.0.2 * simplifying the informer-factory bean registration --- ...netesDiscoveryClientAutoConfiguration.java | 10 +-- ...ringCloudKubernetesInformerConfigurer.java | 61 ------------------- ...oudKubernetesInformerFactoryProcessor.java | 2 +- spring-cloud-kubernetes-dependencies/pom.xml | 2 +- 4 files changed, 8 insertions(+), 67 deletions(-) delete mode 100644 spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerConfigurer.java diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfiguration.java index 69cc9841..d48d3293 100644 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfiguration.java @@ -24,7 +24,6 @@ import io.kubernetes.client.openapi.models.V1Endpoints; import io.kubernetes.client.openapi.models.V1EndpointsList; import io.kubernetes.client.openapi.models.V1Service; import io.kubernetes.client.openapi.models.V1ServiceList; -import io.kubernetes.client.spring.extended.controller.KubernetesInformerConfigurer; import io.kubernetes.client.spring.extended.controller.annotation.GroupVersionResource; import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformer; import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformers; @@ -80,12 +79,15 @@ public class KubernetesDiscoveryClientAutoConfiguration { @Bean @ConditionalOnMissingBean - public KubernetesInformerConfigurer discoveryInformerConfigurer( + public SpringCloudKubernetesInformerFactoryProcessor discoveryInformerConfigurer( KubernetesNamespaceProvider kubernetesNamespaceProvider, KubernetesDiscoveryProperties kubernetesDiscoveryProperties, ApiClient apiClient, CatalogSharedInformerFactory sharedInformerFactory) { - return new SpringCloudKubernetesInformerConfigurer(kubernetesNamespaceProvider, - kubernetesDiscoveryProperties, apiClient, sharedInformerFactory); + return new SpringCloudKubernetesInformerFactoryProcessor( + kubernetesDiscoveryProperties, + kubernetesNamespaceProvider, + apiClient, + sharedInformerFactory); } @Bean diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerConfigurer.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerConfigurer.java deleted file mode 100644 index fabc2ab1..00000000 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerConfigurer.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2013-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.kubernetes.client.discovery; - -import io.kubernetes.client.informer.SharedInformerFactory; -import io.kubernetes.client.openapi.ApiClient; -import io.kubernetes.client.spring.extended.controller.KubernetesInformerConfigurer; -import io.kubernetes.client.spring.extended.controller.KubernetesInformerFactoryProcessor; - -import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; -import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; - -/** - * @author Ryan Baxter - */ -class SpringCloudKubernetesInformerConfigurer extends KubernetesInformerConfigurer { - - private final ApiClient apiClient; - - private final SharedInformerFactory sharedInformerFactory; - - private final KubernetesNamespaceProvider kubernetesNamespaceProvider; - - private final KubernetesDiscoveryProperties kubernetesDiscoveryProperties; - - SpringCloudKubernetesInformerConfigurer(KubernetesNamespaceProvider kubernetesNamespaceProvider, - KubernetesDiscoveryProperties kubernetesDiscoveryProperties, ApiClient apiClient, - SharedInformerFactory sharedInformerFactory) { - super(apiClient, sharedInformerFactory); - this.apiClient = apiClient; - this.sharedInformerFactory = sharedInformerFactory; - this.kubernetesNamespaceProvider = kubernetesNamespaceProvider; - this.kubernetesDiscoveryProperties = kubernetesDiscoveryProperties; - } - - @Override - public KubernetesInformerFactoryProcessor getObject() throws Exception { - return new SpringCloudKubernetesInformerFactoryProcessor(kubernetesDiscoveryProperties, - kubernetesNamespaceProvider, apiClient, sharedInformerFactory); - } - - @Override - public Class getObjectType() { - return KubernetesInformerFactoryProcessor.class; - } - -} diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerFactoryProcessor.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerFactoryProcessor.java index 8737946a..c3a5ecf3 100644 --- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerFactoryProcessor.java +++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerFactoryProcessor.java @@ -62,7 +62,7 @@ class SpringCloudKubernetesInformerFactoryProcessor extends KubernetesInformerFa SpringCloudKubernetesInformerFactoryProcessor(KubernetesDiscoveryProperties kubernetesDiscoveryProperties, KubernetesNamespaceProvider kubernetesNamespaceProvider, ApiClient apiClient, SharedInformerFactory sharedInformerFactory) { - super(apiClient, sharedInformerFactory); + super(); this.apiClient = apiClient; this.sharedInformerFactory = sharedInformerFactory; this.kubernetesNamespaceProvider = kubernetesNamespaceProvider; diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index 4619af7e..167c6fc2 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -36,7 +36,7 @@ 1.15.2 0.13.0 4.13.2 - 11.0.1 + 11.0.2 1.5.5 0.1.2 3.14.4