diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index a9b74b01..4aa49353 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -35,9 +35,9 @@ 1.6.0.Final 1.15.2 0.13.0 - 4.13.3 - 11.0.2 - 1.5.5 + 5.5.0 + 13.0.0 + 1.7.7.1 0.1.2 3.14.4 2.26.3 diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java index 43e09920..c5f7e541 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/Fabric8PodUtilsTest.java @@ -21,7 +21,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.function.Supplier; -import io.fabric8.kubernetes.api.model.DoneablePod; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.client.Config; @@ -63,12 +62,11 @@ public class Fabric8PodUtilsTest { private final File certFile = Mockito.mock(File.class); - private final MixedOperation> mixed = Mockito - .mock(MixedOperation.class); + private final MixedOperation> mixed = Mockito.mock(MixedOperation.class); private final Pod pod = Mockito.mock(Pod.class); - private final PodResource podResource = Mockito.mock(PodResource.class); + private final PodResource podResource = Mockito.mock(PodResource.class); private MockedStatic envReader; diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java index 256d28cd..7b44fdef 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java +++ b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java @@ -24,9 +24,9 @@ import javax.annotation.PreDestroy; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; +import io.fabric8.kubernetes.client.WatcherException; import org.springframework.cloud.kubernetes.commons.config.reload.ConfigReloadProperties; import org.springframework.cloud.kubernetes.commons.config.reload.ConfigurationChangeDetector; @@ -76,7 +76,7 @@ public class EventBasedConfigMapChangeDetector extends ConfigurationChangeDetect String name = "config-maps-watch-event"; this.watches.put(name, this.kubernetesClient.configMaps().watch(new Watcher() { @Override - public void eventReceived(Action action, ConfigMap configMap) { + public void eventReceived(Watcher.Action action, ConfigMap configMap) { if (log.isDebugEnabled()) { log.debug(name + " received event for ConfigMap " + configMap.getMetadata().getName()); } @@ -84,7 +84,7 @@ public class EventBasedConfigMapChangeDetector extends ConfigurationChangeDetect } @Override - public void onClose(KubernetesClientException e) { + public void onClose(WatcherException e) { } })); activated = true; diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java index e710c814..35bf7343 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java +++ b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java @@ -24,9 +24,9 @@ import javax.annotation.PreDestroy; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; +import io.fabric8.kubernetes.client.WatcherException; import org.springframework.cloud.kubernetes.commons.config.reload.ConfigReloadProperties; import org.springframework.cloud.kubernetes.commons.config.reload.ConfigurationChangeDetector; @@ -85,7 +85,7 @@ public class EventBasedSecretsChangeDetector extends ConfigurationChangeDetector } @Override - public void onClose(KubernetesClientException e) { + public void onClose(WatcherException e) { } })); activated = true; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTest.java index a0fbb74c..0e1a859a 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTest.java @@ -37,11 +37,14 @@ public class ConfigMapsTest { @Test public void testConfigMapList() { - mockClient.configMaps().inNamespace("ns1").createNew(); + mockClient.configMaps().inNamespace("ns1") + .create(new ConfigMapBuilder().withNewMetadata().withName("empty").endMetadata().build()); ConfigMapList configMapList = mockClient.configMaps().inNamespace("ns1").list(); assertThat(configMapList).isNotNull(); - assertThat(configMapList.getItems().size()).isEqualTo(0); + // metadata is an element + assertThat(configMapList.getItems().size()).isEqualTo(1); + assertThat(configMapList.getItems().get(0).getData()).isNull(); } @Test @@ -78,7 +81,7 @@ public class ConfigMapsTest { @Test public void testConfigMapFromSingleApplicationYaml() { - String configMapName = "app-properties-test"; + String configMapName = "app-yaml-test"; ConfigMap configMap = new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata() .addToData("application.yaml", ConfigMapTestUtil.readResourceFile("application.yaml")).build(); diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java index 6618b2b8..17347ed5 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java @@ -19,6 +19,7 @@ package org.springframework.cloud.kubernetes.fabric8.config; import java.util.HashMap; import io.fabric8.kubernetes.api.model.ConfigMap; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -68,8 +69,8 @@ public class ConfigMapsTests { HashMap data = new HashMap<>(); data.put("bean.greeting", "Hello ConfigMap, %s!"); - mockClient.configMaps().inNamespace("test").createNew().withNewMetadata().withName(APPLICATION_NAME) - .endMetadata().addToData(data).done(); + mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata() + .withName(APPLICATION_NAME).endMetadata().addToData(data).build()); } @Test diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java index 3c9a4444..785def06 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java @@ -18,6 +18,7 @@ package org.springframework.cloud.kubernetes.fabric8.config; import java.util.HashMap; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -71,13 +72,13 @@ public class ConfigMapsWithActiveProfilesNameTests { HashMap data = new HashMap<>(); data.put("application.yml", readResourceFile("application-with-profiles.yaml")); - mockClient.configMaps().inNamespace("test").createNew().withNewMetadata().withName(APPLICATION_NAME) - .endMetadata().addToData(data).done(); + mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata() + .withName(APPLICATION_NAME).endMetadata().addToData(data).build()); HashMap dataWithName = new HashMap<>(); dataWithName.put("application.yml", readResourceFile("application-with-active-profiles-name.yaml")); - mockClient.configMaps().inNamespace("test").createNew().withNewMetadata() - .withName(APPLICATION_NAME + "-development").endMetadata().addToData(dataWithName).done(); + mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata() + .withName(APPLICATION_NAME + "-development").endMetadata().addToData(dataWithName).build()); } @Test diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java index d4f7d36f..35e99927 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java @@ -18,6 +18,7 @@ package org.springframework.cloud.kubernetes.fabric8.config; import java.util.HashMap; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -65,8 +66,8 @@ public class ConfigMapsWithProfileExpressionTests { HashMap data = new HashMap<>(); data.put("application.yml", ConfigMapTestUtil.readResourceFile("application-with-profiles.yaml")); - mockClient.configMaps().inNamespace("test").createNew().withNewMetadata().withName(APPLICATION_NAME) - .endMetadata().addToData(data).done(); + mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata() + .withName(APPLICATION_NAME).endMetadata().addToData(data).build()); } @Test diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java index 0b60bd5c..9cd411b1 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java @@ -18,6 +18,7 @@ package org.springframework.cloud.kubernetes.fabric8.config; import java.util.HashMap; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -65,8 +66,8 @@ public class ConfigMapsWithProfilesNoActiveProfileTests { HashMap data = new HashMap<>(); data.put("application.yml", readResourceFile("application-with-profiles.yaml")); - mockClient.configMaps().inNamespace("test").createNew().withNewMetadata().withName(APPLICATION_NAME) - .endMetadata().addToData(data).done(); + mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata() + .withName(APPLICATION_NAME).endMetadata().addToData(data).build()); } @Test diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java index 2d1e748f..bbf4838c 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesTests.java @@ -18,6 +18,7 @@ package org.springframework.cloud.kubernetes.fabric8.config; import java.util.HashMap; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -67,8 +68,8 @@ public class ConfigMapsWithProfilesTests { HashMap data = new HashMap<>(); data.put("application.yml", ConfigMapTestUtil.readResourceFile("application-with-profiles.yaml")); - mockClient.configMaps().inNamespace("test").createNew().withNewMetadata().withName(APPLICATION_NAME) - .endMetadata().addToData(data).done(); + mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata() + .withName(APPLICATION_NAME).endMetadata().addToData(data).build()); } @Test diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java index 10f791df..8742575a 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithoutProfilesTests.java @@ -18,6 +18,7 @@ package org.springframework.cloud.kubernetes.fabric8.config; import java.util.HashMap; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -61,8 +62,8 @@ public class ConfigMapsWithoutProfilesTests { HashMap data = new HashMap<>(); data.put("application.yml", ConfigMapTestUtil.readResourceFile("application-without-profiles.yaml")); - mockClient.configMaps().inNamespace("test").createNew().withNewMetadata().withName(APPLICATION_NAME) - .endMetadata().addToData(data).done(); + mockClient.configMaps().inNamespace("test").create(new ConfigMapBuilder().withNewMetadata() + .withName(APPLICATION_NAME).endMetadata().addToData(data).build()); } @Test diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java index 4100bedd..c62dd256 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTest.java @@ -19,6 +19,8 @@ package org.springframework.cloud.kubernetes.fabric8.config; import java.util.HashMap; import java.util.Map; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; +import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; @@ -62,14 +64,14 @@ public class CoreTest { Map data1 = new HashMap<>(); data1.put("spring.kubernetes.test.value", "value1"); - mockClient.configMaps().inNamespace("testns").createNew().withNewMetadata().withName("testapp").endMetadata() - .addToData(data1).done(); + mockClient.configMaps().inNamespace("testns").create( + new ConfigMapBuilder().withNewMetadata().withName("testapp").endMetadata().addToData(data1).build()); Map data2 = new HashMap<>(); data2.put("amq.user", "YWRtaW4K"); data2.put("amq.pwd", "MWYyZDFlMmU2N2Rm"); - mockClient.secrets().inNamespace("testns").createNew().withNewMetadata().withName("testapp").endMetadata() - .addToData(data2).done(); + mockClient.secrets().inNamespace("testns").create( + new SecretBuilder().withNewMetadata().withName("testapp").endMetadata().addToData(data2).build()); // Configure the kubernetes master url to point to the mock server System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java index c2ef2f61..dbaa5e47 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceTest.java @@ -66,7 +66,8 @@ public class Fabric8SecretsPropertySourceTest { System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, NAMESPACE); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); - Secret secret = new SecretBuilder().withNewMetadata().withLabels(singletonMap("foo", "bar")).endMetadata() + Secret secret = new SecretBuilder().withNewMetadata().withName("test-secret") + .withLabels(singletonMap("foo", "bar")).endMetadata() .addToData("secretName", Base64.getEncoder().encodeToString(SECRET_VALUE.getBytes())).build(); mockClient.secrets().inNamespace(NAMESPACE).create(secret); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleConfigMapsTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleConfigMapsTests.java index ae067c16..640f781d 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleConfigMapsTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/MultipleConfigMapsTests.java @@ -19,6 +19,7 @@ package org.springframework.cloud.kubernetes.fabric8.config; import java.util.HashMap; import java.util.Map; +import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -81,8 +82,8 @@ public class MultipleConfigMapsTests { private static void createConfigmap(KubernetesClient client, String configMapName, String namespace, Map data) { - client.configMaps().inNamespace(namespace).createNew().withNewMetadata().withName(configMapName).endMetadata() - .addToData(data).done(); + client.configMaps().inNamespace(namespace).create( + new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata().addToData(data).build()); } // the last confimap defined in 'multiplecms.yml' has the highest priority, so diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigurationChangeDetectorTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigurationChangeDetectorTests.java index 6996f59b..dbffbbbe 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigurationChangeDetectorTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigurationChangeDetectorTests.java @@ -22,7 +22,6 @@ import java.util.Map; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapList; -import io.fabric8.kubernetes.api.model.DoneableConfigMap; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.Resource; @@ -55,9 +54,8 @@ public class EventBasedConfigurationChangeDetectorTests { Map data = new HashMap<>(); data.put("foo", "bar"); configMap.setData(data); - MixedOperation> mixedOperation = mock( - MixedOperation.class); - Resource resource = mock(Resource.class); + MixedOperation> mixedOperation = mock(MixedOperation.class); + Resource resource = mock(Resource.class); when(resource.get()).thenReturn(configMap); when(mixedOperation.withName(eq("myconfigmap"))).thenReturn(resource); when(k8sClient.configMaps()).thenReturn(mixedOperation); diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java index ba0ea6ac..e7c690a0 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesClientServicesFunction.java @@ -21,7 +21,6 @@ import java.util.function.Function; import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServiceList; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable; /** @@ -43,6 +42,6 @@ import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable; * @author Georgios Andrianakis */ public interface KubernetesClientServicesFunction - extends Function> { + extends Function> { } diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java index 37cb5a89..c06a0fff 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import io.fabric8.kubernetes.api.model.DoneableEndpoints; import io.fabric8.kubernetes.api.model.EndpointAddress; import io.fabric8.kubernetes.api.model.EndpointSubset; import io.fabric8.kubernetes.api.model.Endpoints; @@ -69,7 +68,7 @@ public class KubernetesCatalogWatchTest { private ApplicationEventPublisher applicationEventPublisher; @Mock - private MixedOperation> endpointsOperation; + private MixedOperation> endpointsOperation; @Captor private ArgumentCaptor heartbeatEventArgumentCaptor; diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java index 21119204..ec4b0dec 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterMetadataTest.java @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import io.fabric8.kubernetes.api.model.DoneableEndpoints; -import io.fabric8.kubernetes.api.model.DoneableService; import io.fabric8.kubernetes.api.model.EndpointPort; import io.fabric8.kubernetes.api.model.EndpointPortBuilder; import io.fabric8.kubernetes.api.model.Endpoints; @@ -35,7 +33,6 @@ import io.fabric8.kubernetes.api.model.ServiceList; import io.fabric8.kubernetes.api.model.ServicePort; import io.fabric8.kubernetes.api.model.ServicePortBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.Resource; @@ -74,19 +71,19 @@ public class KubernetesDiscoveryClientFilterMetadataTest { private KubernetesDiscoveryProperties.Metadata metadata; @Mock - private MixedOperation> serviceOperation; + private MixedOperation> serviceOperation; @Mock - private MixedOperation> endpointsOperation; + private MixedOperation> endpointsOperation; @Mock - private ServiceResource serviceResource; + private ServiceResource serviceResource; @Mock - private Resource endpointsResource; + private Resource endpointsResource; @Mock - FilterWatchListDeletable filter; + FilterWatchListDeletable filter; @InjectMocks private KubernetesDiscoveryClient underTest; diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterTest.java index 1fe1de06..281419c9 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientFilterTest.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import io.fabric8.kubernetes.api.model.DoneableService; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServiceList; @@ -50,7 +49,7 @@ public class KubernetesDiscoveryClientFilterTest { private KubernetesClientServicesFunction kubernetesClientServicesFunction = KubernetesClient::services; @Mock - private MixedOperation> serviceOperation; + private MixedOperation> serviceOperation; private KubernetesDiscoveryClient underTest; diff --git a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderRecordWatcher.java b/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderRecordWatcher.java index 1420a7ee..0296b207 100644 --- a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderRecordWatcher.java +++ b/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderRecordWatcher.java @@ -18,9 +18,9 @@ package org.springframework.cloud.kubernetes.fabric8.leader; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; +import io.fabric8.kubernetes.client.WatcherException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,7 +86,7 @@ public class Fabric8LeaderRecordWatcher } @Override - public void onClose(KubernetesClientException cause) { + public void onClose(WatcherException cause) { if (cause != null) { synchronized (this.lock) { LOGGER.warn("Watcher stopped unexpectedly, will restart", cause); diff --git a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcher.java b/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcher.java index ed9e81ff..2f5a56af 100644 --- a/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcher.java +++ b/spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcher.java @@ -16,12 +16,11 @@ package org.springframework.cloud.kubernetes.fabric8.leader; -import io.fabric8.kubernetes.api.model.DoneablePod; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; +import io.fabric8.kubernetes.client.WatcherException; import io.fabric8.kubernetes.client.dsl.PodResource; import io.fabric8.kubernetes.client.internal.readiness.Readiness; import org.slf4j.Logger; @@ -61,7 +60,7 @@ public class Fabric8PodReadinessWatcher implements PodReadinessWatcher, Watcher< synchronized (this.lock) { if (this.watch == null) { LOGGER.debug("Starting pod readiness watcher for '{}'", this.podName); - PodResource podResource = this.kubernetesClient.pods().withName(this.podName); + PodResource podResource = this.kubernetesClient.pods().withName(this.podName); this.previousState = podResource.isReady(); this.watch = podResource.watch(this); } @@ -98,7 +97,7 @@ public class Fabric8PodReadinessWatcher implements PodReadinessWatcher, Watcher< } @Override - public void onClose(KubernetesClientException cause) { + public void onClose(WatcherException cause) { if (cause != null) { synchronized (this.lock) { LOGGER.warn("Watcher stopped unexpectedly, will restart", cause); diff --git a/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderRecordWatcherTest.java b/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderRecordWatcherTest.java index 4c026ad5..de161be0 100644 --- a/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderRecordWatcherTest.java +++ b/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderRecordWatcherTest.java @@ -18,11 +18,10 @@ package org.springframework.cloud.kubernetes.fabric8.leader; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapList; -import io.fabric8.kubernetes.api.model.DoneableConfigMap; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; +import io.fabric8.kubernetes.client.WatcherException; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; @@ -54,13 +53,13 @@ public class Fabric8LeaderRecordWatcherTest { private KubernetesClient mockKubernetesClient; @Mock - private MixedOperation> mockConfigMapsOperation; + private MixedOperation> mockConfigMapsOperation; @Mock - private NonNamespaceOperation> mockInNamespaceOperation; + private NonNamespaceOperation> mockInNamespaceOperation; @Mock - private Resource mockWithNameResource; + private Resource mockWithNameResource; @Mock private Watch mockWatch; @@ -69,7 +68,7 @@ public class Fabric8LeaderRecordWatcherTest { private ConfigMap mockConfigMap; @Mock - private KubernetesClientException mockKubernetesClientException; + private WatcherException mockKubernetesClientException; private Fabric8LeaderRecordWatcher watcher; diff --git a/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcherTest.java b/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcherTest.java index 3793202e..0e466432 100644 --- a/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcherTest.java +++ b/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcherTest.java @@ -16,14 +16,13 @@ package org.springframework.cloud.kubernetes.fabric8.leader; -import io.fabric8.kubernetes.api.model.DoneablePod; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.api.model.PodStatus; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; +import io.fabric8.kubernetes.client.WatcherException; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.PodResource; import org.junit.jupiter.api.BeforeEach; @@ -51,10 +50,10 @@ public class Fabric8PodReadinessWatcherTest { private KubernetesClient mockKubernetesClient; @Mock - private MixedOperation> mockPodsOperation; + private MixedOperation> mockPodsOperation; @Mock - private PodResource mockPodResource; + private PodResource mockPodResource; @Mock private Pod mockPod; @@ -66,7 +65,7 @@ public class Fabric8PodReadinessWatcherTest { private Watch mockWatch; @Mock - private KubernetesClientException mockKubernetesClientException; + private WatcherException mockKubernetesClientException; private Fabric8PodReadinessWatcher watcher; diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java index a71b0ba7..b3ce577a 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/KubernetesServiceListSupplierTests.java @@ -18,12 +18,10 @@ package org.springframework.cloud.kubernetes.fabric8.loadbalancer; import java.util.List; -import io.fabric8.kubernetes.api.model.DoneableService; import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServiceList; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; @@ -56,16 +54,16 @@ class KubernetesServiceListSupplierTests { KubernetesClient client; @Mock - MixedOperation> serviceOperation; + MixedOperation> serviceOperation; @Mock - NonNamespaceOperation> namespaceOperation; + NonNamespaceOperation> namespaceOperation; @Mock - ServiceResource serviceResource; + ServiceResource serviceResource; @Mock - FilterWatchListMultiDeletable multiDeletable; + FilterWatchListMultiDeletable multiDeletable; @Test void testPositiveMatch() { diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerAllNamespacesTests.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerAllNamespacesTests.java index 16735598..53085bfb 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerAllNamespacesTests.java +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerAllNamespacesTests.java @@ -16,6 +16,8 @@ package org.springframework.cloud.kubernetes.fabric8.loadbalancer; +import io.fabric8.kubernetes.api.model.EndpointsBuilder; +import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServicePortBuilder; import io.fabric8.kubernetes.api.model.ServiceSpecBuilder; import io.fabric8.kubernetes.client.Config; @@ -63,15 +65,16 @@ class LoadBalancerAllNamespacesTests { } private void createTestData(String name, String namespace) { - client.services().inNamespace(namespace).createNew().withNewMetadata().withName(name).withNamespace(namespace) - .endMetadata() + client.services().inNamespace(namespace).create(new ServiceBuilder().withNewMetadata().withName(name) + .withNamespace(namespace).endMetadata() .withSpec(new ServiceSpecBuilder() .withPorts(new ServicePortBuilder().withProtocol("TCP").withPort(randomServerPort).build()) .build()) - .done(); - client.endpoints().inNamespace(namespace).createNew().withNewMetadata().withName("service-a") - .withNamespace(namespace).endMetadata().addNewSubset().addNewAddress().withIp("localhost").endAddress() - .addNewPort().withName("http").withPort(randomServerPort).endPort().endSubset().done(); + .build()); + client.endpoints().inNamespace(namespace) + .create(new EndpointsBuilder().withNewMetadata().withName("service-a").withNamespace(namespace) + .endMetadata().addNewSubset().addNewAddress().withIp("localhost").endAddress().addNewPort() + .withName("http").withPort(randomServerPort).endPort().endSubset().build()); } } diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerTests.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerTests.java index 24cad5f5..31d3f8d3 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerTests.java +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerTests.java @@ -16,6 +16,8 @@ package org.springframework.cloud.kubernetes.fabric8.loadbalancer; +import io.fabric8.kubernetes.api.model.EndpointsBuilder; +import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServicePortBuilder; import io.fabric8.kubernetes.api.model.ServiceSpecBuilder; import io.fabric8.kubernetes.client.Config; @@ -68,14 +70,16 @@ class LoadBalancerTests { } private void createTestData(String name, String namespace) { - client.services().inNamespace(namespace).createNew().withNewMetadata().withName(name).endMetadata() + client.services().inNamespace(namespace).create(new ServiceBuilder().withNewMetadata().withName(name) + .endMetadata() .withSpec(new ServiceSpecBuilder() .withPorts(new ServicePortBuilder().withProtocol("TCP").withPort(randomServerPort).build()) .build()) - .done(); - client.endpoints().inNamespace(namespace).createNew().withNewMetadata().withName("service-a").endMetadata() - .addNewSubset().addNewAddress().withIp("localhost").endAddress().addNewPort().withName("http") - .withPort(randomServerPort).endPort().endSubset().done(); + .build()); + client.endpoints().inNamespace(namespace) + .create(new EndpointsBuilder().withNewMetadata().withName("service-a").endMetadata().addNewSubset() + .addNewAddress().withIp("localhost").endAddress().addNewPort().withName("http") + .withPort(randomServerPort).endPort().endSubset().build()); } } diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerWithServiceTests.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerWithServiceTests.java index 25b735bf..baa3c7a1 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerWithServiceTests.java +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerWithServiceTests.java @@ -18,6 +18,7 @@ package org.springframework.cloud.kubernetes.fabric8.loadbalancer; import java.util.Collections; +import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServicePortBuilder; import io.fabric8.kubernetes.api.model.ServiceSpecBuilder; import io.fabric8.kubernetes.client.Config; @@ -94,11 +95,12 @@ class LoadBalancerWithServiceTests { } private void createTestData(String name, String namespace) { - client.services().inNamespace(namespace).createNew().withNewMetadata().withName(name).endMetadata() + client.services().inNamespace(namespace).create(new ServiceBuilder().withNewMetadata().withName(name) + .endMetadata() .withSpec(new ServiceSpecBuilder() .withPorts(new ServicePortBuilder().withProtocol("TCP").withPort(randomServerPort).build()) .build()) - .done(); + .build()); } }