Skip to content

Commit 6d0fb7f

Browse files
authored
fix: remove pod delete web page dependent test (#2061)
Signed-off-by: Attila Mészáros <[email protected]>
1 parent d309cba commit 6d0fb7f

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

Diff for: sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/dependentresource/ConfigMapDependentResource.java

-24
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
8-
96
import io.fabric8.kubernetes.api.model.ConfigMap;
107
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
118
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
@@ -15,16 +12,13 @@
1512
import io.javaoperatorsdk.operator.sample.customresource.WebPage;
1613

1714
import static io.javaoperatorsdk.operator.sample.Utils.configMapName;
18-
import static io.javaoperatorsdk.operator.sample.Utils.deploymentName;
1915
import static io.javaoperatorsdk.operator.sample.WebPageManagedDependentsReconciler.SELECTOR;
2016

2117
// this annotation only activates when using managed dependents and is not otherwise needed
2218
@KubernetesDependent(labelSelector = SELECTOR)
2319
public class ConfigMapDependentResource
2420
extends CRUDKubernetesDependentResource<ConfigMap, WebPage> {
2521

26-
private static final Logger log = LoggerFactory.getLogger(ConfigMapDependentResource.class);
27-
2822
public ConfigMapDependentResource() {
2923
super(ConfigMap.class);
3024
}
@@ -45,22 +39,4 @@ protected ConfigMap desired(WebPage webPage, Context<WebPage> context) {
4539
.withData(data)
4640
.build();
4741
}
48-
49-
@Override
50-
public ConfigMap update(ConfigMap actual, ConfigMap desired, WebPage primary,
51-
Context<WebPage> context) {
52-
var res = super.update(actual, desired, primary, context);
53-
var ns = actual.getMetadata().getNamespace();
54-
log.info("Restarting pods because HTML has changed in {}",
55-
ns);
56-
// not that this is not necessary, eventually mounted config map would be updated, just this way
57-
// is much faster; what is handy for demo purposes.
58-
// https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#mounted-configmaps-are-updated-automatically
59-
getKubernetesClient()
60-
.pods()
61-
.inNamespace(ns)
62-
.withLabel("app", deploymentName(primary))
63-
.delete();
64-
return res;
65-
}
6642
}

Diff for: sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorAbstractTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public abstract class WebPageOperatorAbstractTest {
3636
public static final String TITLE1 = "Hello Operator World";
3737
public static final String TITLE2 = "Hello Operator World Title 2";
3838
public static final int WAIT_SECONDS = 20;
39+
public static final int LONG_WAIT_SECONDS = 120;
3940
public static final Duration POLL_INTERVAL = Duration.ofSeconds(1);
4041

4142
boolean isLocal() {
@@ -68,7 +69,7 @@ void testAddingWebPage() {
6869
// update part: changing title
6970
operator().replace(createWebPage(TITLE2));
7071

71-
await().atMost(Duration.ofSeconds(WAIT_SECONDS))
72+
await().atMost(Duration.ofSeconds(LONG_WAIT_SECONDS))
7273
.pollInterval(POLL_INTERVAL)
7374
.untilAsserted(() -> {
7475
String page = httpGetForWebPage(webPage);

0 commit comments

Comments
 (0)