Skip to content

Commit 3de3d4d

Browse files
authored
Merge pull request #2111 from wind57/rename-beans-for-fabric8-leader-election
2 parents b149dd9 + 688cedc commit 3de3d4d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class Fabric8LeaderElectionAutoConfiguration {
6767
@Bean
6868
@ConditionalOnClass(InfoContributor.class)
6969
@ConditionalOnEnabledInfoContributor("leader.election")
70-
Fabric8LeaderElectionInfoContributor leaderElectionInfoContributor(String candidateIdentity,
70+
Fabric8LeaderElectionInfoContributor fabric8LeaderElectionInfoContributor(String candidateIdentity,
7171
LeaderElectionConfig leaderElectionConfig, KubernetesClient fabric8KubernetesClient) {
7272
return new Fabric8LeaderElectionInfoContributor(candidateIdentity, leaderElectionConfig,
7373
fabric8KubernetesClient);
@@ -83,7 +83,7 @@ Fabric8LeaderElectionInitiator fabric8LeaderElectionInitiator(String candidateId
8383
}
8484

8585
@Bean
86-
BooleanSupplier podReadySupplier(KubernetesClient fabric8KubernetesClient, String candidateIdentity,
86+
BooleanSupplier fabric8PodReadySupplier(KubernetesClient fabric8KubernetesClient, String candidateIdentity,
8787
String podNamespace) {
8888
return () -> {
8989
Pod pod = fabric8KubernetesClient.pods().inNamespace(podNamespace).withName(candidateIdentity).get();
@@ -107,7 +107,7 @@ LeaderElectionConfig fabric8LeaderElectionConfig(LeaderElectionProperties proper
107107

108108
@Bean
109109
@ConditionalOnMissingBean
110-
Lock lock(KubernetesClient fabric8KubernetesClient, LeaderElectionProperties properties, String candidateIdentity) {
110+
Lock fabric8LeaderElectionLock(KubernetesClient fabric8KubernetesClient, LeaderElectionProperties properties, String candidateIdentity) {
111111
boolean leaseSupported = fabric8KubernetesClient.getApiGroups()
112112
.getGroups()
113113
.stream()

0 commit comments

Comments
 (0)