Skip to content

Commit 411e8a1

Browse files
Ryan Baxterryanjbaxter
Ryan Baxter
and
ryanjbaxter
authored
Bump version to 16.0.2 (#1163)
Co-authored-by: Ryan Baxter <[email protected]>
1 parent 3dcab2b commit 411e8a1

File tree

24 files changed

+150
-150
lines changed

24 files changed

+150
-150
lines changed

‎spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public boolean isInsideKubernetes() {
8282
private V1Pod internalGetPod() {
8383
try {
8484
if (isServiceHostEnvVarPresent() && isHostNameEnvVarPresent() && isServiceAccountFound()) {
85-
return client.readNamespacedPod(hostName, namespace, null, null, null);
85+
return client.readNamespacedPod(hostName, namespace, null);
8686
}
8787
}
8888
catch (Throwable t) {

‎spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtilsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ private void mockCertPath(boolean result) {
168168
}
169169

170170
private void mockPodResult() throws ApiException {
171-
Mockito.when(client.readNamespacedPod(POD_HOSTNAME, "namespace", null, null, null)).thenReturn(POD);
171+
Mockito.when(client.readNamespacedPod(POD_HOSTNAME, "namespace", null)).thenReturn(POD);
172172
}
173173

174174
}

‎spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import io.kubernetes.client.informer.SharedInformer;
3131
import io.kubernetes.client.informer.SharedInformerFactory;
3232
import io.kubernetes.client.informer.cache.Lister;
33+
import io.kubernetes.client.openapi.models.CoreV1EndpointPort;
3334
import io.kubernetes.client.openapi.models.V1EndpointAddress;
34-
import io.kubernetes.client.openapi.models.V1EndpointPort;
3535
import io.kubernetes.client.openapi.models.V1Endpoints;
3636
import io.kubernetes.client.openapi.models.V1Service;
3737
import org.apache.commons.logging.Log;
@@ -48,7 +48,6 @@
4848

4949
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.HTTP;
5050
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.HTTPS;
51-
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.PRIMARY_PORT_NAME_LABEL_KEY;
5251
import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.UNSET_PORT_NAME;
5352

5453
/**
@@ -155,7 +154,7 @@ private Stream<ServiceInstance> getServiceInstanceDetails(V1Service service, Str
155154
return ep.getSubsets().stream().filter(subset -> subset.getPorts() != null && subset.getPorts().size() > 0) // safeguard
156155
.flatMap(subset -> {
157156
Map<String, String> metadata = new HashMap<>(svcMetadata);
158-
List<V1EndpointPort> endpointPorts = subset.getPorts();
157+
List<CoreV1EndpointPort> endpointPorts = subset.getPorts();
159158
if (this.properties.metadata() != null && this.properties.metadata().addPorts()) {
160159
endpointPorts.forEach(
161160
p -> metadata.put(StringUtils.hasText(p.getName()) ? p.getName() : UNSET_PORT_NAME,
@@ -190,13 +189,13 @@ private static boolean isSecured(V1Service service) {
190189
return Boolean.parseBoolean(securedOpt.orElse("false"));
191190
}
192191

193-
private int findEndpointPort(List<V1EndpointPort> endpointPorts, String primaryPortName, String serviceId) {
192+
private int findEndpointPort(List<CoreV1EndpointPort> endpointPorts, String primaryPortName, String serviceId) {
194193
if (endpointPorts.size() == 1) {
195194
return endpointPorts.get(0).getPort();
196195
}
197196
else {
198197
Map<String, Integer> ports = endpointPorts.stream().filter(p -> StringUtils.hasText(p.getName()))
199-
.collect(Collectors.toMap(V1EndpointPort::getName, V1EndpointPort::getPort));
198+
.collect(Collectors.toMap(CoreV1EndpointPort::getName, CoreV1EndpointPort::getPort));
200199
// This oneliner is looking for a port with a name equal to the primary port
201200
// name specified in the service label
202201
// or in spring.cloud.kubernetes.discovery.primary-port-name, equal to https,

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ public ApiClient apiClient() {
9494
WireMock.configureFor(wireMockServer.port());
9595
stubFor(get("/api/v1/namespaces/test/endpoints?resourceVersion=0&watch=false")
9696
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1EndpointsListBuilder()
97-
.withMetadata(new V1ListMetaBuilder().withNewResourceVersion("0").build()).build()))));
97+
.withMetadata(new V1ListMetaBuilder().withResourceVersion("0").build()).build()))));
9898
stubFor(get("/api/v1/namespaces/test/services?resourceVersion=0&watch=false")
9999
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1ServiceListBuilder()
100-
.withMetadata(new V1ListMetaBuilder().withNewResourceVersion("0").build()).build()))));
100+
.withMetadata(new V1ListMetaBuilder().withResourceVersion("0").build()).build()))));
101101
ApiClient apiClient = new ClientBuilder().setBasePath(wireMockServer.baseUrl()).build();
102102
return apiClient;
103103
}

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import io.kubernetes.client.informer.SharedInformerFactory;
2424
import io.kubernetes.client.informer.cache.Cache;
2525
import io.kubernetes.client.informer.cache.Lister;
26+
import io.kubernetes.client.openapi.models.CoreV1EndpointPort;
2627
import io.kubernetes.client.openapi.models.V1EndpointAddress;
27-
import io.kubernetes.client.openapi.models.V1EndpointPort;
2828
import io.kubernetes.client.openapi.models.V1EndpointSubset;
2929
import io.kubernetes.client.openapi.models.V1Endpoints;
3030
import io.kubernetes.client.openapi.models.V1ObjectMeta;
@@ -72,17 +72,17 @@ public class KubernetesInformerDiscoveryClientTests {
7272

7373
private static final V1Endpoints testEndpoints1 = new V1Endpoints()
7474
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
75-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(8080))
75+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().port(8080))
7676
.addAddressesItem(new V1EndpointAddress().ip("2.2.2.2")));
7777

7878
private static final V1Endpoints testEndpoints2 = new V1Endpoints()
7979
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace2"))
80-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(8080))
80+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().port(8080))
8181
.addAddressesItem(new V1EndpointAddress().ip("2.2.2.2")));
8282

8383
private static final V1Endpoints testEndpointWithoutReadyAddresses = new V1Endpoints()
8484
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
85-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(8080))
85+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().port(8080))
8686
.addNotReadyAddressesItem(new V1EndpointAddress().ip("2.2.2.2")));
8787

8888
private static final V1Endpoints testEndpointWithoutPorts = new V1Endpoints()
@@ -91,30 +91,30 @@ public class KubernetesInformerDiscoveryClientTests {
9191

9292
private static final V1Endpoints testEndpointWithUnsetPortName = new V1Endpoints()
9393
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
94-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(80))
94+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().port(80))
9595
.addAddressesItem(new V1EndpointAddress().ip("1.1.1.1")));
9696

9797
private static final V1Endpoints testEndpointWithMultiplePorts = new V1Endpoints()
9898
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
99-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().name("http").port(80))
100-
.addPortsItem(new V1EndpointPort().name("https").port(443))
99+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().name("http").port(80))
100+
.addPortsItem(new CoreV1EndpointPort().name("https").port(443))
101101
.addAddressesItem(new V1EndpointAddress().ip("1.1.1.1")));
102102

103103
private static final V1Endpoints testEndpointWithMultiplePortsWithoutHttps = new V1Endpoints()
104104
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
105-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().name("http").port(80))
106-
.addPortsItem(new V1EndpointPort().name("tcp").port(443))
105+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().name("http").port(80))
106+
.addPortsItem(new CoreV1EndpointPort().name("tcp").port(443))
107107
.addAddressesItem(new V1EndpointAddress().ip("1.1.1.1")));
108108

109109
private static final V1Endpoints testEndpointWithMultiplePortsWithoutSupportedPortNames = new V1Endpoints()
110110
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
111-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().name("tcp1").port(80))
112-
.addPortsItem(new V1EndpointPort().name("tcp2").port(443))
111+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().name("tcp1").port(80))
112+
.addPortsItem(new CoreV1EndpointPort().name("tcp2").port(443))
113113
.addAddressesItem(new V1EndpointAddress().ip("1.1.1.1")));
114114

115115
private static final V1Endpoints testEndpoints3 = new V1Endpoints()
116116
.metadata(new V1ObjectMeta().name("test-svc-3").namespace("namespace1"))
117-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(8080))
117+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().port(8080))
118118
.addAddressesItem(new V1EndpointAddress().ip("2.2.2.2")));
119119

120120
@Test

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientAutoConfigurationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ public ApiClient apiClient() {
9090
WireMock.configureFor(wireMockServer.port());
9191
stubFor(get("/api/v1/namespaces/test/endpoints?resourceVersion=0&watch=false")
9292
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1EndpointsListBuilder()
93-
.withMetadata(new V1ListMetaBuilder().withNewResourceVersion("0").build()).build()))));
93+
.withMetadata(new V1ListMetaBuilder().withResourceVersion("0").build()).build()))));
9494
stubFor(get("/api/v1/namespaces/test/services?resourceVersion=0&watch=false")
9595
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1ServiceListBuilder()
96-
.withMetadata(new V1ListMetaBuilder().withNewResourceVersion("0").build()).build()))));
96+
.withMetadata(new V1ListMetaBuilder().withResourceVersion("0").build()).build()))));
9797
ApiClient apiClient = new ClientBuilder().setBasePath(wireMockServer.baseUrl()).build();
9898
return apiClient;
9999
}

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import io.kubernetes.client.informer.SharedInformerFactory;
2323
import io.kubernetes.client.informer.cache.Cache;
2424
import io.kubernetes.client.informer.cache.Lister;
25+
import io.kubernetes.client.openapi.models.CoreV1EndpointPort;
2526
import io.kubernetes.client.openapi.models.V1EndpointAddress;
26-
import io.kubernetes.client.openapi.models.V1EndpointPort;
2727
import io.kubernetes.client.openapi.models.V1EndpointSubset;
2828
import io.kubernetes.client.openapi.models.V1Endpoints;
2929
import io.kubernetes.client.openapi.models.V1ObjectMeta;
@@ -63,7 +63,7 @@ public class KubernetesInformerReactiveDiscoveryClientTests {
6363

6464
private static final V1Endpoints testEndpoints1 = new V1Endpoints()
6565
.metadata(new V1ObjectMeta().name("test-svc-1").namespace("namespace1"))
66-
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new V1EndpointPort().port(8080))
66+
.addSubsetsItem(new V1EndpointSubset().addPortsItem(new CoreV1EndpointPort().port(8080))
6767
.addAddressesItem(new V1EndpointAddress().ip("2.2.2.2")));
6868

6969
@Test

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigMapWatchChangeDetectorTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import com.github.tomakehurst.wiremock.client.WireMock;
2626
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
2727
import io.kubernetes.client.openapi.apis.CoreV1Api;
28+
import io.kubernetes.client.openapi.models.CoreV1EndpointPort;
2829
import io.kubernetes.client.openapi.models.V1ConfigMap;
2930
import io.kubernetes.client.openapi.models.V1EndpointAddress;
30-
import io.kubernetes.client.openapi.models.V1EndpointPort;
3131
import io.kubernetes.client.openapi.models.V1ObjectMeta;
3232
import io.kubernetes.client.util.ClientBuilder;
3333
import org.junit.jupiter.api.AfterAll;
@@ -159,7 +159,7 @@ void triggerConfigMapRefreshWithAnnotationActuatorPath() {
159159
V1EndpointAddress fooEndpointAddress = new V1EndpointAddress();
160160
fooEndpointAddress.setIp("127.0.0.1");
161161
fooEndpointAddress.setHostname("localhost");
162-
V1EndpointPort fooEndpointPort = new V1EndpointPort();
162+
CoreV1EndpointPort fooEndpointPort = new CoreV1EndpointPort();
163163
fooEndpointPort.setPort(port);
164164
List<ServiceInstance> instances = new ArrayList<>();
165165
DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo",
@@ -183,7 +183,7 @@ private void stubReactiveCall() {
183183
fooEndpointAddress.setIp("127.0.0.1");
184184
fooEndpointAddress.setHostname("localhost");
185185

186-
V1EndpointPort fooEndpointPort = new V1EndpointPort();
186+
CoreV1EndpointPort fooEndpointPort = new CoreV1EndpointPort();
187187
fooEndpointPort.setPort(WIRE_MOCK_SERVER.port());
188188

189189
List<ServiceInstance> instances = new ArrayList<>();

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedSecretsWatchChangeDetectorTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import com.github.tomakehurst.wiremock.client.WireMock;
2626
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
2727
import io.kubernetes.client.openapi.apis.CoreV1Api;
28+
import io.kubernetes.client.openapi.models.CoreV1EndpointPort;
2829
import io.kubernetes.client.openapi.models.V1EndpointAddress;
29-
import io.kubernetes.client.openapi.models.V1EndpointPort;
3030
import io.kubernetes.client.openapi.models.V1ObjectMeta;
3131
import io.kubernetes.client.openapi.models.V1Secret;
3232
import io.kubernetes.client.util.ClientBuilder;
@@ -153,7 +153,7 @@ void triggerSecretRefreshWithAnnotationActuatorPath() {
153153
V1EndpointAddress fooEndpointAddress = new V1EndpointAddress();
154154
fooEndpointAddress.setIp("127.0.0.1");
155155
fooEndpointAddress.setHostname("localhost");
156-
V1EndpointPort fooEndpointPort = new V1EndpointPort();
156+
CoreV1EndpointPort fooEndpointPort = new CoreV1EndpointPort();
157157
fooEndpointPort.setPort(WIRE_MOCK_SERVER.port());
158158
List<ServiceInstance> instances = new ArrayList<>();
159159
DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo",
@@ -174,7 +174,7 @@ private void stubReactiveCall() {
174174
V1EndpointAddress fooEndpointAddress = new V1EndpointAddress();
175175
fooEndpointAddress.setIp("127.0.0.1");
176176
fooEndpointAddress.setHostname("localhost");
177-
V1EndpointPort fooEndpointPort = new V1EndpointPort();
177+
CoreV1EndpointPort fooEndpointPort = new CoreV1EndpointPort();
178178
fooEndpointPort.setPort(WIRE_MOCK_SERVER.port());
179179
List<ServiceInstance> instances = new ArrayList<>();
180180
DefaultKubernetesServiceInstance fooServiceInstance = new DefaultKubernetesServiceInstance("foo", "foo",

‎spring-cloud-kubernetes-dependencies/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<properties>
3535
<hoverfly.version>0.13.0</hoverfly.version>
3636
<kubernetes-fabric8-client.version>5.12.2</kubernetes-fabric8-client.version>
37-
<kubernetes-native-client.version>13.0.2</kubernetes-native-client.version>
37+
<kubernetes-native-client.version>16.0.2</kubernetes-native-client.version>
3838
<istio-client.version>1.7.7.1</istio-client.version>
3939
<wiremock.version>2.26.3</wiremock.version>
4040
<spring-retry.version>1.3.1</spring-retry.version>

0 commit comments

Comments
 (0)