From b851f9c1277f49ddb633478c1253e4db313ae19f Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 27 Mar 2025 14:09:38 +0200 Subject: [PATCH] dirty Signed-off-by: wind57 --- .../src/main/resources/bootstrap-with-bootstrap.yaml | 4 +++- .../reload/it/K8sClientSecretMountBootstrapPollingIT.java | 2 +- .../src/test/resources/mount/secret.yaml | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/bootstrap-with-bootstrap.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/bootstrap-with-bootstrap.yaml index a45a51e0..8808c39e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/bootstrap-with-bootstrap.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/bootstrap-with-bootstrap.yaml @@ -3,7 +3,9 @@ spring: kubernetes: secrets: paths: - - /tmp/application.properties + # at the moment, we do not support reading properties/yaml/yml + # files when mounting via 'paths' + - /tmp/from.properties.secret.key enabled: true config: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/it/K8sClientSecretMountBootstrapPollingIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/it/K8sClientSecretMountBootstrapPollingIT.java index aaaafe53..f067424a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/it/K8sClientSecretMountBootstrapPollingIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/it/K8sClientSecretMountBootstrapPollingIT.java @@ -103,7 +103,7 @@ class K8sClientSecretMountBootstrapPollingIT extends K8sClientReloadBase { V1Secret secret = (V1Secret) util.yaml("mount/secret.yaml"); secret.setData(Map.of(Constants.APPLICATION_PROPERTIES, Base64.getEncoder() .encode("from.properties.secret.key=as-mount-changed".getBytes(StandardCharsets.UTF_8)))); - coreV1Api.readNamespacedSecret("secret-reload", NAMESPACE, null); + coreV1Api.replaceNamespacedSecret("secret-reload", NAMESPACE, secret, null, null, null, null); Commons.waitForLogStatement("Detected change in config maps/secrets, reload will be triggered", K3S, IMAGE_NAME); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/resources/mount/secret.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/resources/mount/secret.yaml index ffcd14ee..7f0084b3 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/resources/mount/secret.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/resources/mount/secret.yaml @@ -5,5 +5,4 @@ metadata: namespace: default data: # from.properties.secret.key=initial - application.properties: | - ZnJvbS5wcm9wZXJ0aWVzLnNlY3JldC5rZXk9aW5pdGlhbA== + from.properties.secret.key: aW5pdGlhbA==