Fix 1310 for ConfigMaps #1332
Merged
Fix 1310 for ConfigMaps #1332
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Configure Renovate
wind57
commented
May 1, 2023
| @@ -139,7 +140,8 @@ private void addPropertySourceIfNeeded(Function<String, Map<String, Object>> con | |||
| LOG.warn("Property source: " + name + "will be ignored because no properties could be found"); | |||
| } | |||
| else { | |||
| composite.addFirstPropertySource(new MapPropertySource(name, map)); | |||
| LOG.debug("will add file-based property source : " + name); | |||
| composite.addFirstPropertySource(new MountConfigMapPropertySource(name, map)); | |||
There was a problem hiding this comment.
this is 1/2 the fix, provide a well known class so that we can later check for it.
wind57
commented
May 1, 2023
| /** | ||
| * @author wind57 | ||
| */ | ||
| public final class MountConfigMapPropertySource extends MapPropertySource { |
There was a problem hiding this comment.
instead of a generic MapPropertySource, use a class that can be later checked easily via instanceOf
wind57
commented
May 1, 2023
| @@ -84,14 +85,24 @@ public static <S extends PropertySource<?>> List<S> findPropertySources(Class<S> | |||
| else if (sourceClass.isInstance(source)) { | |||
| managedSources.add(sourceClass.cast(source)); | |||
| } | |||
| else if (source instanceof MountConfigMapPropertySource mountConfigMapPropertySource) { | |||
There was a problem hiding this comment.
the other 1/2 of the fix. Also a bit down in the code also, for the bootstrap case
wind57
commented
May 1, 2023
|
|
||
| /** | ||
| * <pre> | ||
| * - we have "spring.config.import: kubernetes", which means we will 'locate' property sources |
There was a problem hiding this comment.
I have 4 of these integration tests: with config-data and bootstrap for fabric8 and k8s-client.
|
@ryanjbaxter I have split the fix into two parts: one for ConfigMaps and one for Secrets (will work on it after these PRs). I also assume this needs to be fixed in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.