Refactor last fabric8 integration test package (1) (#1824)

Author: wind57

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

@@ -39,6 +39,7 @@
  */
 class Fabric8DiscoveryAllServicesIT extends Fabric8DiscoveryBase {
 
+
 	private static Service externalServiceName;
 
 	@BeforeAll

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

@@ -35,7 +35,6 @@
 		"spring.cloud.kubernetes.discovery.namespaces[1]=b-uat",
 		"spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches 'a-uat$'",
 		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG"
-
 })
 class Fabric8DiscoveryFilterMatchOneNamespaceIT extends Fabric8DiscoveryBase {
 

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

@@ -35,7 +35,6 @@
 		"spring.cloud.kubernetes.discovery.namespaces[1]=b-uat",
 		"spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches '^.*uat$'",
 		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG"
-
 })
 class Fabric8DiscoveryFilterMatchTwoNamespacesIT extends Fabric8DiscoveryBase {
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapProperties.java

@@ -22,15 +22,15 @@
  * @author wind57
  */
 @ConfigurationProperties("from.properties")
-public class ConfigMapProperties {
+class ConfigMapProperties {
 
 	private String key;
 
-	public String getKey() {
+	String getKey() {
 		return key;
 	}
 
-	public void setKey(String key1) {
+	void setKey(String key1) {
 		this.key = key1;
 	}
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Controller.java

@@ -23,51 +23,17 @@
  * @author wind57
  */
 @RestController
-public class Controller {
-
-	private final LeftProperties leftProperties;
-
-	private final RightProperties rightProperties;
-
-	private final RightWithLabelsProperties rightWithLabelsProperties;
+class Controller {
 
 	private final ConfigMapProperties configMapProperties;
 
-	private final SecretProperties secretProperties;
-
-	public Controller(LeftProperties leftProperties, RightProperties rightProperties,
-			RightWithLabelsProperties rightWithLabelsProperties, ConfigMapProperties configMapProperties,
-			SecretProperties secretProperties) {
-		this.leftProperties = leftProperties;
-		this.rightProperties = rightProperties;
-		this.rightWithLabelsProperties = rightWithLabelsProperties;
+	Controller(ConfigMapProperties configMapProperties) {
 		this.configMapProperties = configMapProperties;
-		this.secretProperties = secretProperties;
-	}
-
-	@GetMapping("/left")
-	public String left() {
-		return leftProperties.getValue();
-	}
-
-	@GetMapping("/right")
-	public String right() {
-		return rightProperties.getValue();
-	}
-
-	@GetMapping("/with-label")
-	public String witLabel() {
-		return rightWithLabelsProperties.getValue();
 	}
 
 	@GetMapping("/key")
-	public String key() {
+	String key() {
 		return configMapProperties.getKey();
 	}
 
-	@GetMapping("/key-from-secret")
-	public String keyFromSecret() {
-		return secretProperties.getKey();
-	}
-
 }

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml

@@ -14,4 +14,3 @@ spring:
           - /tmp/application.properties
   config:
     import: "kubernetes:"
-

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml

@@ -1,7 +1,3 @@
-logging:
-  level:
-    root: DEBUG
-
 spring:
   application:
     name: poll-reload

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-one.yaml

@@ -1,16 +1,14 @@
-logging:
-  level:
-    root: DEBUG
-
 spring:
   application:
     name: event-reload
   cloud:
     kubernetes:
+      secrets:
+        enabled: false
       reload:
         enabled: true
-        strategy: shutdown
+        strategy: refresh
         mode: event
         namespaces:
-          - left
+          - right
         monitoring-config-maps: true

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-two.yaml

@@ -1,16 +1,15 @@
-logging:
-  level:
-    root: DEBUG
-
 spring:
   application:
     name: event-reload
   cloud:
     kubernetes:
       reload:
         enabled: true
-        strategy: shutdown
+        strategy: refresh
         mode: event
         namespaces:
           - right
         monitoring-config-maps: true
+
+  main:
+    cloud-platform: kubernetes

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-secret.yaml

@@ -1,7 +1,3 @@
-logging:
-  level:
-    root: DEBUG
-
 spring:
   application:
     name: event-reload
@@ -12,11 +8,18 @@ spring:
       reload:
         enabled: true
         monitoring-secrets: true
-        strategy: shutdown
+        strategy: refresh
         mode: event
         monitoring-configMaps: false
+      config:
+        enabled: false
+        enable-api: false
       secrets:
         enabled: true
         enable-api: true
 
+  # otherwise we can't refresh in the test
+  main:
+    cloud-platform: kubernetes
+