SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2021-08-27 19:17:10 +00:00
parent f1f8413690
commit c120b83f0b
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetectorTests.java
View File

@@ -137,7 +137,8 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests {
KubernetesMockEnvironment environment = new KubernetesMockEnvironment(
mock(KubernetesClientSecretsPropertySource.class)).withProperty("db-password", "p455w0rd");
KubernetesClientSecretsPropertySourceLocator locator = mock(KubernetesClientSecretsPropertySourceLocator.class);
when(locator.locate(environment)).thenAnswer(ignoreMe -> new MockPropertySource().withProperty("db-password", "p455w0rd2"));
when(locator.locate(environment))
.thenAnswer(ignoreMe -> new MockPropertySource().withProperty("db-password", "p455w0rd2"));
ConfigReloadProperties properties = new ConfigReloadProperties();
properties.setMonitoringSecrets(true);
KubernetesNamespaceProvider kubernetesNamespaceProvider = mock(KubernetesNamespaceProvider.class);

2
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java
View File

@@ -204,7 +204,7 @@ public class SecretsConfigProperties extends AbstractConfigProperties {
}
SecretsConfigProperties.NormalizedSource other = (SecretsConfigProperties.NormalizedSource) o;
return Objects.equals(this.name, other.name) && Objects.equals(this.namespace, other.namespace)
&& Objects.equals(this.labels, other.labels);
&& Objects.equals(this.labels, other.labels);
}
@Override

4
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySource.java
View File

@@ -36,8 +36,8 @@ public class SecretsPropertySource extends MapPropertySource {
}
protected static String getSourceName(String name, String namespace) {
return PREFIX + Constants.PROPERTY_SOURCE_NAME_SEPARATOR + name +
Constants.PROPERTY_SOURCE_NAME_SEPARATOR + namespace;
return PREFIX + Constants.PROPERTY_SOURCE_NAME_SEPARATOR + name + Constants.PROPERTY_SOURCE_NAME_SEPARATOR
+ namespace;
}
protected static void putAll(Map<String, String> data, Map<String, Object> result) {

6
spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySource.java
View File

@@ -60,12 +60,12 @@ public class Fabric8SecretsPropertySource extends SecretsPropertySource {
}
client.secrets().inNamespace(namespaceToUse).withLabels(labels).list().getItems()
.forEach(s -> putDataFromSecret(s, result, namespaceToUse));
.forEach(s -> putDataFromSecret(s, result, namespaceToUse));
}
catch (Exception e) {
LOG.warn("Can't read secret with name: [" + name + "] or labels [" + labels + "] in namespace: [" + namespaceToUse
+ "] (cause: " + e.getMessage() + "). Ignoring");
LOG.warn("Can't read secret with name: [" + name + "] or labels [" + labels + "] in namespace: ["
+ namespaceToUse + "] (cause: " + e.getMessage() + "). Ignoring");
}
return result;