From d85cdf1d195ca11714741374abd504ae4e18e81b Mon Sep 17 00:00:00 2001 From: Tim Yates Date: Mon, 22 Jan 2024 11:46:53 +0000 Subject: [PATCH] Fix client calls (extra parameter) --- .../src/main/java/micronaut/service/PodController.java | 2 +- .../configuration/KubernetesConfigurationClient.java | 4 ++-- .../provider/KubernetesServiceInstanceEndpointProvider.java | 2 +- .../provider/KubernetesServiceInstanceServiceProvider.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/micronaut-kubernetes-client/src/main/java/micronaut/service/PodController.java b/examples/micronaut-kubernetes-client/src/main/java/micronaut/service/PodController.java index e601f2a0a..aad4c45d2 100644 --- a/examples/micronaut-kubernetes-client/src/main/java/micronaut/service/PodController.java +++ b/examples/micronaut-kubernetes-client/src/main/java/micronaut/service/PodController.java @@ -43,7 +43,7 @@ public String getPod(final @NotNull String namespace, final @NotNull String name @Get("/{namespace}") public Map index(final @NotNull String namespace) throws ApiException { - V1PodList v1PodList = coreV1Api.listNamespacedPod(namespace, null, null, null, null, null, null, null, null, null, false); + V1PodList v1PodList = coreV1Api.listNamespacedPod(namespace, null, null, null, null, null, null, null, null, null, null, false); return v1PodList.getItems().stream() .filter(p -> p.getStatus() != null) .collect(Collectors.toMap( diff --git a/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/configuration/KubernetesConfigurationClient.java b/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/configuration/KubernetesConfigurationClient.java index 60345740d..de7c35989 100644 --- a/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/configuration/KubernetesConfigurationClient.java +++ b/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/configuration/KubernetesConfigurationClient.java @@ -180,7 +180,7 @@ private Flux getPropertySourcesFromConfigMaps() { } }) .flatMap(labelSelector -> - client.listNamespacedConfigMap(configuration.getNamespace(), null, null, null, null, labelSelector, null, null, null, null)) + client.listNamespacedConfigMap(configuration.getNamespace(), null, null, null, null, labelSelector, null, null, null, null, null)) .doOnError(ApiException.class, throwable -> LOG.error("Error to list ConfigMaps in the namespace [" + configuration.getNamespace() + "]: " + throwable.getResponseBody(), throwable)) .onErrorResume(throwable -> exceptionOnPodLabelsMissing ? Mono.error(throwable) @@ -297,7 +297,7 @@ private Publisher getPropertySourcesFromSecrets() { Flux secretListFlowable = computePodLabelSelector(client, configuration.getSecrets().getPodLabels(), configuration.getNamespace(), labels, exceptionOnPodLabelsMissing) - .flatMap(labelSelector -> client.listNamespacedSecret(configuration.getNamespace(), null, null, null, null, labelSelector, null, null, null, null)) + .flatMap(labelSelector -> client.listNamespacedSecret(configuration.getNamespace(), null, null, null, null, labelSelector, null, null, null, null, null)) .doOnError(ApiException.class, throwable -> LOG.error("Failed to list Secrets in the namespace [" + configuration.getNamespace() + "]: " + throwable.getResponseBody(), throwable)) .onErrorResume(throwable -> exceptionOnPodLabelsMissing ? Mono.error(throwable) diff --git a/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceEndpointProvider.java b/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceEndpointProvider.java index e73d18492..8eb563525 100644 --- a/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceEndpointProvider.java +++ b/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceEndpointProvider.java @@ -69,7 +69,7 @@ public Flux listEndpoints(String namespace) { LOG.trace("Using API to fetch endpoints from namespace [{}]", namespace); } - return client.listNamespacedEndpoints(namespace, null, null, null, null, null, null, null, null, null) + return client.listNamespacedEndpoints(namespace, null, null, null, null, null, null, null, null, null, null) .doOnError(ApiException.class, throwable -> LOG.error("Failed to list Endpoints from namespace [" + namespace + "]: " + throwable.getResponseBody(), throwable)) .flatMapIterable(V1EndpointsList::getItems); } diff --git a/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceServiceProvider.java b/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceServiceProvider.java index ccef2da27..34df43137 100644 --- a/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceServiceProvider.java +++ b/kubernetes-discovery-client/src/main/java/io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceServiceProvider.java @@ -69,7 +69,7 @@ public Flux listServices(String namespace) { LOG.trace("Using API to fetch services from namespace [{}]", namespace); } - return client.listNamespacedService(namespace, null, null, null, null, null, null, null, null, null) + return client.listNamespacedService(namespace, null, null, null, null, null, null, null, null, null, null) .doOnError(ApiException.class, throwable -> LOG.error("Failed to list Services from namespace [" + namespace + "]: " + throwable.getResponseBody(), throwable)) .flatMapIterable(V1ServiceList::getItems); }