Merge branch '3.0.x'

spring-cloud-kubernetes-integration-tests/pom.xml

@@ -61,9 +61,12 @@
 		<module>spring-cloud-kubernetes-fabric8-client-reload</module>
 		<module>spring-cloud-kubernetes-k8s-client-reload</module>
 
+		<!-- discovery using discovery server -->
+		<!-- since discovery controller is based on k8s-client, we do not have a fabric8 module -->
+		<module>spring-cloud-kubernetes-k8s-client-discovery-server</module>
+
 		<module>spring-cloud-kubernetes-fabric8-istio-it</module>
 
-		<module>spring-cloud-kubernetes-discoveryclient-it</module>
 		<module>spring-cloud-kubernetes-client-loadbalancer-it</module>
 		<module>spring-cloud-kubernetes-configuration-watcher-it</module>
         <module>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</module>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/resources/client/spring-cloud-kubernetes-discoveryclient-it-service.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: spring-cloud-kubernetes-discoveryclient-it
-  name: spring-cloud-kubernetes-discoveryclient-it
-spec:
-  ports:
-    - name: http
-      port: 8080
-      targetPort: 8080
-  selector:
-    app: spring-cloud-kubernetes-discoveryclient-it
-  type: ClusterIP

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml

@@ -9,7 +9,7 @@
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-kubernetes-discoveryclient-it</artifactId>
+	<artifactId>spring-cloud-kubernetes-k8s-client-discovery-server</artifactId>
 
 	<dependencies>
 		<dependency>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java

@@ -56,7 +56,7 @@ class DiscoveryClientIT {
 					"template": {
 						"spec": {
 							"containers": [{
-								"name": "spring-cloud-kubernetes-discoveryclient-it",
+								"name": "spring-cloud-kubernetes-k8s-client-discovery-server",
 								"image": "image_name_here",
 								"env": [
 								{
@@ -77,7 +77,7 @@ class DiscoveryClientIT {
 					"template": {
 						"spec": {
 							"containers": [{
-								"name": "spring-cloud-kubernetes-discoveryserver",
+								"name": "spring-cloud-kubernetes-k8s-client-discovery-server",
 								"image": "image_name_here",
 								"env": [
 								{
@@ -92,7 +92,8 @@ class DiscoveryClientIT {
 			}
 						""";
 
-	private static final Map<String, String> POD_LABELS = Map.of("app", "spring-cloud-kubernetes-discoveryclient-it");
+	private static final Map<String, String> POD_LABELS = Map.of("app",
+			"spring-cloud-kubernetes-k8s-client-discovery-server");
 
 	private static final Map<String, String> POD_LABELS_DISCOVERY = Map.of("app",
 			"spring-cloud-kubernetes-discoveryserver");
@@ -101,7 +102,7 @@ class DiscoveryClientIT {
 
 	private static final String DISCOVERY_SERVER_APP_NAME = "spring-cloud-kubernetes-discoveryserver";
 
-	private static final String SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME = "spring-cloud-kubernetes-discoveryclient-it";
+	private static final String SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME = "spring-cloud-kubernetes-k8s-client-discovery-server";
 
 	private static final String NAMESPACE = "default";
 
@@ -170,8 +171,8 @@ class DiscoveryClientIT {
 		testHealth();
 
 		patchForNamespaceFilter(
-				"docker.io/springcloud/spring-cloud-kubernetes-discoveryclient-it:" + Commons.pomVersion(),
-				"spring-cloud-kubernetes-discoveryclient-it-deployment", NAMESPACE);
+				"docker.io/springcloud/spring-cloud-kubernetes-k8s-client-discovery-server:" + Commons.pomVersion(),
+				"spring-cloud-kubernetes-k8s-client-discovery-server-deployment", NAMESPACE);
 		patchForAllNamespaces("docker.io/springcloud/spring-cloud-kubernetes-discoveryserver:" + Commons.pomVersion(),
 				"spring-cloud-kubernetes-discoveryserver-deployment", NAMESPACE);
 		testNamespaceDiscoveryClient();

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/resources/client/spring-cloud-kubernetes-discoveryclient-it-deployment.yaml

@@ -1,20 +1,20 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: spring-cloud-kubernetes-discoveryclient-it-deployment
+  name: spring-cloud-kubernetes-k8s-client-discovery-server-deployment
 spec:
   selector:
     matchLabels:
-      app: spring-cloud-kubernetes-discoveryclient-it
+      app: spring-cloud-kubernetes-k8s-client-discovery-server
   template:
     metadata:
       labels:
-        app: spring-cloud-kubernetes-discoveryclient-it
+        app: spring-cloud-kubernetes-k8s-client-discovery-server
     spec:
       serviceAccountName: spring-cloud-kubernetes-serviceaccount
       containers:
-        - name: spring-cloud-kubernetes-discoveryclient-it
-          image: docker.io/springcloud/spring-cloud-kubernetes-discoveryclient-it
+        - name: spring-cloud-kubernetes-k8s-client-discovery-server
+          image: docker.io/springcloud/spring-cloud-kubernetes-k8s-client-discovery-server
           imagePullPolicy: IfNotPresent
           readinessProbe:
             httpGet:

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/resources/client/spring-cloud-kubernetes-discoveryclient-it-ingress.yaml

@@ -11,6 +11,6 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: spring-cloud-kubernetes-discoveryclient-it
+                name: spring-cloud-kubernetes-k8s-client-discovery-server
                 port:
                   number: 8080

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/resources/client/spring-cloud-kubernetes-discoveryclient-it-service.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: spring-cloud-kubernetes-k8s-client-discovery-server
+  name: spring-cloud-kubernetes-k8s-client-discovery-server
+spec:
+  ports:
+    - name: http
+      port: 8080
+      targetPort: 8080
+  selector:
+    app: spring-cloud-kubernetes-k8s-client-discovery-server
+  type: ClusterIP