SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump k8s java-client to 11.0.2 (#792)

Browse Source 
* bump k8s client to 11.0.2

* simplifying the informer-factory bean registration
This commit is contained in:
Min Kim
2021-05-19 21:59:06 +08:00
committed by GitHub
parent 6214383996
commit e2bed6504e
4 changed files with 8 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfiguration.java
View File

@@ -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

61
spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerConfigurer.java
View File

@@ -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;
}
}

2
spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/SpringCloudKubernetesInformerFactoryProcessor.java
View File

@@ -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;

2
spring-cloud-kubernetes-dependencies/pom.xml
View File

@@ -36,7 +36,7 @@
<arquillian-cube.version>1.15.2</arquillian-cube.version>
<hoverfly.version>0.13.0</hoverfly.version>
<kubernetes-client.version>4.13.2</kubernetes-client.version>
<kubernetes-java-client.version>11.0.1</kubernetes-java-client.version>
<kubernetes-java-client.version>11.0.2</kubernetes-java-client.version>
<istio-client.version>1.5.5</istio-client.version>
<mockwebserver.version>0.1.2</mockwebserver.version>
<okhttp.version>3.14.4</okhttp.version>