Browse Source

Merge pull request #32880 from lukahartwig

* pr/32880:
  Add Nomad to cloud platforms

Closes gh-32880
pull/34049/head
Moritz Halbritter 3 years ago
parent
commit
a5d1b672d3
  1. 12
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java
  2. 8
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/CloudPlatformTests.java

12
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java

@ -85,6 +85,18 @@ public enum CloudPlatform { @@ -85,6 +85,18 @@ public enum CloudPlatform {
},
/**
* Nomad platform.
*/
NOMAD {
@Override
public boolean isDetected(Environment environment) {
return environment.containsProperty("NOMAD_ALLOC_ID");
}
},
/**
* Kubernetes platform.
*/

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/CloudPlatformTests.java

@ -86,6 +86,14 @@ class CloudPlatformTests { @@ -86,6 +86,14 @@ class CloudPlatformTests {
assertThat(platform.isActive(environment)).isTrue();
}
@Test
void getActiveWhenHasNomadAllocIdShouldReturnNomad() {
Environment environment = new MockEnvironment().withProperty("NOMAD_ALLOC_ID", "---");
CloudPlatform platform = CloudPlatform.getActive(environment);
assertThat(platform).isEqualTo(CloudPlatform.NOMAD);
assertThat(platform.isActive(environment)).isTrue();
}
@Test
void getActiveWhenHasKubernetesServiceHostAndPortShouldReturnKubernetes() {
Map<String, Object> envVars = new HashMap<>();

Loading…
Cancel
Save