SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2020-03-31 16:45:47 -04:00
parent c16c8ad266 6d1a4b0557
commit 50823133d0
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2013-2018 the original author or authors.
~ Copyright 2013-2020 the original author or authors.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-failsafe-plugin.version>2.18.1</maven-failsafe-plugin.version>
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<fabric8.maven.plugin.version>3.5.37</fabric8.maven.plugin.version>
<fabric8.maven.plugin.version>4.4.0</fabric8.maven.plugin.version>
<groovy.version>2.4.12</groovy.version>
<restassured.version>3.0.2</restassured.version>
<spock-spring.version>1.1-groovy-2.4</spock-spring.version>

2
spring-cloud-kubernetes-dependencies/pom.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2013-2018 the original author or authors.
~ Copyright 2013-2020 the original author or authors.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.

5
spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java
View File

@@ -280,4 +280,9 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
.collect(Collectors.toList());
}
@Override
public int getOrder() {
return this.properties.getOrder();
}
}

11
spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryProperties.java
View File

@@ -23,6 +23,7 @@ import java.util.Set;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.core.style.ToStringCreator;
/**
@@ -71,6 +72,8 @@ public class KubernetesDiscoveryProperties {
private Metadata metadata = new Metadata();
private int order = DiscoveryClient.DEFAULT_ORDER;
public boolean isEnabled() {
return this.enabled;
}
@@ -135,6 +138,14 @@ public class KubernetesDiscoveryProperties {
this.allNamespaces = allNamespaces;
}
public int getOrder() {
return this.order;
}
public void setOrder(int order) {
this.order = order;
}
@Override
public String toString() {
return new ToStringCreator(this).append("enabled", this.enabled)