fix (#1040)

spring-cloud · Jul 5, 2022 · 74258a8 · 74258a8
1 parent 87f6744
commit 74258a8
Show file tree

Hide file tree

Showing 30 changed files with 57 additions and 159 deletions.
diff --git a/...pringframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java b/...pringframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java
@@ -19,8 +19,6 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
-import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
 import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesConfigEnabled;
 import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesEnabled;
@@ -43,7 +41,6 @@
 @ConditionalOnKubernetesEnabled
 @AutoConfigureAfter(KubernetesBootstrapConfiguration.class)
 @Import({ KubernetesCommonsAutoConfiguration.class, KubernetesClientAutoConfiguration.class })
-@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 public class KubernetesClientBootstrapConfiguration {
 
 	@Bean

diff --git a/...framework/cloud/kubernetes/client/config/KubernetesClientRetryBootstrapConfiguration.java b/...framework/cloud/kubernetes/client/config/KubernetesClientRetryBootstrapConfiguration.java
@@ -20,8 +20,6 @@
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
-import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
 import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesEnabled;
 import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration;
@@ -44,7 +42,6 @@
 @AutoConfigureAfter(KubernetesBootstrapConfiguration.class)
 @AutoConfigureBefore(KubernetesClientBootstrapConfiguration.class)
 @Import({ KubernetesCommonsAutoConfiguration.class, KubernetesClientAutoConfiguration.class })
-@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 @ConditionalOnKubernetesConfigOrSecretsRetryEnabled
 public class KubernetesClientRetryBootstrapConfiguration {
 

diff --git a/...framework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java b/...framework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfigurationTests.java
@@ -55,7 +55,7 @@ void configAndSecretsBeansAreNotPresent() {
 
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
 			properties = { "spring.cloud.kubernetes.secrets.enabled=true",
-					"spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" })
+					"spring.cloud.kubernetes.client.namespace=default" })
 	@Nested
 	class KubernetesEnabledOnPurpose {
 
@@ -71,8 +71,7 @@ void configAndSecretsBeansArePresent() {
 	}
 
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
-			properties = { "spring.cloud.kubernetes.client.namespace=default",
-					"spring.main.cloud-platform=KUBERNETES" })
+			properties = { "spring.cloud.kubernetes.client.namespace=default" })
 	@Nested
 	class KubernetesEnabled {
 
@@ -88,7 +87,7 @@ void configAndSecretsBeansArePresent() {
 	}
 
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
-			properties = { "spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES" })
+			properties = { "spring.cloud.kubernetes.config.enabled=false" })
 	@Nested
 	class KubernetesEnabledConfigDisabled {
 
@@ -105,7 +104,7 @@ void secretsOnlyPresent() {
 
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
 			properties = { "spring.cloud.kubernetes.secrets.enabled=false",
-					"spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" })
+					"spring.cloud.kubernetes.client.namespace=default" })
 	@Nested
 	class KubernetesEnabledSecretsDisabled {
 
@@ -122,7 +121,7 @@ void secretsOnlyPresent() {
 
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
 			properties = { "spring.cloud.kubernetes.secrets.enabled=false",
-					"spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES" })
+					"spring.cloud.kubernetes.config.enabled=false" })
 	@Nested
 	class KubernetesEnabledSecretsAndConfigDisabled {
 
@@ -137,40 +136,4 @@ void secretsOnlyPresent() {
 
 	}
 
-	// tests that @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) has the desired
-	// effect, meaning when it is enabled, both property sources are present
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
-			properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=abc" })
-	@Nested
-	class KubernetesClientBootstrapConfigurationInsideK8s {
-
-		@Autowired
-		ConfigurableApplicationContext context;
-
-		@Test
-		public void bothPresent() {
-			assertThat(context.getBeanNamesForType(KubernetesClientConfigMapPropertySourceLocator.class)).hasSize(1);
-			assertThat(context.getBeanNamesForType(KubernetesClientSecretsPropertySourceLocator.class)).hasSize(1);
-		}
-
-	}
-
-	// tests that @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) has the desired
-	// effect, meaning when it is disabled, no property source bean is present
-	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class,
-			properties = { "kubernetes.informer.enabled=false" })
-	@Nested
-	class KubernetesClientBootstrapConfigurationNotInsideK8s {
-
-		@Autowired
-		ConfigurableApplicationContext context;
-
-		@Test
-		public void bothMissing() {
-			assertThat(context.getBeanNamesForType(KubernetesClientConfigMapPropertySourceLocator.class)).hasSize(0);
-			assertThat(context.getBeanNamesForType(KubernetesClientSecretsPropertySourceLocator.class)).hasSize(0);
-		}
-
-	}
-
 }
