Fix 2208 remove enable-reload-filtering ( CAN ONLY GO IN THE NEXT MAJOR )

docs/modules/ROOT/pages/property-source-config/namespace-label-filtering.adoc

@@ -25,27 +25,7 @@ spring:
 
 Such a configuration will make the app watch changes only in the `my-namespace` namespace. Mind that this will
 watch _all_ configmaps/secrets (depending on which one you enable). If you want an even more fine-grained approach,
-you can enable "label-filtering". First we need to enable such support via : `enable-reload-filtering: true`
-
-[source,yaml]
-----
-spring:
-  application:
-    name: event-reload
-  cloud:
-    kubernetes:
-      reload:
-        enabled: true
-        strategy: shutdown
-        mode: event
-        namespaces:
-          - my-namespaces
-        monitoring-config-maps: true
-        enable-reload-filtering: true
-----
-
-What this will do, is watch configmaps/secrets that only have the `spring.cloud.kubernetes.config.informer.enabled: true` label.
-In the next major release this support will be removed and replaced with:
+you can set the labels that are supposed to be watched, via:
 
 [source,yaml]
 ----
@@ -80,7 +60,6 @@ spring:
 | `spring.cloud.kubernetes.reload.mode`                    | `Enum`    | `event`                      | Specifies how to listen for changes in property sources (`event` or `polling`)
 | `spring.cloud.kubernetes.reload.period`                  | `Duration`| `15s`                        | The period for verifying changes when using the `polling` strategy
 | `spring.cloud.kubernetes.reload.namespaces`              | `String[]`|                              | namespaces where we should watch for changes
-| `spring.cloud.kubernetes.reload.enable-reload-filtering` | `String`  |                              | enabled labeled filtering for reload functionality
 |===
 
 Notes:

docs/modules/ROOT/pages/spring-cloud-kubernetes-configuration-watcher.adoc

@@ -39,6 +39,17 @@ env:
 This one lets watcher know where to search for secrets and configmaps. You have two options here: selective namespaces (the setting above) and a namespace chosen by xref:property-source-config.adoc#namespace-resolution[Namespace Resolution] (this is the default option).
 Keep in mind that all these options require proper RBAC rules.
 
+<<<<<<< HEAD
+Changes from configmaps/secrets will only trigger an event being fired from configuration watcher if that particular change came from a source that has a label: `spring.cloud.kubernetes.config=true` or `spring.cloud.kubernetes.secret=true`.
+
+To put it simpler, if you change a configmap (or secret), that does _not_ have the label above, configuration watcher will skip firing an event for it (if you enabled debug logging, this will be visible in logs).
+
+By default, configuration watcher will monitor all configmaps/secrets in the configured namespace(s). If you want to watch only particular sources, you can do that by choosing only sources with some labels:
+
+[source]
+----
+spring.cloud.kubernetes.reload.config-maps-labels[a]=b
+=======
 By default, Configuration Watcher monitors only ConfigMaps labeled:
 
 [source]
@@ -55,22 +66,6 @@ env:
     value: "TRUE"
 ----
 
-Once enabled, only Secrets labeled: `spring.cloud.kubernetes.secret: "true"` are monitored.
-
-You can customize these label selectors in the Configuration Watcher application itself:
-
-[source,yaml]
-----
-spring:
-  cloud:
-    kubernetes:
-      reload:
-        config-maps-labels:
-          my-configmap-label: "my-configmap-value"
-        secrets-labels:
-          my-secret-label: "my-secret-value"
-----
-
 
 or via environment variables in the watcher Deployment:
 

docs/modules/ROOT/partials/_configprops.adoc

@@ -101,7 +101,6 @@
 |spring.cloud.kubernetes.loadbalancer.enabled | `+++true+++` | Load balancer enabled,default true.
 |spring.cloud.kubernetes.loadbalancer.mode | `+++pod+++` | {@link KubernetesLoadBalancerMode} setting load balancer server list with ip of pod or service name. default value is POD.
 |spring.cloud.kubernetes.loadbalancer.port-name | `+++http+++` | service port name.
