From 2f752a8df20db0dbff3f5b8566e22d4522781422 Mon Sep 17 00:00:00 2001 From: yue9944882 <291271447@qq.com> Date: Tue, 22 Dec 2020 15:11:24 +0800 Subject: [PATCH 1/4] bumping kubernetes client to 11.0.0 --- ...bernetesClientConfigMapPropertySource.java | 2 +- ...KubernetesClientSecretsPropertySource.java | 9 +++--- ...ientEventBasedConfigMapChangeDetector.java | 2 +- ...ClientEventBasedSecretsChangeDetector.java | 2 +- ...netesDiscoveryClientAutoConfiguration.java | 16 ++++++---- ...DiscoveryClientAutoConfigurationTests.java | 30 ------------------- ...DiscoveryClientAutoConfigurationTests.java | 30 ------------------- .../KubernetesClientServicesListSupplier.java | 4 +-- ...ernetesClientLoadBalancerPodModeTests.java | 18 ++++------- ...tesClientLoadBalancerServiceModeTests.java | 18 ++++------- spring-cloud-kubernetes-commons/pom.xml | 4 +++ spring-cloud-kubernetes-dependencies/pom.xml | 2 +- .../integration/tests/commons/K8SUtils.java | 8 ++--- 13 files changed, 40 insertions(+), 105 deletions(-) diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySource.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySource.java index 8c0901ce..1020f717 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySource.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySource.java @@ -53,7 +53,7 @@ public class KubernetesClientConfigMapPropertySource extends ConfigMapPropertySo } } Map result = new LinkedHashMap<>(); - coreV1Api.listNamespacedConfigMap(namespace, null, null, null, null, null, null, null, null, null) + coreV1Api.listNamespacedConfigMap(namespace, null, null, null, null, null, null, null, null, null, null) .getItems().stream().filter(cm -> names.contains(cm.getMetadata().getName())) .forEach(map -> result.putAll(processAllEntries(map.getData(), environment))); diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySource.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySource.java index 64a88c3d..2f0b62af 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySource.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySource.java @@ -56,11 +56,12 @@ public class KubernetesClientSecretsPropertySource extends SecretsPropertySource if (!StringUtils.hasText(namespace)) { // There could technically be more than one, just return the first - secret = api.listSecretForAllNamespaces(null, null, null, null, null, null, null, null, null) + secret = api.listSecretForAllNamespaces(null, null, null, null, null, null, null, null, null, null) .getItems().stream().filter(s -> name.equals(s.getMetadata().getName())).findFirst(); } else { - secret = api.listNamespacedSecret(namespace, null, null, null, null, null, null, null, null, null) + secret = api + .listNamespacedSecret(namespace, null, null, null, null, null, null, null, null, null, null) .getItems().stream().filter(s -> name.equals(s.getMetadata().getName())).findFirst(); } @@ -71,11 +72,11 @@ public class KubernetesClientSecretsPropertySource extends SecretsPropertySource if (labels != null && !labels.isEmpty()) { if (!StringUtils.hasText(namespace)) { api.listSecretForAllNamespaces(null, null, null, createLabelsSelector(labels), null, null, null, - null, null).getItems().forEach(s -> putAll(s, result)); + null, null, null).getItems().forEach(s -> putAll(s, result)); } else { api.listNamespacedSecret(namespace, null, null, null, null, createLabelsSelector(labels), null, - null, null, null).getItems().forEach(s -> putAll(s, result)); + null, null, null, null).getItems().forEach(s -> putAll(s, result)); } } } diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java index 5b340484..d7fbd321 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java @@ -95,7 +95,7 @@ public class KubernetesClientEventBasedConfigMapChangeDetector extends Configura SharedIndexInformer configMapInformer = factory.sharedIndexInformerFor( (CallGeneratorParams params) -> coreV1Api.listNamespacedConfigMapCall( kubernetesClientProperties.getNamespace(), null, null, null, null, null, null, - params.resourceVersion, params.timeoutSeconds, params.watch, null), + params.resourceVersion, null, params.timeoutSeconds, params.watch, null), V1ConfigMap.class, V1ConfigMapList.class); configMapInformer.addEventHandler(new ResourceEventHandler() { @Override diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java index be295b94..7cbdd620 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java @@ -94,7 +94,7 @@ public class KubernetesClientEventBasedSecretsChangeDetector extends Configurati SharedIndexInformer configMapInformer = factory.sharedIndexInformerFor( (CallGeneratorParams params) -> coreV1Api.listNamespacedSecretCall( kubernetesClientProperties.getNamespace(), null, null, null, null, null, null, - params.resourceVersion, params.timeoutSeconds, params.watch, null), + params.resourceVersion, null, params.timeoutSeconds, params.watch, null), V1Secret.class, V1SecretList.class); configMapInformer.addEventHandler(new ResourceEventHandler() { @Override 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 82fda1b1..a430ac8e 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,10 +24,11 @@ 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.KubernetesInformerFactoryProcessor; +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; +import io.kubernetes.client.spring.extended.controller.config.KubernetesInformerAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -44,8 +45,12 @@ import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) @ConditionalOnKubernetesDiscoveryEnabled -@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class }) -@AutoConfigureAfter({ KubernetesClientAutoConfiguration.class }) +@AutoConfigureBefore({ + SimpleDiscoveryClientAutoConfiguration.class, + CommonsClientAutoConfiguration.class, + // So that CatalogSharedInformerFactory can be processed in prior to the default factory + KubernetesInformerAutoConfiguration.class}) +@AutoConfigureAfter({KubernetesClientAutoConfiguration.class}) @EnableConfigurationProperties(KubernetesDiscoveryProperties.class) public class KubernetesDiscoveryClientAutoConfiguration { @@ -55,8 +60,9 @@ public class KubernetesDiscoveryClientAutoConfiguration { @Bean @ConditionalOnMissingBean - public KubernetesInformerFactoryProcessor kubernetesInformerFactoryProcessor() { - return new KubernetesInformerFactoryProcessor(); + public KubernetesInformerConfigurer discoveryInformerConfigurer(ApiClient apiClient, + CatalogSharedInformerFactory sharedInformerFactory) { + return new KubernetesInformerConfigurer(apiClient, sharedInformerFactory); } @Bean diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java index 37a5fe80..c654f61d 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java @@ -16,13 +16,8 @@ package org.springframework.cloud.kubernetes.client.discovery; -import io.kubernetes.client.informer.SharedInformer; -import io.kubernetes.client.informer.SharedInformerFactory; -import io.kubernetes.client.informer.cache.Lister; import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.JSON; -import io.kubernetes.client.openapi.models.V1Endpoints; -import io.kubernetes.client.openapi.models.V1Service; import okhttp3.OkHttpClient; import org.junit.Test; import org.junit.runner.RunWith; @@ -68,31 +63,6 @@ public class KubernetesDiscoveryClientAutoConfigurationTests { return apiClient; } - @Bean - public Lister serviceLister() { - return mock(Lister.class); - } - - @Bean - public Lister endpointsLister() { - return mock(Lister.class); - } - - @Bean - public SharedInformerFactory sharedInformerFactory() { - return mock(SharedInformerFactory.class); - } - - @Bean - public SharedInformer sharedInformerEndpoints() { - return mock(SharedInformer.class); - } - - @Bean - public SharedInformer sharedInformerService() { - return mock(SharedInformer.class); - } - } } diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientAutoConfigurationTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientAutoConfigurationTests.java index 393a7500..2babf346 100644 --- a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientAutoConfigurationTests.java @@ -16,13 +16,8 @@ package org.springframework.cloud.kubernetes.client.discovery.reactive; -import io.kubernetes.client.informer.SharedInformer; -import io.kubernetes.client.informer.SharedInformerFactory; -import io.kubernetes.client.informer.cache.Lister; import io.kubernetes.client.openapi.ApiClient; import io.kubernetes.client.openapi.JSON; -import io.kubernetes.client.openapi.models.V1Endpoints; -import io.kubernetes.client.openapi.models.V1Service; import okhttp3.OkHttpClient; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,31 +66,6 @@ public class KubernetesInformerReactiveDiscoveryClientAutoConfigurationTests { return apiClient; } - @Bean - public Lister serviceLister() { - return mock(Lister.class); - } - - @Bean - public Lister endpointsLister() { - return mock(Lister.class); - } - - @Bean - public SharedInformerFactory sharedInformerFactory() { - return mock(SharedInformerFactory.class); - } - - @Bean - public SharedInformer sharedInformerEndpoints() { - return mock(SharedInformer.class); - } - - @Bean - public SharedInformer sharedInformerService() { - return mock(SharedInformer.class); - } - } } diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java b/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java index ec1b801f..4d05c517 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java @@ -60,11 +60,11 @@ public class KubernetesClientServicesListSupplier extends KubernetesServicesList try { if (discoveryProperties.isAllNamespaces()) { services = coreV1Api.listServiceForAllNamespaces(null, null, "metadata.name=" + this.getServiceId(), - null, null, null, null, null, null).getItems(); + null, null, null, null, null, null, null).getItems(); } else { services = coreV1Api.listNamespacedService(kubernetesClientProperties.getNamespace(), null, null, null, - "metadata.name=" + this.getServiceId(), null, null, null, null, null).getItems(); + "metadata.name=" + this.getServiceId(), null, null, null, null, null, null).getItems(); } services.forEach(service -> result.add(mapper.map(service))); } diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientLoadBalancerPodModeTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientLoadBalancerPodModeTests.java index f0a88d03..cc9fb257 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientLoadBalancerPodModeTests.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientLoadBalancerPodModeTests.java @@ -28,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; @@ -38,11 +37,9 @@ import org.springframework.cloud.kubernetes.client.discovery.KubernetesInformerD import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.mock.http.client.MockClientHttpResponse; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; @@ -58,17 +55,17 @@ import static org.mockito.Mockito.when; */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = KubernetesClientLoadBalancerPodModeTests.App.class, - properties = { "spring.cloud.kubernetes.client.namespace=default" }) + classes = KubernetesClientLoadBalancerPodModeTests.App.class, + properties = {"spring.cloud.kubernetes.client.namespace=default"}) public class KubernetesClientLoadBalancerPodModeTests { @Autowired - private TestRestTemplate rest; + private RestTemplate restTemplate; @Test public void testLoadBalancer() { - ResponseEntity map = rest.getForEntity("/servicea", String.class); - assertThat(map.getStatusCode()).isEqualTo(HttpStatus.OK); + String resp = restTemplate.getForObject("http://servicea-wiremock", String.class); + assertThat(resp).isEqualTo("hello"); } @RestController @@ -114,11 +111,6 @@ public class KubernetesClientLoadBalancerPodModeTests { return new RestTemplateBuilder().build(); } - @GetMapping("/servicea") - public String greeting() { - return restTemplate().getForObject("http://servicea-wiremock", String.class); - } - } } diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientLoadBalancerServiceModeTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientLoadBalancerServiceModeTests.java index 11774bb3..01607454 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientLoadBalancerServiceModeTests.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientLoadBalancerServiceModeTests.java @@ -35,7 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.loadbalancer.LoadBalanced; @@ -44,11 +43,9 @@ import org.springframework.cloud.kubernetes.client.discovery.KubernetesInformerD import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.mock.http.client.MockClientHttpResponse; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; @@ -83,12 +80,12 @@ public class KubernetesClientLoadBalancerServiceModeTests { .build(); @Autowired - private TestRestTemplate rest; + private RestTemplate restTemplate; @Test public void testLoadBalancer() { - ResponseEntity map = rest.getForEntity("/servicea", String.class); - assertThat(map.getStatusCode()).isEqualTo(HttpStatus.OK); + String resp = restTemplate.getForObject("http://servicea-wiremock", String.class); + assertThat(resp).isEqualTo("hello"); } @RestController @@ -109,8 +106,8 @@ public class KubernetesClientLoadBalancerServiceModeTests { CoreV1Api coreV1Api = mock(CoreV1Api.class); try { when(coreV1Api.listNamespacedService(eq("default"), eq(null), eq(null), eq(null), - eq("metadata.name=servicea-wiremock"), eq(null), eq(null), eq(null), eq(null), eq(null))) - .thenReturn(SERVICE_LIST); + eq("metadata.name=servicea-wiremock"), eq(null), eq(null), eq(null), eq(null), eq(null), + eq(null))).thenReturn(SERVICE_LIST); } catch (ApiException e) { e.printStackTrace(); @@ -147,11 +144,6 @@ public class KubernetesClientLoadBalancerServiceModeTests { return new RestTemplateBuilder().build(); } - @GetMapping("/servicea") - public String greeting() { - return restTemplate().getForObject("http://servicea-wiremock", String.class); - } - } } diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml index 28492d54..4948c989 100644 --- a/spring-cloud-kubernetes-commons/pom.xml +++ b/spring-cloud-kubernetes-commons/pom.xml @@ -39,6 +39,10 @@ org.springframework.cloud spring-cloud-loadbalancer + + org.springframework.boot + spring-boot-starter-cache + org.springframework.cloud spring-cloud-context diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index 4ec103c3..9d27a5ae 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.10.3 - 10.0.0 + 11.0.0 1.5.5 0.1.2 3.14.4 diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java index 675b1da9..4e36c67d 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java @@ -138,7 +138,7 @@ public class K8SUtils { public boolean isEndpointReady(String name, String namespace) throws ApiException { V1EndpointsList endpoints = api.listNamespacedEndpoints(namespace, null, null, null, "metadata.name=" + name, - null, null, null, null, null); + null, null, null, null, null, null); if (endpoints.getItems().isEmpty()) { fail("no endpoints for " + name); } @@ -153,7 +153,7 @@ public class K8SUtils { public boolean isReplicationControllerReady(String name, String namespace) throws ApiException { V1ReplicationControllerList controllerList = api.listNamespacedReplicationController(namespace, null, null, - null, "metadata.name=" + name, null, null, null, null, null); + null, "metadata.name=" + name, null, null, null, null, null, null); if (controllerList.getItems().size() < 1) { fail("Replication controller with name " + name + "could not be found"); } @@ -175,13 +175,13 @@ public class K8SUtils { Duration.ofSeconds(90)).until( () -> appsApi .listNamespacedDeployment(namespace, null, null, null, - "metadata.name=" + deploymentName, null, null, null, null, null) + "metadata.name=" + deploymentName, null, null, null, null, null, null) .getItems().isEmpty()); } public boolean isDeployentReady(String deploymentName, String namespace) throws ApiException { V1DeploymentList deployments = appsApi.listNamespacedDeployment(namespace, null, null, null, - "metadata.name=" + deploymentName, null, null, null, null, null); + "metadata.name=" + deploymentName, null, null, null, null, null, null); if (deployments.getItems().size() < 1) { fail("No deployments with the name " + deploymentName); } From 9500d913ca426e86dcaebbe9fe59a1069e74a5c1 Mon Sep 17 00:00:00 2001 From: yue9944882 <291271447@qq.com> Date: Thu, 24 Dec 2020 17:20:42 +0800 Subject: [PATCH 2/4] fixes failing integration test due to removal of configuration-watcher images from dockerhub --- spring-cloud-kubernetes-integration-tests/pom.xml | 7 ++++++- spring-cloud-kubernetes-integration-tests/run.sh | 14 ++++++++------ .../client/config/it/ConfigMapAndSecretIT.java | 2 +- .../client/loadbalancer/it/LoadBalancerIT.java | 4 ++-- .../discovery/it/ReactiveDiscoveryClientIT.java | 4 ++-- .../configuration/watcher/ActuatorRefreshIT.java | 4 ++-- .../kubernetes/core/k8s/it/ActuatorEndpointIT.java | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 39d04dd7..c5cec07e 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -160,6 +160,11 @@ discovery load-balancer - + + + + + + diff --git a/spring-cloud-kubernetes-integration-tests/run.sh b/spring-cloud-kubernetes-integration-tests/run.sh index 926e0017..edf98b33 100755 --- a/spring-cloud-kubernetes-integration-tests/run.sh +++ b/spring-cloud-kubernetes-integration-tests/run.sh @@ -14,6 +14,8 @@ KIND="${BIN_DIR}/kind" ISTIOCTL="${BIN_DIR}/istio-1.6.2/bin/istioctl" +CURRENT_DIR="$(pwd)" +MVN="${CURRENT_DIR}/../mvnw" MVN_VERSION=$(../mvnw -q \ -Dexec.executable=echo \ -Dexec.args='${project.version}' \ @@ -34,7 +36,6 @@ DEFAULT_PULLING_IMAGES=( ) PULLING_IMAGES=(${PULLING_IMAGES:-${DEFAULT_PULLING_IMAGES[@]}}) -CURRENT_DIR="$(pwd)" # cleanup on exit (useful for running locally) cleanup() { @@ -100,12 +101,13 @@ main() { # curl -L https://istio.io/downloadIstio | sh - #"${ISTIOCTL}" install --set profile=demo - cd $CURRENT_DIR + # building required images for running integration tests + cd $CURRENT_DIR/../spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher + ${MVN} clean install + cd $CURRENT_DIR # pulling necessary images for setting up the integration test environment for i in "${PULLING_IMAGES[@]}"; do - echo "Pull images for prepping testing environment: $i" - docker pull $i "${KIND}" load docker-image $i done @@ -113,10 +115,10 @@ main() { for p in "${INTEGRATION_PROJECTS[@]}"; do echo "Running test: $p" cd $p - ../../mvnw spring-boot:build-image \ + ${MVN} spring-boot:build-image \ -Dspring-boot.build-image.imageName=docker.io/springcloud/$p:${MVN_VERSION} "${KIND}" load docker-image docker.io/springcloud/$p:${MVN_VERSION} - ../../mvnw clean install -P it + ${MVN} clean install -P it cd .. done diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java index c29344ec..c78f4c4e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/java/org/springframework/cloud/kubernetes/client/config/it/ConfigMapAndSecretIT.java @@ -88,7 +88,7 @@ public class ConfigMapAndSecretIT { @After public void after() throws Exception { appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null, - "metadata.name=" + K8S_CONFIG_CLIENT_IT_NAME, null, null, null, null, null, null, null, null); + "metadata.name=" + K8S_CONFIG_CLIENT_IT_NAME, null, null, null, null, null, null, null, null, null); api.deleteNamespacedService(K8S_CONFIG_CLIENT_IT_SERVICE_NAME, NAMESPACE, null, null, null, null, null, null); networkingApi.deleteNamespacedIngress("it-ingress", NAMESPACE, null, null, null, null, null, null); api.deleteNamespacedConfigMap(APP_NAME, NAMESPACE, null, null, null, null, null, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java index a7a5ff44..ab6a1094 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java @@ -119,7 +119,7 @@ public class LoadBalancerIT { private void cleanup() throws ApiException { appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null, - "metadata.name=" + SPRING_CLOUD_K8S_LOADBALANCER_DEPLOYMENT_NAME, null, null, null, null, null, null, + "metadata.name=" + SPRING_CLOUD_K8S_LOADBALANCER_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null, null); api.deleteNamespacedService(SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME, NAMESPACE, null, null, null, null, null, null); @@ -159,7 +159,7 @@ public class LoadBalancerIT { @After public void after() throws Exception { appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null, - "metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null); + "metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null, null); api.deleteNamespacedService(WIREMOCK_APP_NAME, NAMESPACE, null, null, null, null, null, null); networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE, null, null, null, null, null, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java index f39fd5a7..95fd6552 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java @@ -112,7 +112,7 @@ public class ReactiveDiscoveryClientIT { private void cleanup() throws ApiException { appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null, "metadata.name=" + SPRING_CLOUD_K8S_REACTIVE_DISCOVERY_DEPLOYMENT_NAME, null, null, null, null, null, - null, null, null); + null, null, null, null); api.deleteNamespacedService(SPRING_CLOUD_K8S_REACTIVE_DISCOVERY_APP_NAME, NAMESPACE, null, null, null, null, null, null); networkingApi.deleteNamespacedIngress("it-ingress", NAMESPACE, null, null, null, null, null, null); @@ -150,7 +150,7 @@ public class ReactiveDiscoveryClientIT { @After public void after() throws Exception { appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null, - "metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null); + "metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, null, null); api.deleteNamespacedService(WIREMOCK_APP_NAME, NAMESPACE, null, null, null, null, null, null); networkingApi.deleteNamespacedIngress("wiremock-ingress", NAMESPACE, null, null, null, null, null, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index 2db973b6..7f7dfc0e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -141,10 +141,10 @@ public class ActuatorRefreshIT { appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null, "metadata.name=" + SPRING_CLOUD_K8S_CONFIG_WATCHER_DEPLOYMENT_NAME, null, null, null, null, null, null, - null, null); + null, null, null); appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null, "metadata.name=" + CONFIG_WATCHER_WIREMOCK_DEPLOYMENT_NAME, null, null, null, null, null, null, null, - null); + null, null); api.deleteNamespacedService(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, NAMESPACE, null, null, null, null, null, null); api.deleteNamespacedService(CONFIG_WATCHER_WIREMOCK_APP_NAME, NAMESPACE, null, null, null, null, null, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java index ccd4b9dc..a2ac4a40 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/java/org/springframework/cloud/kubernetes/core/k8s/it/ActuatorEndpointIT.java @@ -192,7 +192,7 @@ public class ActuatorEndpointIT { @AfterClass public static void after() throws Exception { appsApi.deleteCollectionNamespacedDeployment(NAMESPACE, null, null, null, - "metadata.name=" + K8S_CONFIG_CLIENT_IT_NAME, null, null, null, null, null, null, null, null); + "metadata.name=" + K8S_CONFIG_CLIENT_IT_NAME, null, null, null, null, null, null, null, null, null); api.deleteNamespacedService(K8S_CONFIG_CLIENT_IT_SERVICE_NAME, NAMESPACE, null, null, null, null, null, null); networkingApi.deleteNamespacedIngress("it-ingress", NAMESPACE, null, null, null, null, null, null); } From b4df62401015d5e0ffba510e600bae34f1071ba4 Mon Sep 17 00:00:00 2001 From: yue9944882 <291271447@qq.com> Date: Fri, 25 Dec 2020 01:37:35 +0800 Subject: [PATCH 3/4] fixes integration test by bumping version 2.0.1-SNAPSHOT for the manifests --- spring-cloud-kubernetes-integration-tests/run.sh | 3 ++- .../k8s/deployment-it.yaml | 2 +- .../k8s/deployment-polling-it.yaml | 2 +- .../spring-cloud-kubernetes-client-config-it-deployment.yaml | 2 +- ...g-cloud-kubernetes-client-config-it-polling-deployment.yaml | 2 +- .../k8s/deployment-it.yaml | 2 +- ...cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml | 2 +- ...d-kubernetes-client-loadbalancer-service-it-deployment.yaml | 2 +- .../k8s/deployment-it.yaml | 2 +- ...oud-kubernetes-client-reactive-discovery-it-deployment.yaml | 2 +- .../deployment-it.yaml | 2 +- .../kubernetes/configuration/watcher/ActuatorRefreshIT.java | 2 +- .../configuration/watcher/ActuatorRefreshKafkaIT.java | 2 +- ...d-kubernetes-configuration-watcher-bus-amqp-deployment.yaml | 2 +- ...-kubernetes-configuration-watcher-bus-kafka-deployment.yaml | 2 +- ...cloud-kubernetes-configuration-watcher-http-deployment.yaml | 2 +- ...ubernetes-configuration-watcher-it-bus-amqp-deployment.yaml | 2 +- ...bernetes-configuration-watcher-it-bus-kafka-deployment.yaml | 2 +- .../k8s/deployment-it.yaml | 2 +- .../spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml | 2 +- 20 files changed, 21 insertions(+), 20 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/run.sh b/spring-cloud-kubernetes-integration-tests/run.sh index edf98b33..e3653569 100755 --- a/spring-cloud-kubernetes-integration-tests/run.sh +++ b/spring-cloud-kubernetes-integration-tests/run.sh @@ -15,8 +15,9 @@ KIND="${BIN_DIR}/kind" ISTIOCTL="${BIN_DIR}/istio-1.6.2/bin/istioctl" CURRENT_DIR="$(pwd)" + MVN="${CURRENT_DIR}/../mvnw" -MVN_VERSION=$(../mvnw -q \ +MVN_VERSION=$($MVN -q \ -Dexec.executable=echo \ -Dexec.args='${project.version}' \ --non-recursive \ diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-it.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-it.yaml index 21f1aa11..c990757f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-it.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-it.yaml @@ -19,7 +19,7 @@ spec: spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - - image: springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT + - image: springcloud/spring-cloud-kubernetes-client-config-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent name: spring-cloud-kubernetes-client-config-it resources: {} diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-polling-it.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-polling-it.yaml index 6cefe2ab..d8c15828 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-polling-it.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/k8s/deployment-polling-it.yaml @@ -19,7 +19,7 @@ spec: spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - - image: springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT + - image: springcloud/spring-cloud-kubernetes-client-config-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent name: spring-cloud-kubernetes-client-config-it resources: {} diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml index f2fe4f2d..80315164 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-client-config-it - image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml index 64f415e0..fc100d2b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/src/test/resources/spring-cloud-kubernetes-client-config-it-polling-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-client-config-it - image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-client-config-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/k8s/deployment-it.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/k8s/deployment-it.yaml index f1f90791..b792e56d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/k8s/deployment-it.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/k8s/deployment-it.yaml @@ -19,7 +19,7 @@ spec: spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - - image: springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.0-SNAPSHOT + - image: springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent name: spring-cloud-kubernetes-client-loadbalancer-it resources: {} diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml index 55518cfe..e7d86b1c 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-pod-it-deployment.yaml @@ -17,7 +17,7 @@ spec: env: - name: SPRING_CLOUD_KUBERNETES_LOADBALANCER_MODE value: POD - image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml index 27b9d6bc..ad92bafb 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/resources/spring-cloud-kubernetes-client-loadbalancer-service-it-deployment.yaml @@ -17,7 +17,7 @@ spec: env: - name: SPRING_CLOUD_KUBERNETES_LOADBALANCER_MODE value: SERVICE - image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-client-loadbalancer-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/k8s/deployment-it.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/k8s/deployment-it.yaml index 7511a7b8..8b8ebf4e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/k8s/deployment-it.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/k8s/deployment-it.yaml @@ -19,7 +19,7 @@ spec: spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - - image: springcloud/spring-cloud-kubernetes-client-reactive-discovery-it:2.0.0-SNAPSHOT + - image: springcloud/spring-cloud-kubernetes-client-reactive-discovery-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent name: spring-cloud-kubernetes-client-reactive-discovery-it resources: {} diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/resources/spring-cloud-kubernetes-client-reactive-discovery-it-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/resources/spring-cloud-kubernetes-client-reactive-discovery-it-deployment.yaml index 14322624..96fb65ea 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/resources/spring-cloud-kubernetes-client-reactive-discovery-it-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/src/test/resources/spring-cloud-kubernetes-client-reactive-discovery-it-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-client-reactive-discovery-it - image: docker.io/springcloud/spring-cloud-kubernetes-client-reactive-discovery-client-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-client-reactive-discovery-client-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/deployment-it.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/deployment-it.yaml index 7d513fab..849bd7d0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/deployment-it.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/deployment-it.yaml @@ -18,7 +18,7 @@ spec: app: k8s-demo-app spec: containers: - - image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT + - image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.1-SNAPSHOT name: spring-cloud-kubernetes-configuration-watcher-it resources: {} env: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index 7f7dfc0e..307e8417 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -58,7 +58,7 @@ public class ActuatorRefreshIT { private static final String IMAGE = "spring-cloud-kubernetes-configuration-watcher"; - private static final String IMAGE_TAG = "2.0.0-SNAPSHOT"; + private static final String IMAGE_TAG = "2.0.1-SNAPSHOT"; private static final String LOCAL_REPO = "docker.io/springcloud"; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java index 27fe572d..9d4a5614 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java @@ -59,7 +59,7 @@ public class ActuatorRefreshKafkaIT { private static final String CONFIG_WATCHER_IT_IMAGE = "spring-cloud-kubernetes-configuration-watcher-it"; - private static final String IMAGE_TAG = "2.0.0-SNAPSHOT"; + private static final String IMAGE_TAG = "2.0.1-SNAPSHOT"; private static final String LOCAL_REPO = "docker.io/springcloud"; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml index 0e2ead1d..473bab3b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-amqp-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-configuration-watcher - image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent env: - name: SPRING_PROFILES_ACTIVE diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml index 39165cc4..88c34721 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-bus-kafka-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-configuration-watcher - image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent env: - name: SPRING_PROFILES_ACTIVE diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml index 1ece4aa8..6727c494 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-http-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-configuration-watcher - image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml index 12a885e8..6393d58d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-amqp-deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: spring-cloud-kubernetes-configuration-watcher-it - image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent env: - name: SPRING_PROFILES_ACTIVE diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml index 1b0e27d8..22f1f467 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/resources/spring-cloud-kubernetes-configuration-watcher-it-bus-kafka-deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: spring-cloud-kubernetes-configuration-watcher-it - image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent env: - name: SPRING_PROFILES_ACTIVE diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/k8s/deployment-it.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/k8s/deployment-it.yaml index fda21266..746df461 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/k8s/deployment-it.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/k8s/deployment-it.yaml @@ -19,7 +19,7 @@ spec: spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - - image: springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.0-SNAPSHOT + - image: springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent name: spring-cloud-kubernetes-core-k8s-client-it resources: {} diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml index 4f0bbc0d..8b870360 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/src/test/resources/spring-cloud-kubernetes-core-k8s-client-it-deployment.yaml @@ -14,7 +14,7 @@ spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - name: spring-cloud-kubernetes-core-k8s-client-it - image: docker.io/springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.0-SNAPSHOT + image: docker.io/springcloud/spring-cloud-kubernetes-core-k8s-client-it:2.0.1-SNAPSHOT imagePullPolicy: IfNotPresent readinessProbe: httpGet: From b996e3b57a752eb7055b3b172e49dff72bc30394 Mon Sep 17 00:00:00 2001 From: yue9944882 <291271447@qq.com> Date: Thu, 31 Dec 2020 14:06:11 +0800 Subject: [PATCH 4/4] retest: dummy commit --- spring-cloud-kubernetes-integration-tests/run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-kubernetes-integration-tests/run.sh b/spring-cloud-kubernetes-integration-tests/run.sh index e3653569..2e0f3b98 100755 --- a/spring-cloud-kubernetes-integration-tests/run.sh +++ b/spring-cloud-kubernetes-integration-tests/run.sh @@ -17,6 +17,7 @@ ISTIOCTL="${BIN_DIR}/istio-1.6.2/bin/istioctl" CURRENT_DIR="$(pwd)" MVN="${CURRENT_DIR}/../mvnw" + MVN_VERSION=$($MVN -q \ -Dexec.executable=echo \ -Dexec.args='${project.version}' \