Skip to content

Simplify config data #1998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Simplify config data #1998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4afb5ef
continue
wind57 Aug 31, 2025
31cf2af
refactor code
wind57 Sep 1, 2025
c8fe4d6
WIP
wind57 Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions ...gframework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@
import org.springframework.boot.context.config.ConfigDataLocation;
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
import org.springframework.boot.context.config.Profiles;
import org.springframework.boot.logging.DeferredLogFactory;
import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
import org.springframework.cloud.kubernetes.commons.config.ConfigDataRetryableConfigMapPropertySourceLocator;
import org.springframework.cloud.kubernetes.commons.config.ConfigDataRetryableSecretsPropertySourceLocator;
import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
import org.springframework.cloud.kubernetes.commons.config.ConfigMapPropertySourceLocator;
import org.springframework.cloud.kubernetes.commons.config.KubernetesConfigDataLocationResolver;
import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySourceLocator;
import org.springframework.core.env.Environment;
import org.springframework.cloud.kubernetes.commons.config.configdata.ConfigDataProperties;
import org.springframework.cloud.kubernetes.commons.config.configdata.KubernetesConfigDataLocationResolver;

import static org.springframework.cloud.kubernetes.client.KubernetesClientUtils.kubernetesApiClient;
import static org.springframework.cloud.kubernetes.commons.config.ConfigUtils.registerSingle;
Expand All @@ -44,17 +43,12 @@
*/
public class KubernetesClientConfigDataLocationResolver extends KubernetesConfigDataLocationResolver {

public KubernetesClientConfigDataLocationResolver(DeferredLogFactory factory) {
super(factory);
}

@Override
protected void registerBeans(ConfigDataLocationResolverContext resolverContext, ConfigDataLocation location,
Profiles profiles, KubernetesConfigDataLocationResolver.PropertyHolder propertyHolder,
KubernetesNamespaceProvider namespaceProvider) {
KubernetesClientProperties kubernetesClientProperties = propertyHolder.kubernetesClientProperties();
ConfigMapConfigProperties configMapProperties = propertyHolder.configMapConfigProperties();
SecretsConfigProperties secretsProperties = propertyHolder.secretsProperties();
Profiles profiles, ConfigDataProperties properties, KubernetesNamespaceProvider namespaceProvider) {
KubernetesClientProperties kubernetesClientProperties = properties.clientProperties();
ConfigMapConfigProperties configMapProperties = properties.configMapProperties();
SecretsConfigProperties secretsProperties = properties.secretsProperties();

ConfigurableBootstrapContext bootstrapContext = resolverContext.getBootstrapContext();
CoreV1Api coreV1Api = registerClientAndCoreV1Api(bootstrapContext, kubernetesClientProperties);
Expand Down Expand Up @@ -96,8 +90,4 @@ private CoreV1Api registerClientAndCoreV1Api(ConfigurableBootstrapContext bootst
return coreV1Api;
}

protected KubernetesNamespaceProvider kubernetesNamespaceProvider(Environment environment) {
return new KubernetesNamespaceProvider(environment);
}

}
8 changes: 1 addition & 7 deletions ...ework/cloud/kubernetes/client/config/KubernetesClientConfigDataLocationResolverTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package org.springframework.cloud.kubernetes.client.config;

import java.util.function.Supplier;

import io.kubernetes.client.openapi.ApiClient;
import io.kubernetes.client.openapi.apis.CoreV1Api;
import org.assertj.core.api.Assertions;
Expand All @@ -31,7 +29,6 @@
import org.springframework.boot.context.config.Profiles;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
import org.springframework.boot.logging.DeferredLogFactory;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
Expand All @@ -49,13 +46,10 @@
@ExtendWith(OutputCaptureExtension.class)
class KubernetesClientConfigDataLocationResolverTests {

private static final DeferredLogFactory FACTORY = Supplier::get;

private static final ConfigDataLocationResolverContext RESOLVER_CONTEXT = Mockito
.mock(ConfigDataLocationResolverContext.class);

private static final KubernetesClientConfigDataLocationResolver RESOLVER = new KubernetesClientConfigDataLocationResolver(
FACTORY);
private static final KubernetesClientConfigDataLocationResolver RESOLVER = new KubernetesClientConfigDataLocationResolver();

/*
* both ConfigMapConfigProperties and SecretsConfigProperties are null, thus they are
Expand Down
223 changes: 0 additions & 223 deletions ...springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolver.java
View file
Open in desktop

This file was deleted.

Loading
Loading