Merge branch 'clean-up-after-breaking-changes' into refactor_without_k3s

Author: wind57

spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/configdata/KubernetesConfigDataLocationResolverTests.java

@@ -289,6 +289,11 @@ void testResolveProfileSpecificSix() {
 		Mockito.when(RESOLVER_CONTEXT.getBinder()).thenReturn(binder);
 		Mockito.when(RESOLVER_CONTEXT.getBootstrapContext()).thenReturn(new DefaultBootstrapContext());
 
+		Profiles profiles = Mockito.mock(Profiles.class);
+		ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
+		storePropertiesResolver.resolveProfileSpecific(RESOLVER_CONTEXT,
+			configDataLocation, profiles);
+
 		// on the other hand, @Default will be picked here
 		Assertions.assertThat(storePropertiesResolver.configMapConfigProperties.enabled()).isTrue();
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/TestAssertions.java

@@ -111,7 +111,7 @@ static void assertAllServices(DiscoveryClient discoveryClient) {
 			.isEqualTo(Map.of("k8s_namespace", "default", "type", "ExternalName"));
 		assertThat(externalNameInstance.isSecure()).isFalse();
 		assertThat(externalNameInstance.getUri().toASCIIString()).isEqualTo("spring.io");
-		assertThat(externalNameInstance.getScheme()).isEqualTo("http");
+		assertThat(externalNameInstance.getScheme()).isNull();
 	}
 
 	/**

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySimpleIT.java

@@ -35,6 +35,7 @@
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
+import org.springframework.cloud.kubernetes.commons.discovery.KubernetesExternalNameServiceInstance;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
 import org.springframework.context.annotation.Bean;
@@ -133,7 +134,7 @@ private void testCustomAnnotation(List<ServiceInstance> instances) {
 	}
 
 	private void testExternalNameService(DiscoveryClient discoveryClient) {
-		DefaultKubernetesServiceInstance externalNameService = (DefaultKubernetesServiceInstance) discoveryClient
+		KubernetesExternalNameServiceInstance externalNameService = (KubernetesExternalNameServiceInstance) discoveryClient
 			.getInstances("external-name-service")
 			.get(0);
 
@@ -144,7 +145,7 @@ private void testExternalNameService(DiscoveryClient discoveryClient) {
 			.containsAllEntriesOf(Map.of("k8s_namespace", "default", "type", "ExternalName"));
 		assertThat(externalNameService.isSecure()).isFalse();
 		assertThat(externalNameService.getUri().toASCIIString()).isEqualTo("spring.io");
-		assertThat(externalNameService.getScheme()).isEqualTo("http");
+		assertThat(externalNameService.getScheme()).isNull();
 	}
 
 	// https://github.com/spring-cloud/spring-cloud-kubernetes/issues/1286