diff --git a/...kubernetes/client/config/KubernetesClientConfigMapIncludeProfileSpecificSourcesTests.java b/...kubernetes/client/config/KubernetesClientConfigMapIncludeProfileSpecificSourcesTests.java
@@ -40,7 +40,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		classes = IncludeProfileSpecificSourcesApp.class,
 		properties = { "spring.cloud.bootstrap.name=include-profile-specific-sources",
-				"include.profile.specific.sources=true", "spring.main.cloud-platform=KUBERNETES" })
+				"include.profile.specific.sources=true" })
 @AutoConfigureWebTestClient
 @ActiveProfiles("dev")
 class KubernetesClientConfigMapIncludeProfileSpecificSourcesTests {

diff --git a/...gframework/cloud/kubernetes/client/config/KubernetesClientConfigMapNameAsPrefixTests.java b/...gframework/cloud/kubernetes/client/config/KubernetesClientConfigMapNameAsPrefixTests.java
@@ -37,8 +37,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = WithPrefixApp.class,
-		properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix", "config.map.name.as.prefix.stub=true",
-				"spring.main.cloud-platform=KUBERNETES" })
+		properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix", "config.map.name.as.prefix.stub=true" })
 @AutoConfigureWebTestClient
 public class KubernetesClientConfigMapNameAsPrefixTests {
 

diff --git a/...ud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java b/...ud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorRetryTests.java
@@ -120,7 +120,7 @@ public void afterEach() {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
 					"spring.cloud.kubernetes.config.fail-fast=true",
-					"spring.cloud.kubernetes.config.retry.max-attempts=5", "spring.main.cloud-platform=KUBERNETES" },
+					"spring.cloud.kubernetes.config.retry.max-attempts=5" },
 			classes = App.class)
 	class ConfigRetryEnabled {
 
@@ -202,7 +202,7 @@ public void locateShouldRetryAndFail() {
 	@Nested
 	@SpringBootTest(
 			webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
-					"spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" },
+					"spring.cloud.kubernetes.client.namespace=default" },
 			classes = App.class)
 	class ConfigFailFastDisabled {
 
@@ -227,7 +227,7 @@ public void locateShouldNotRetry() {
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
 					"spring.cloud.kubernetes.config.fail-fast=true",
 					"spring.cloud.kubernetes.config.retry.enabled=false",
-					"spring.cloud.kubernetes.secrets.fail-fast=true", "spring.main.cloud-platform=KUBERNETES" },
+					"spring.cloud.kubernetes.secrets.fail-fast=true" },
 			classes = App.class)
 	class ConfigRetryDisabledButSecretsRetryEnabled {
 
@@ -264,7 +264,7 @@ public void locateShouldFailWithoutRetrying() {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
 					"spring.cloud.kubernetes.config.fail-fast=true",
-					"spring.cloud.kubernetes.config.retry.enabled=false", "spring.main.cloud-platform=KUBERNETES" },
+					"spring.cloud.kubernetes.config.retry.enabled=false" },
 			classes = App.class)
 	class ConfigFailFastEnabledButRetryDisabled {
 
@@ -321,8 +321,7 @@ public void afterEach() {
 		@Test
 		public void doesNotContainRetryableConfigMapPropertySourceLocator() throws Exception {
 			stubFor(get(API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
-			setup("debug=true", "spring.main.cloud-platform=KUBERNETES",
-					"spring.cloud.kubernetes.test.enable-retry=true");
+			setup("debug=true", "spring.cloud.kubernetes.test.enable-retry=true");
 			assertThat(context.containsBean("retryableConfigMapPropertySourceLocator")).isFalse();
 		}
 

diff --git a/...loud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java b/...loud/kubernetes/client/config/KubernetesClientSecretsPropertySourceLocatorRetryTests.java
@@ -120,7 +120,7 @@ public void afterEach() {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
 			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true",
 			"spring.cloud.kubernetes.secrets.retry.max-attempts=5", "spring.cloud.kubernetes.secrets.name=my-secret",
-			"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
+			"spring.cloud.kubernetes.secrets.enable-api=true" },
 			classes = App.class)
 	class SecretsRetryEnabled {
 
@@ -202,8 +202,7 @@ public void locateShouldRetryAndFail() {
 	@Nested
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 			properties = { "spring.cloud.kubernetes.client.namespace=default",
-					"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true",
-					"spring.main.cloud-platform=KUBERNETES" },
+					"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true" },
 			classes = App.class)
 	class SecretsFailFastDisabled {
 
@@ -229,7 +228,7 @@ public void locateShouldNotRetry() {
 					"spring.cloud.kubernetes.secrets.fail-fast=true",
 					"spring.cloud.kubernetes.secrets.retry.enabled=false",
 					"spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret",
-					"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
+					"spring.cloud.kubernetes.secrets.enable-api=true" },
 			classes = App.class)
 	class SecretsRetryDisabledButConfigRetryEnabled {
 
@@ -266,7 +265,7 @@ public void locateShouldFailWithoutRetrying() {
 	@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
 			"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.fail-fast=true",
 			"spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret",
-			"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" },
+			"spring.cloud.kubernetes.secrets.enable-api=true" },
 			classes = App.class)
 	class SecretsFailFastEnabledButRetryDisabled {
 
@@ -323,7 +322,7 @@ public void afterEach() {
 		@Test
 		public void doesNotContainRetryableSecretsPropertySourceLocator() throws Exception {
 			stubFor(get(API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
-			setup("debug=true", "spring.main.cloud-platform=KUBERNETES",
+			setup("debug=true",
 					"spring.cloud.kubernetes.test.enable-retry=true", "spring.cloud.kubernetes.secrets.name=my-secret",
 					"spring.cloud.kubernetes.secrets.enable-api=true");
 			assertThat(context.containsBean("retryableSecretsPropertySourceLocator")).isFalse();

diff --git a/...ud/kubernetes/client/config/reload/KubernetesClientConfigReloadAutoConfigurationTest.java b/...ud/kubernetes/client/config/reload/KubernetesClientConfigReloadAutoConfigurationTest.java
@@ -152,8 +152,7 @@ public void kubernetesReloadEnabledButSecretAndConfigDisabled() throws Exception
 
 	@Test
 	public void kubernetesReloadEnabledWithPolling() throws Exception {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling",
-				"spring.main.cloud-platform=KUBERNETES");
+		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling");
 		assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue();
 		assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue();
 		assertThat(context.containsBean("configMapPropertyChangePollingWatcher")).isTrue();
@@ -164,8 +163,7 @@ public void kubernetesReloadEnabledWithPolling() throws Exception {
 
 	@Test
 	public void kubernetesReloadEnabledWithEvent() throws Exception {
-		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event",
-				"spring.main.cloud-platform=KUBERNETES");
+		setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event");
 		assertThat(context.containsBean("configMapPropertyChangePollingWatcher")).isFalse();
 		assertThat(context.containsBean("secretsPropertyChangePollingWatcher")).isFalse();
 		assertThat(context.containsBean("configMapPropertyChangeEventWatcher")).isTrue();
@@ -176,21 +174,21 @@ public void kubernetesReloadEnabledWithEvent() throws Exception {
 
 	@Test
 	public void kubernetesConfigAndSecretEnabledByDefault() throws Exception {
-		setup("spring.main.cloud-platform=KUBERNETES");
+		setup();
 		assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue();
 		assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue();
 	}
 
 	@Test
 	public void kubernetesConfigEnabledButSecretDisabled() throws Exception {
-		setup("spring.cloud.kubernetes.secrets.enabled=false", "spring.main.cloud-platform=KUBERNETES");
+		setup("spring.cloud.kubernetes.secrets.enabled=false");
 		assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue();
 		assertThat(context.containsBean("secretsPropertySourceLocator")).isFalse();
 	}
 
 	@Test
 	public void kubernetesSecretsEnabledButConfigDisabled() throws Exception {
-		setup("spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES");
+		setup("spring.cloud.kubernetes.config.enabled=false");
 		assertThat(context.containsBean("configMapPropertySourceLocator")).isFalse();
 		assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue();
 	}

diff --git a/...va/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfiguration.java b/...va/org/springframework/cloud/kubernetes/fabric8/config/Fabric8BootstrapConfiguration.java
@@ -22,8 +22,6 @@
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
-import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesConfigEnabled;
 import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesEnabled;
 import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesSecretsEnabled;
@@ -50,7 +48,6 @@
 @Import({ KubernetesCommonsAutoConfiguration.class, Fabric8AutoConfiguration.class })
 @ConditionalOnClass({ ConfigMap.class, Secret.class })
 @AutoConfigureAfter(KubernetesBootstrapConfiguration.class)
-@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 public class Fabric8BootstrapConfiguration {
 
 	@Bean

diff --git a/...g/springframework/cloud/kubernetes/fabric8/config/Fabric8RetryBootstrapConfiguration.java b/...g/springframework/cloud/kubernetes/fabric8/config/Fabric8RetryBootstrapConfiguration.java
@@ -23,8 +23,6 @@
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
-import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.cloud.kubernetes.commons.ConditionalOnKubernetesEnabled;
 import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
@@ -48,7 +46,6 @@
 @Import({ KubernetesCommonsAutoConfiguration.class, Fabric8AutoConfiguration.class })
 @ConditionalOnClass({ ConfigMap.class, Secret.class })
 @AutoConfigureAfter(KubernetesBootstrapConfiguration.class)
-@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 @ConditionalOnKubernetesConfigOrSecretsRetryEnabled
 public class Fabric8RetryBootstrapConfiguration {
 

diff --git a/...work/cloud/kubernetes/fabric8/config/ConfigMapWithIncludeProfileSpecificSourcesTests.java b/...work/cloud/kubernetes/fabric8/config/ConfigMapWithIncludeProfileSpecificSourcesTests.java
@@ -42,8 +42,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		classes = IncludeProfileSpecificSourcesApp.class,
-		properties = { "spring.cloud.bootstrap.name=include-profile-specific-sources",
-				"spring.main.cloud-platform=KUBERNETES" })
+		properties = { "spring.cloud.bootstrap.name=include-profile-specific-sources" })
 @AutoConfigureWebTestClient
 @EnableKubernetesMockClient(crud = true, https = false)
 @ActiveProfiles("dev")

diff --git a/...st/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java b/...st/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapWithPrefixTests.java
@@ -40,8 +40,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = WithPrefixApp.class,
-		properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix",
-				"spring.main.cloud-platform=KUBERNETES" })
+		properties = { "spring.cloud.bootstrap.name=config-map-name-as-prefix"})
 @AutoConfigureWebTestClient
 @EnableKubernetesMockClient(crud = true, https = false)
 class ConfigMapWithPrefixTests {

diff --git a/...ava/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsFromFilePathsTests.java b/...ava/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsFromFilePathsTests.java
@@ -42,8 +42,7 @@
 				"spring.cloud.kubernetes.config.enableApi=false",
 				"spring.cloud.kubernetes.config.paths=" + ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_FULL_PATH + ","
 						+ ConfigMapsFromFilePathsTests.SECOND_FILE_NAME_FULL_PATH + ","
-						+ ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_DUPLICATED_FULL_PATH,
-				"spring.main.cloud-platform=KUBERNETES" })
+						+ ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_DUPLICATED_FULL_PATH })
 @EnableKubernetesMockClient(crud = true, https = false)
 public class ConfigMapsFromFilePathsTests {
 

diff --git a/...c/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsMixedTests.java b/...c/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsMixedTests.java
@@ -43,8 +43,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
 		properties = { "spring.application.name=" + ConfigMapsMixedTests.APPLICATION_NAME,
 				"spring.cloud.kubernetes.config.enableApi=true",
-				"spring.cloud.kubernetes.config.paths=" + ConfigMapsMixedTests.FILE_NAME_FULL_PATH,
-				"spring.main.cloud-platform=KUBERNETES" })
+				"spring.cloud.kubernetes.config.paths=" + ConfigMapsMixedTests.FILE_NAME_FULL_PATH })
 @EnableKubernetesMockClient(crud = true, https = false)
 public class ConfigMapsMixedTests {
 

diff --git a/...ig/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java b/...ig/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigMapsTests.java
@@ -41,8 +41,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
-		properties = { "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false",
-				"spring.main.cloud-platform=KUBERNETES" })
+		properties = { "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false"})
 @AutoConfigureWebTestClient
 @EnableKubernetesMockClient(crud = true, https = false)
 public class ConfigMapsTests {

diff --git a/...pringframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java b/...pringframework/cloud/kubernetes/fabric8/config/ConfigMapsWithActiveProfilesNameTests.java
@@ -43,7 +43,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT, classes = App.class,
 		properties = { "spring.application.name=configmap-with-active-profile-name-example",
-				"spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" })
+				"spring.cloud.kubernetes.reload.enabled=false" })
 @ActiveProfiles("development")
 @AutoConfigureWebTestClient
 @EnableKubernetesMockClient(crud = true, https = false)

diff --git a/...springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java b/...springframework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfileExpressionTests.java
@@ -41,7 +41,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
 		properties = { "spring.application.name=configmap-with-profile-example",
-				"spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" })
+				"spring.cloud.kubernetes.reload.enabled=false" })
 @ActiveProfiles({ "production", "us-east" })
 @AutoConfigureWebTestClient
 @EnableKubernetesMockClient(crud = true, https = false)

diff --git a/...framework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java b/...framework/cloud/kubernetes/fabric8/config/ConfigMapsWithProfilesNoActiveProfileTests.java
@@ -41,7 +41,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class,
 		properties = { "spring.application.name=configmap-with-profile-no-active-profiles-example",
-				"spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" })
+				"spring.cloud.kubernetes.reload.enabled=false" })
 @AutoConfigureWebTestClient
 @EnableKubernetesMockClient(crud = true, https = false)
 public class ConfigMapsWithProfilesNoActiveProfileTests {