Fix 1681 (CAN ONLY GO IN THE NEXT MAJOR RELEASE, MUST GO AFTER : 1715)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +27,5 @@
  * @author wind57
  */
 public record KubernetesClientConfigContext(CoreV1Api client, NormalizedSource normalizedSource, String namespace,
-		Environment environment, boolean includeDefaultProfileData) {
-
-	public KubernetesClientConfigContext(CoreV1Api client, NormalizedSource normalizedSource, String namespace,
-			Environment environment) {
-		this(client, normalizedSource, namespace, environment, true);
-	}
+		Environment environment, boolean includeDefaultProfileData, boolean namespacedBatchRead) {
 }

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

@@ -64,7 +64,8 @@ protected void registerBeans(ConfigDataLocationResolverContext resolverContext,
 					coreV1Api, configMapProperties, namespaceProvider);
 			if (isRetryEnabledForConfigMap(configMapProperties)) {
 				configMapPropertySourceLocator = new ConfigDataRetryableConfigMapPropertySourceLocator(
-						configMapPropertySourceLocator, configMapProperties, new KubernetesClientConfigMapsCache());
+						configMapPropertySourceLocator, configMapProperties,
+						new KubernetesClientSourcesNamespaceBatched());
 			}
 
 			registerSingle(bootstrapContext, ConfigMapPropertySourceLocator.class, configMapPropertySourceLocator,
@@ -76,7 +77,7 @@ protected void registerBeans(ConfigDataLocationResolverContext resolverContext,
 					coreV1Api, namespaceProvider, secretsProperties);
 			if (isRetryEnabledForSecrets(secretsProperties)) {
 				secretsPropertySourceLocator = new ConfigDataRetryableSecretsPropertySourceLocator(
-						secretsPropertySourceLocator, secretsProperties, new KubernetesClientSecretsCache());
+						secretsPropertySourceLocator, secretsProperties, new KubernetesClientSourcesNamespaceBatched());
 			}
 
 			registerSingle(bootstrapContext, SecretsPropertySourceLocator.class, secretsPropertySourceLocator,

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

@@ -41,19 +41,20 @@ public class KubernetesClientConfigMapPropertySourceLocator extends ConfigMapPro
 
 	public KubernetesClientConfigMapPropertySourceLocator(CoreV1Api coreV1Api, ConfigMapConfigProperties properties,
 			KubernetesNamespaceProvider kubernetesNamespaceProvider) {
-		super(properties, new KubernetesClientConfigMapsCache());
+		super(properties, new KubernetesClientSourcesNamespaceBatched());
 		this.coreV1Api = coreV1Api;
 		this.kubernetesNamespaceProvider = kubernetesNamespaceProvider;
 	}
 
 	@Override
-	protected MapPropertySource getMapPropertySource(NormalizedSource source, ConfigurableEnvironment environment) {
+	protected MapPropertySource getMapPropertySource(NormalizedSource source, ConfigurableEnvironment environment,
+			boolean namespacedBatchRead) {
 
 		String normalizedNamespace = source.namespace().orElse(null);
 		String namespace = getApplicationNamespace(normalizedNamespace, source.target(), kubernetesNamespaceProvider);
 
 		KubernetesClientConfigContext context = new KubernetesClientConfigContext(coreV1Api, source, namespace,
-				environment);
+				environment, true, namespacedBatchRead);
 		return new KubernetesClientConfigMapPropertySource(context);
 	}
 

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

@@ -33,6 +33,10 @@
 import org.springframework.core.env.Environment;
 
 import static org.springframework.cloud.kubernetes.client.KubernetesClientUtils.getApplicationNamespace;
+import static org.springframework.cloud.kubernetes.client.config.KubernetesClientSourcesNamespaceBatched.strippedConfigMapsBatchRead;
+import static org.springframework.cloud.kubernetes.client.config.KubernetesClientSourcesNamespaceBatched.strippedSecretsBatchRead;
+import static org.springframework.cloud.kubernetes.client.config.KubernetesClientSourcesNonNamespaceBatched.strippedConfigMapsNonBatchRead;
+import static org.springframework.cloud.kubernetes.client.config.KubernetesClientSourcesNonNamespaceBatched.strippedSecretsNonBatchRead;
 
 /**
  * @author Ryan Baxter
@@ -61,42 +65,31 @@ public static Set<String> namespaces(KubernetesNamespaceProvider provider, Confi
 		return namespaces;
 	}
 
-	/**
-	 * <pre>
-	 *     1. read all secrets in the provided namespace
-	 *     2. from the above, filter the ones that we care about (filter by labels)
-	 *     3. with secret names from (2), find out if there are any profile based secrets (if profiles is not empty)
-	 *     4. concat (2) and (3) and these are the secrets we are interested in
-	 *     5. see if any of the secrets from (4) has a single yaml/properties file
-	 *     6. gather all the names of the secrets (from 4) + data they hold
-	 * </pre>
-	 */
-	static MultipleSourcesContainer secretsDataByLabels(CoreV1Api coreV1Api, String namespace,
-			Map<String, String> labels, Environment environment, Set<String> profiles) {
-		List<StrippedSourceContainer> strippedSecrets = strippedSecrets(coreV1Api, namespace);
-		if (strippedSecrets.isEmpty()) {
-			return MultipleSourcesContainer.empty();
-		}
-		return ConfigUtils.processLabeledData(strippedSecrets, environment, labels, namespace, profiles, DECODE);
-	}
-
 	/**
 	 * <pre>
 	 *     1. read all config maps in the provided namespace
-	 *     2. from the above, filter the ones that we care about (filter by labels)
-	 *     3. with config maps names from (2), find out if there are any profile based ones (if profiles is not empty)
-	 *     4. concat (2) and (3) and these are the config maps we are interested in
-	 *     5. see if any from (4) has a single yaml/properties file
-	 *     6. gather all the names of the config maps (from 4) + data they hold
+	 *     2. from the above, filter the ones that we care about (by name)
+	 *     3. see if any of the config maps has a single yaml/properties file
+	 *     4. gather all the names of the config maps + data they hold
 	 * </pre>
 	 */
-	static MultipleSourcesContainer configMapsDataByLabels(CoreV1Api coreV1Api, String namespace,
-			Map<String, String> labels, Environment environment, Set<String> profiles) {
-		List<StrippedSourceContainer> strippedConfigMaps = strippedConfigMaps(coreV1Api, namespace);
-		if (strippedConfigMaps.isEmpty()) {
-			return MultipleSourcesContainer.empty();
+	static MultipleSourcesContainer configMapsDataByName(CoreV1Api client, String namespace,
+			LinkedHashSet<String> sourceNames, Environment environment, boolean includeDefaultProfileData,
+			boolean namespacedBatchRead) {
+
+		List<StrippedSourceContainer> strippedConfigMaps;
+
+		if (namespacedBatchRead) {
+			LOG.debug("Will read all configmaps in namespace : " + namespace);
+			strippedConfigMaps = strippedConfigMapsBatchRead(client, namespace);
+		}
+		else {
+			LOG.debug("Will read individual configmaps in namespace : " + namespace + " with names : " + sourceNames);
+			strippedConfigMaps = strippedConfigMapsNonBatchRead(client, namespace, sourceNames);
 		}
-		return ConfigUtils.processLabeledData(strippedConfigMaps, environment, labels, namespace, profiles, DECODE);
+
+		return ConfigUtils.processNamedData(strippedConfigMaps, environment, sourceNames, namespace, false,
+				includeDefaultProfileData);
 	}
 
 	/**
@@ -107,49 +100,73 @@ static MultipleSourcesContainer configMapsDataByLabels(CoreV1Api coreV1Api, Stri
 	 *     4. gather all the names of the secrets + decoded data they hold
 	 * </pre>
 	 */
-	static MultipleSourcesContainer secretsDataByName(CoreV1Api coreV1Api, String namespace,
-			LinkedHashSet<String> sourceNames, Environment environment, boolean includeDefaultProfileData) {
-		List<StrippedSourceContainer> strippedSecrets = strippedSecrets(coreV1Api, namespace);
-		if (strippedSecrets.isEmpty()) {
-			return MultipleSourcesContainer.empty();
+	static MultipleSourcesContainer secretsDataByName(CoreV1Api client, String namespace,
+			LinkedHashSet<String> sourceNames, Environment environment, boolean includeDefaultProfileData,
+			boolean namespacedBatchRead) {
+
+		List<StrippedSourceContainer> strippedSecrets;
+
+		if (namespacedBatchRead) {
+			LOG.debug("Will read all secrets in namespace : " + namespace);
+			strippedSecrets = strippedSecretsBatchRead(client, namespace);
+		}
+		else {
+			LOG.debug("Will read individual secrets in namespace : " + namespace + " with names : " + sourceNames);
+			strippedSecrets = strippedSecretsNonBatchRead(client, namespace, sourceNames);
 		}
-		return ConfigUtils.processNamedData(strippedSecrets, environment, sourceNames, namespace, DECODE,
+
+		return ConfigUtils.processNamedData(strippedSecrets, environment, sourceNames, namespace, false,
 				includeDefaultProfileData);
 	}
 
 	/**
 	 * <pre>
 	 *     1. read all config maps in the provided namespace
-	 *     2. from the above, filter the ones that we care about (by name)
-	 *     3. see if any of the config maps has a single yaml/properties file
+	 *     2. from the above, filter the ones that we care about (filter by labels)
+	 *     3. see if any from (2) has a single yaml/properties file
 	 *     4. gather all the names of the config maps + data they hold
 	 * </pre>
 	 */
-	static MultipleSourcesContainer configMapsDataByName(CoreV1Api coreV1Api, String namespace,
-			LinkedHashSet<String> sourceNames, Environment environment, boolean includeDefaultProfileData) {
-		List<StrippedSourceContainer> strippedConfigMaps = strippedConfigMaps(coreV1Api, namespace);
-		if (strippedConfigMaps.isEmpty()) {
-			return MultipleSourcesContainer.empty();
-		}
-		return ConfigUtils.processNamedData(strippedConfigMaps, environment, sourceNames, namespace, DECODE,
-				includeDefaultProfileData);
-	}
+	static MultipleSourcesContainer configMapsDataByLabels(CoreV1Api client, String namespace,
+			Map<String, String> labels, Environment environment, boolean namespacedBatchRead) {
+
+		List<StrippedSourceContainer> strippedConfigMaps;
 
-	private static List<StrippedSourceContainer> strippedConfigMaps(CoreV1Api coreV1Api, String namespace) {
-		List<StrippedSourceContainer> strippedConfigMaps = KubernetesClientConfigMapsCache.byNamespace(coreV1Api,
-				namespace);
-		if (strippedConfigMaps.isEmpty()) {
-			LOG.debug("No configmaps in namespace '" + namespace + "'");
+		if (namespacedBatchRead) {
+			LOG.debug("Will read all configmaps in namespace : " + namespace);
+			strippedConfigMaps = strippedConfigMapsBatchRead(client, namespace);
 		}
-		return strippedConfigMaps;
+		else {
+			LOG.debug("Will read individual configmaps in namespace : " + namespace + " with labels : " + labels);
+			strippedConfigMaps = strippedConfigMapsNonBatchRead(client, namespace, labels);
+		}
+
+		return ConfigUtils.processLabeledData(strippedConfigMaps, environment, labels, namespace, false);
 	}
 
-	private static List<StrippedSourceContainer> strippedSecrets(CoreV1Api coreV1Api, String namespace) {
-		List<StrippedSourceContainer> strippedSecrets = KubernetesClientSecretsCache.byNamespace(coreV1Api, namespace);
-		if (strippedSecrets.isEmpty()) {
-			LOG.debug("No secrets in namespace '" + namespace + "'");
+	/**
+	 * <pre>
+	 *     1. read all secrets in the provided namespace
+	 *     2. from the above, filter the ones that we care about (filter by labels)
+	 *     3. see if any of the secrets from (2) has a single yaml/properties file
+	 *     4. gather all the names of the secrets + data they hold
+	 * </pre>
+	 */
+	static MultipleSourcesContainer secretsDataByLabels(CoreV1Api client, String namespace, Map<String, String> labels,
+			Environment environment, boolean namespacedBatchRead) {
+
+		List<StrippedSourceContainer> strippedSecrets;
+
+		if (namespacedBatchRead) {
+			LOG.debug("Will read all secrets in namespace : " + namespace);
+			strippedSecrets = strippedSecretsBatchRead(client, namespace);
 		}
-		return strippedSecrets;
+		else {
+			LOG.debug("Will read individual secrets in namespace : " + namespace + " with labels : " + labels);
+			strippedSecrets = strippedSecretsNonBatchRead(client, namespace, labels);
+		}
+
+		return ConfigUtils.processLabeledData(strippedSecrets, environment, labels, namespace, false);
 	}
 
 }

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

@@ -41,19 +41,20 @@ public class KubernetesClientSecretsPropertySourceLocator extends SecretsPropert
 
 	public KubernetesClientSecretsPropertySourceLocator(CoreV1Api coreV1Api,
 			KubernetesNamespaceProvider kubernetesNamespaceProvider, SecretsConfigProperties secretsConfigProperties) {
-		super(secretsConfigProperties, new KubernetesClientSecretsCache());
+		super(secretsConfigProperties, new KubernetesClientSourcesNamespaceBatched());
 		this.coreV1Api = coreV1Api;
 		this.kubernetesNamespaceProvider = kubernetesNamespaceProvider;
 	}
 
 	@Override
-	protected SecretsPropertySource getPropertySource(ConfigurableEnvironment environment, NormalizedSource source) {
+	protected SecretsPropertySource getPropertySource(ConfigurableEnvironment environment, NormalizedSource source,
+			boolean namespacedBatchRead) {
 
 		String normalizedNamespace = source.namespace().orElse(null);
 		String namespace = getApplicationNamespace(normalizedNamespace, source.target(), kubernetesNamespaceProvider);
 
 		KubernetesClientConfigContext context = new KubernetesClientConfigContext(coreV1Api, source, namespace,
-				environment);
+				environment, true, namespacedBatchRead);
 
 		return new KubernetesClientSecretsPropertySource(context);
 	}