Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32880 from lukahartwig

Browse Source 
* pr/32880:
  Add Nomad to cloud platforms

Closes gh-32880
This commit is contained in:
Moritz Halbritter
2023-01-31 14:11:30 +01:00
parent 3882656d1d 6d05cf3efb
commit a5d1b672d3
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
View File

@@ -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<>();