Skip to content

fix merge #2321

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

Merged
ryanjbaxter merged 2 commits into from
Sep 16, 2026
+6 −5
Merged

fix merge #2321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1203faa
fix merge
wind57 Sep 16, 2026
439dc2f
Merge branch '5.0.x' into minor_hickup_after_merge
wind57 Sep 16, 2026
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
11 changes: 6 additions & 5 deletions ...loud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ public KubernetesClientEventBasedSecretsChangeDetector(CoreV1Api coreV1Api, Conf

@PostConstruct
void inform() {
LOG.info(() -> "Kubernetes event-based secrets change detector activated");
if (monitoringSecrets) {
LOG.info(() -> "Kubernetes event-based secrets change detector activated");

Map<String, String> labelSelector = resolveLabelSelector(enableReloadFiltering, secretsLabels,
"spring.cloud.kubernetes.reload.secrets-labels");
Map<String, String> labelSelector = resolveLabelSelector(enableReloadFiltering, secretsLabels,
"spring.cloud.kubernetes.reload.secrets-labels");

if (monitoringSecrets) {
namespaces.forEach(namespace -> {
SharedIndexInformer<V1Secret> informer;

Expand All @@ -96,7 +96,8 @@ void inform() {
.labelSelector(labelSelector(labelSelector))
.buildCall(null), V1Secret.class, V1SecretList.class);

LOG.debug(() -> "secret informer for namespace : " + namespace + " with filter : " + secretsLabels);
LOG.debug(
() -> "added secret informer for namespace : " + namespace + " with labels : " + labelSelector);

informer.addEventHandler(handler);
informers.add(informer);
Expand Down
Loading