-|spring.cloud.kubernetes.reload.enable-reload-filtering | `+++false+++` | create an informer only for sources that have 'spring.cloud.kubernetes.config.informer.enabled=true' label. This property is only relevant for event based reloading.
 |spring.cloud.kubernetes.reload.enabled | `+++false+++` | Enables the Kubernetes configuration reload on change.
 |spring.cloud.kubernetes.reload.max-wait-for-restart | `+++2s+++` | Restart or Shutdown strategies are used, Spring Cloud Kubernetes waits a random amount of time before restarting. This is done in order to avoid having all instances of the same application restart at the same time. This property configures the maximum of amount of wait time from the moment the signal is received that a restart is needed until the moment the restart is actually triggered
 |spring.cloud.kubernetes.reload.mode | `+++EVENT+++` | Sets the detection mode for Kubernetes configuration reload.
@@ -121,4 +120,4 @@
 |spring.cloud.kubernetes.secrets.sources |  | 
 |spring.cloud.kubernetes.secrets.use-name-as-prefix | `+++false+++` | 
 
-|===
+|===

spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java

@@ -71,8 +71,6 @@ public class KubernetesClientEventBasedConfigMapChangeDetector extends Configura
 
 	private final ConfigurableEnvironment environment;
 
-	private final boolean enableReloadFiltering;
-
 	private final boolean monitoringConfigMaps;
 
 	private final Map<String, String> configMapsLabels;
