diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapsCache.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapsCache.java index 467cf63bd0..488b09cf91 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapsCache.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapsCache.java @@ -55,10 +55,8 @@ static List byNamespace(CoreV1Api coreV1Api, String nam List result = CACHE.computeIfAbsent(namespace, x -> { try { b[0] = true; - return strippedConfigMaps(coreV1Api - .listNamespacedConfigMap(namespace, null, null, null, - null, null, null, null, null, null, null, null) - .getItems()); + return strippedConfigMaps(coreV1Api.listNamespacedConfigMap(namespace, null, null, null, null, null, + null, null, null, null, null, null).getItems()); } catch (ApiException apiException) { throw new RuntimeException(apiException.getResponseBody(), apiException); diff --git a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsCache.java b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsCache.java index 395519a268..7544408647 100644 --- a/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsCache.java +++ b/spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsCache.java @@ -57,10 +57,8 @@ static List byNamespace(CoreV1Api coreV1Api, String nam List result = CACHE.computeIfAbsent(namespace, x -> { try { b[0] = true; - return strippedSecrets(coreV1Api - .listNamespacedSecret(namespace, null, null, null, null, - null, null, null, null, null, null, null) - .getItems()); + return strippedSecrets(coreV1Api.listNamespacedSecret(namespace, null, null, null, null, null, null, + null, null, null, null, null).getItems()); } catch (ApiException apiException) { throw new RuntimeException(apiException.getResponseBody(), apiException); 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 3b6a264b8f..0581017f69 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 @@ -123,11 +123,12 @@ void inform() { } SharedInformerFactory factory = new SharedInformerFactory(apiClient); factories.add(factory); - informer = factory.sharedIndexInformerFor( - (CallGeneratorParams params) -> coreV1Api.listNamespacedConfigMapCall(namespace, null, null, null, - null, filter[0], null, params.resourceVersion, null, null, params.timeoutSeconds, params.watch, - null), - V1ConfigMap.class, V1ConfigMapList.class); + informer = factory + .sharedIndexInformerFor( + (CallGeneratorParams params) -> coreV1Api.listNamespacedConfigMapCall(namespace, null, null, + null, null, filter[0], null, params.resourceVersion, null, null, + params.timeoutSeconds, params.watch, null), + V1ConfigMap.class, V1ConfigMapList.class); LOG.debug(() -> "added configmap informer for namespace : " + namespace + " with filter : " + filter[0]); 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 39491d2866..f97da12a2b 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 @@ -128,8 +128,8 @@ void inform() { factories.add(factory); informer = factory.sharedIndexInformerFor( (CallGeneratorParams params) -> coreV1Api.listNamespacedSecretCall(namespace, null, null, null, - null, filter[0], null, params.resourceVersion, null, null, params.timeoutSeconds, params.watch, - null), + null, filter[0], null, params.resourceVersion, null, null, params.timeoutSeconds, + params.watch, null), V1Secret.class, V1SecretList.class); LOG.debug(() -> "added secret informer for namespace : " + namespace + " with filter : " + filter[0]); 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 7c79e51158..f099f4ab80 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 @@ -72,8 +72,7 @@ public Flux> get() { } else { services = coreV1Api.listNamespacedService(getNamespace(), null, null, null, - "metadata.name=" + this.getServiceId(), null, null, null, - null, null, null, null).getItems(); + "metadata.name=" + this.getServiceId(), null, null, null, null, null, null, null).getItems(); } services.forEach(service -> result.add(mapper.map(service))); } diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index f95c2d00f6..2844741b15 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -33,7 +33,7 @@ Spring Cloud Kubernetes Dependencies 0.13.0 - 6.7.2 + 6.9.2 19.0.0 2.26.3 4.4 diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java index 43e7069091..69002846ef 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java @@ -37,7 +37,7 @@ class Fabric8UserAgentDefaultConfigurationTests { @Test void testUserAgent() { String userAgent = client.getConfiguration().getUserAgent(); - assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.7.2"); + assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.9.2"); } } 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 b8c3d989be..747c2e433a 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 @@ -211,8 +211,7 @@ public void waitForReplicationController(String name, String namespace) { 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, null); + null, "metadata.name=" + name, null, null, null, null, null, null, null); if (controllerList.getItems().size() < 1) { fail("Replication controller with name " + name + "could not be found"); } @@ -281,8 +280,7 @@ public void waitForDeploymentToBeDeleted(String deploymentName, String namespace public boolean isDeploymentReady(String deploymentName, String namespace) throws ApiException { V1DeploymentList deployments = appsApi.listNamespacedDeployment(namespace, null, null, null, - "metadata.name=" + deploymentName, null, null, null, null, - null, null, null); + "metadata.name=" + deploymentName, null, null, null, null, null, null, null); if (deployments.getItems().size() < 1) { fail("No deployments with the name " + deploymentName); } @@ -315,9 +313,8 @@ public void deleteNamespace(String name) throws Exception { api.deleteNamespace(name, null, null, null, null, null, null); await().pollInterval(Duration.ofSeconds(1)).atMost(30, TimeUnit.SECONDS) - .until(() -> api.listNamespace(null, null, null, null, - null, null, null, null, null, null, null).getItems() - .stream().noneMatch(x -> x.getMetadata().getName().equals(name))); + .until(() -> api.listNamespace(null, null, null, null, null, null, null, null, null, null, null) + .getItems().stream().noneMatch(x -> x.getMetadata().getName().equals(name))); } public void setUpClusterWide(String serviceAccountNamespace, Set namespaces) throws Exception { @@ -388,8 +385,8 @@ public void deployWiremock(String namespace, boolean rootPath, K3sContainer cont */ public void cleanUpWiremock(String namespace) throws Exception { appsApi.deleteCollectionNamespacedDeployment(namespace, null, null, null, - "metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, null, null, - null, null, null, null, null, null, null); + "metadata.name=" + WIREMOCK_DEPLOYMENT_NAME, null, 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);