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

fix (#1847)

Browse Source 
Signed-off-by: wind57 <eugen.rabii@gmail.com>
This commit is contained in:
erabii
2025-01-21 00:26:14 +02:00
committed by GitHub
parent c44fbeb6db
commit 1eec4a092e
5 changed files with 25 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8ConfigMapMountMountPollingBootstrapIT.java
View File

@@ -44,7 +44,7 @@ import static org.springframework.cloud.kubernetes.integration.tests.commons.Com
/**
* @author wind57
*/
class BootstrapEnabledPollingReloadConfigMapMountIT {
class Fabric8ConfigMapMountMountPollingBootstrapIT {
private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-reload";

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapMountPollingReloadDelegateIT.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8ConfigMapMountPollingReloadIT.java
View File

@@ -44,7 +44,7 @@ import static org.springframework.cloud.kubernetes.integration.tests.commons.Com
/**
* @author wind57
*/
class ConfigMapMountPollingReloadDelegateIT {
class Fabric8ConfigMapMountPollingReloadIT {
private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-reload";

24
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadInformIT.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadConfigMapBootstrapIT.java
View File

@@ -48,7 +48,7 @@ import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAss
"logging.level.org.springframework.cloud.kubernetes.fabric8.config.reload=debug",
"spring.cloud.bootstrap.enabled=true" })
@ActiveProfiles("two")
class Fabric8EventReloadInformIT extends Fabric8EventReloadBase {
class Fabric8EventReloadConfigMapBootstrapIT extends Fabric8EventReloadBase {
private static final String LEFT_NAMESPACE = "left";
@@ -109,7 +109,27 @@ class Fabric8EventReloadInformIT extends Fabric8EventReloadBase {
assertThat(leftProperties.getValue()).isEqualTo("left-initial");
assertThat(rightProperties.getValue()).isEqualTo("right-initial");
// then deploy a new version of right-configmap
// then deploy a new version of right-configmap, but without changing its data,
// only add a label, thus no refresh happens
ConfigMap configMap = new ConfigMapBuilder()
.withMetadata(new ObjectMetaBuilder().withLabels(Map.of("new-label", "abc"))
.withNamespace(RIGHT_NAMESPACE)
.withName("right-configmap")
.build())
.withData(Map.of("right.value", "right-initial"))
.build();
replaceConfigMap(kubernetesClient, configMap, RIGHT_NAMESPACE);
await().atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(1))
.until(() -> output.getOut().contains("ConfigMap right-configmap was updated in namespace right"));
await().atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(1))
.until(() -> output.getOut().contains("data in configmap has not changed, will not reload"));
// then deploy a new version of right-configmap, that actually changes some data
ConfigMap rightConfigMapAfterChange = new ConfigMapBuilder()
.withMetadata(new ObjectMetaBuilder().withNamespace(RIGHT_NAMESPACE).withName("right-configmap").build())
.withData(Map.of("right.value", "right-after-change"))

136
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadDataChangesInConfigMapIT.java
View File

@@ -1,136 +0,0 @@
/*
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.kubernetes.fabric8.client.reload;
import java.io.InputStream;
import java.time.Duration;
import java.util.Map;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.utils.Serialization;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.TestPropertySource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.assertReloadLogStatements;
import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.configMap;
import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.replaceConfigMap;
/**
* @author wind57
*/
@TestPropertySource(properties = { "spring.main.cloud-platform=kubernetes",
"logging.level.org.springframework.cloud.kubernetes.fabric8.config.reload=debug",
"spring.cloud.bootstrap.enabled=true" })
@ActiveProfiles("one")
class Fabric8EventReloadDataChangesInConfigMapIT extends Fabric8EventReloadBase {
private static final String NAMESPACE = "right";
private static ConfigMap configMap;
@Autowired
private RightProperties properties;
@Autowired
private KubernetesClient kubernetesClient;
@BeforeAll
static void beforeAllLocal() {
InputStream rightConfigMapStream = util.inputStream("manifests/right-configmap.yaml");
configMap = Serialization.unmarshal(rightConfigMapStream, ConfigMap.class);
util.createNamespace(NAMESPACE);
configMap(Phase.CREATE, util, configMap, NAMESPACE);
}
@AfterAll
static void afterAllLocal() {
configMap(Phase.DELETE, util, configMap, NAMESPACE);
util.deleteNamespace(NAMESPACE);
}
/**
* <pre>
* - configMap with no labels and data: right.value = right-initial exists in namespace right
*
* - then we change the configmap by adding a label, this in turn does not
* change the result, because the data has not changed.
*
* - then we change data inside the config map, and we must see the updated value
* </pre>
*/
@Test
void test(CapturedOutput output) {
assertReloadLogStatements("added configmap informer for namespace", "added secret informer for namespace",
output);
// we first read the initial value from configmap
assertThat(properties.getValue()).isEqualTo("right-initial");
// then deploy a new version of right-configmap, but without changing its data,
// only add a label
ConfigMap configMap = new ConfigMapBuilder()
.withMetadata(new ObjectMetaBuilder().withLabels(Map.of("new-label", "abc"))
.withNamespace(NAMESPACE)
.withName("right-configmap")
.build())
.withData(Map.of("right.value", "right-initial"))
.build();
replaceConfigMap(kubernetesClient, configMap, NAMESPACE);
await().atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(1))
.until(() -> output.getOut().contains("ConfigMap right-configmap was updated in namespace right"));
await().atMost(Duration.ofSeconds(60))
.pollDelay(Duration.ofSeconds(1))
.until(() -> output.getOut().contains("data in configmap has not changed, will not reload"));
assertThat(properties.getValue()).isEqualTo("right-initial");
// change data
configMap = new ConfigMapBuilder()
.withMetadata(new ObjectMetaBuilder().withLabels(Map.of("new-label", "abc"))
.withNamespace(NAMESPACE)
.withName("right-configmap")
.build())
.withData(Map.of("right.value", "right-after-change"))
.build();
replaceConfigMap(kubernetesClient, configMap, NAMESPACE);
await().atMost(Duration.ofSeconds(60)).pollDelay(Duration.ofSeconds(1)).until(() -> {
String afterUpdateRightValue = properties.getValue();
return afterUpdateRightValue.equals("right-after-change");
});
}
}

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadSecretIT.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadSecretConfigDataIT.java
View File

@@ -52,7 +52,7 @@ import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAss
"logging.level.org.springframework.cloud.kubernetes.fabric8.config.reload=debug",
"spring.cloud.kubernetes.client.namespace=default" })
@ActiveProfiles("with-secret")
class Fabric8EventReloadSecretIT extends Fabric8EventReloadBase {
class Fabric8EventReloadSecretConfigDataIT extends Fabric8EventReloadBase {
private static final String NAMESPACE = "default";