@@ -115,7 +113,6 @@ public KubernetesClientEventBasedConfigMapChangeDetector(CoreV1Api coreV1Api, Co
 		this.propertySourceLocator = propertySourceLocator;
 		this.coreV1Api = coreV1Api;
 		this.apiClient = createApiClientForInformerClient();
-		this.enableReloadFiltering = properties.enableReloadFiltering();
 		this.monitoringConfigMaps = properties.monitoringConfigMaps();
 		this.configMapsLabels = properties.configMapsLabels();
 		namespaces = namespaces(kubernetesNamespaceProvider, properties, "configmap");
@@ -126,21 +123,6 @@ void inform() {
 		if (monitoringConfigMaps) {
 			LOG.info(() -> "Kubernetes event-based configMap change detector activated");
 
-			Map<String, String> labelSelector;
-
-			if (enableReloadFiltering) {
-				LOG.warn(() -> "enable reload filtering is deprecated and will be removed in the next major release");
-				LOG.warn(() -> "use spring.cloud.kubernetes.reload.config-maps-labels instead");
-				if (!configMapsLabels.isEmpty()) {
-					LOG.warn(() -> "spring.cloud.kubernetes.reload.config-maps-labels is not empty, but "
-							+ "spring.cloud.kubernetes.reload.enable-reload-filtering is enabled and will override the former");
-				}
-				labelSelector = Map.of(ConfigReloadProperties.RELOAD_LABEL_FILTER, "true");
-			}
-			else {
-				labelSelector = configMapsLabels;
-			}
-
 			namespaces.forEach(namespace -> {
 				SharedIndexInformer<V1ConfigMap> informer;
 
@@ -151,11 +133,11 @@ void inform() {
 						.timeoutSeconds(params.timeoutSeconds)
 						.resourceVersion(params.resourceVersion)
 						.watch(params.watch)
-						.labelSelector(labelSelector(labelSelector))
+						.labelSelector(labelSelector(configMapsLabels))
 						.buildCall(null), V1ConfigMap.class, V1ConfigMapList.class);
 
-				LOG.debug(() -> "added configmap informer for namespace : " + namespace + " with labels : "
-						+ labelSelector);
+				LOG.debug(
+						() -> "configmap informer for namespace : " + namespace + " with labels : " + configMapsLabels);
 
 				informer.addEventHandler(handler);
 				informers.add(informer);

spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java

@@ -72,8 +72,6 @@ public class KubernetesClientEventBasedSecretsChangeDetector extends Configurati
 
 	private final ConfigurableEnvironment environment;
 
-	private final boolean enableReloadFiltering;
-
 	private final boolean monitoringSecrets;
 
 	private final Map<String, String> secretsLabels;
@@ -117,7 +115,6 @@ public KubernetesClientEventBasedSecretsChangeDetector(CoreV1Api coreV1Api, Conf
 		this.propertySourceLocator = propertySourceLocator;
 		this.coreV1Api = coreV1Api;
 		this.apiClient = createApiClientForInformerClient();
-		this.enableReloadFiltering = properties.enableReloadFiltering();
 		this.monitoringSecrets = properties.monitoringSecrets();
 		this.secretsLabels = properties.secretsLabels();
 		namespaces = namespaces(kubernetesNamespaceProvider, properties, "secret");
@@ -127,21 +124,6 @@ public KubernetesClientEventBasedSecretsChangeDetector(CoreV1Api coreV1Api, Conf
 	void inform() {
 		LOG.info(() -> "Kubernetes event-based secrets change detector activated");
 
-		Map<String, String> labelSelector;
-
-		if (enableReloadFiltering) {
-			LOG.warn(() -> "enable reload filtering is deprecated and will be removed in the next major release");
-			LOG.warn(() -> "use spring.cloud.kubernetes.reload.secrets-labels instead");
-			if (!secretsLabels.isEmpty()) {
-				LOG.warn(() -> "spring.cloud.kubernetes.reload.secrets-labels is not empty, but "
-						+ "spring.cloud.kubernetes.reload.enable-reload-filtering is enabled and will override the former");
-			}
-			labelSelector = Map.of(ConfigReloadProperties.RELOAD_LABEL_FILTER, "true");
-		}
-		else {
-			labelSelector = secretsLabels;
-		}
-
 		if (monitoringSecrets) {
 			namespaces.forEach(namespace -> {
 				SharedIndexInformer<V1Secret> informer;
@@ -153,10 +135,10 @@ void inform() {
 						.timeoutSeconds(params.timeoutSeconds)
 						.resourceVersion(params.resourceVersion)
 						.watch(params.watch)
-						.labelSelector(labelSelector(labelSelector))
+						.labelSelector(labelSelector(secretsLabels))
 						.buildCall(null), V1Secret.class, V1SecretList.class);
 
-				LOG.debug(() -> "secret informer for namespace : " + namespace + " with filter : " + secretsLabels);
+				LOG.debug(() -> "secret informer for namespace : " + namespace + " with labels : " + secretsLabels);
 
 				informer.addEventHandler(handler);
 				informers.add(informer);

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigUtilsTests.java

@@ -17,6 +17,7 @@
 package org.springframework.cloud.kubernetes.client.config;
 
 import java.time.Duration;
+import java.util.Map;
 import java.util.Set;
 
 import org.assertj.core.api.Assertions;
@@ -33,9 +34,9 @@ class KubernetesClientConfigUtilsTests {
 
 	@Test
 	void testNamespacesFromProperties() {
-		ConfigReloadProperties properties = new ConfigReloadProperties(false, false, false,
+		ConfigReloadProperties properties = new ConfigReloadProperties(false, false, Map.of(), false, Map.of(),
 				ConfigReloadProperties.ReloadStrategy.REFRESH, ConfigReloadProperties.ReloadDetectionMode.EVENT,
-				Duration.ofMillis(15000), Set.of("non-default"), false, Duration.ofSeconds(2));
+				Duration.ofMillis(15000), Set.of("non-default"), Duration.ofSeconds(2));
 		Set<String> namespaces = KubernetesClientConfigUtils
 			.namespaces(new KubernetesNamespaceProvider(new MockEnvironment()), properties, "configmap");
 		Assertions.assertThat(1).isEqualTo(namespaces.size());