Skip to content

Commit 7d28597

Browse files
trying existing bean
1 parent 67679ed commit 7d28597

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/java/org/springframework/cloud/kubernetes/configserver/KubernetesConfigServerAutoConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ public class KubernetesConfigServerAutoConfiguration {
6161
static class KubernetesFactoryConfig {
6262

6363
@Bean
64-
public KubernetesEnvironmentRepositoryFactory kubernetesEnvironmentRepositoryFactory(CoreV1Api coreV1Api,
65-
List<KubernetesPropertySourceSupplier> kubernetesPropertySourceSupplierList) {
66-
return new KubernetesEnvironmentRepositoryFactory(coreV1Api, kubernetesPropertySourceSupplierList);
64+
public KubernetesEnvironmentRepositoryFactory kubernetesEnvironmentRepositoryFactory(
65+
KubernetesEnvironmentRepository kubernetesEnvironmentRepository) {
66+
return new KubernetesEnvironmentRepositoryFactory(kubernetesEnvironmentRepository);
6767
}
68-
6968
}
7069

7170
@Bean
7271
@Profile("kubernetes")
7372
public EnvironmentRepository kubernetesEnvironmentRepository(CoreV1Api coreV1Api,
7473
List<KubernetesPropertySourceSupplier> kubernetesPropertySourceSuppliers,
7574
KubernetesNamespaceProvider kubernetesNamespaceProvider) {
75+
System.out.println("Creating KubernetesEnvironmentRepository bean...");
7676
return new KubernetesEnvironmentRepository(coreV1Api, kubernetesPropertySourceSuppliers,
7777
kubernetesNamespaceProvider.getNamespace());
7878
}
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,20 @@
11
package org.springframework.cloud.kubernetes.configserver;
22

3-
import io.kubernetes.client.openapi.apis.CoreV1Api;
43
import org.springframework.cloud.config.server.environment.EnvironmentRepositoryFactory;
54
import org.springframework.stereotype.Component;
65

7-
import java.util.List;
8-
import java.util.stream.Collectors;
9-
import java.util.stream.Stream;
10-
116
@Component
127
public class KubernetesEnvironmentRepositoryFactory
138
implements EnvironmentRepositoryFactory<KubernetesEnvironmentRepository, KubernetesConfigServerProperties> {
149

15-
private final CoreV1Api coreV1Api;
16-
private final List<KubernetesPropertySourceSupplier> kubernetesPropertySourceSuppliers;
10+
private final KubernetesEnvironmentRepository kubernetesEnvironmentRepository;
1711

18-
public KubernetesEnvironmentRepositoryFactory(CoreV1Api coreV1Api,
19-
List<KubernetesPropertySourceSupplier> kubernetesPropertySourceSuppliers) {
20-
this.coreV1Api = coreV1Api;
21-
this.kubernetesPropertySourceSuppliers = kubernetesPropertySourceSuppliers;
12+
public KubernetesEnvironmentRepositoryFactory(KubernetesEnvironmentRepository kubernetesEnvironmentRepository) {
13+
this.kubernetesEnvironmentRepository = kubernetesEnvironmentRepository;
2214
}
2315

2416
@Override
2517
public KubernetesEnvironmentRepository build(KubernetesConfigServerProperties environmentProperties) {
26-
String combinedNamespaces = Stream.of(environmentProperties.getSecretsNamespaces(), environmentProperties.getConfigMapNamespaces())
27-
.filter(ns -> ns != null && !ns.isEmpty())
28-
.collect(Collectors.joining(","));
29-
return new KubernetesEnvironmentRepository(coreV1Api, kubernetesPropertySourceSuppliers, combinedNamespaces);
18+
return kubernetesEnvironmentRepository;
3019
}
3120
}

0 commit comments

Comments
 (0)