From 28eb46275ba806907beb725a349d26f87b4bbf5e Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 8 Jul 2022 09:40:13 +0200 Subject: [PATCH 1/2] docs: why the pods deleted on web page sample --- sample-operators/webpage/k8s/webpage.yaml | 2 +- .../operator/sample/ConfigMapDependentResource.java | 3 +++ .../io/javaoperatorsdk/operator/sample/WebPageReconciler.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sample-operators/webpage/k8s/webpage.yaml b/sample-operators/webpage/k8s/webpage.yaml index 1aa41ff67a..d44ccb6798 100644 --- a/sample-operators/webpage/k8s/webpage.yaml +++ b/sample-operators/webpage/k8s/webpage.yaml @@ -13,6 +13,6 @@ spec: Hello Operator World - Hello World! + Hello World! 22 diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java index cfe0f79a0e..19a8e03845 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/ConfigMapDependentResource.java @@ -51,6 +51,9 @@ public ConfigMap update(ConfigMap actual, ConfigMap target, WebPage primary, var ns = actual.getMetadata().getNamespace(); log.info("Restarting pods because HTML has changed in {}", ns); + // not that this is not necessary, eventually mounted config map would be updated, just this way + // is much faster; what is handy for demo purposes. + // https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#mounted-configmaps-are-updated-automatically getKubernetesClient() .pods() .inNamespace(ns) diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java index 19b130da88..5d50fd8e2a 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java @@ -126,6 +126,9 @@ public UpdateControl reconcile(WebPage webPage, Context contex existingIngress.ifPresent( ingress -> kubernetesClient.resource(ingress).delete()); + // not that this is not necessary, eventually mounted config map would be updated, just this way + // is much faster; what is handy for demo purposes. + // https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#mounted-configmaps-are-updated-automatically if (previousConfigMap != null && !StringUtils.equals( previousConfigMap.getData().get(INDEX_HTML), desiredHtmlConfigMap.getData().get(INDEX_HTML))) { From 22eb6ec9928fbeaa3cbdafdf1a0b26a1ced96a50 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 8 Jul 2022 09:41:20 +0200 Subject: [PATCH 2/2] revert resource change --- sample-operators/webpage/k8s/webpage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample-operators/webpage/k8s/webpage.yaml b/sample-operators/webpage/k8s/webpage.yaml index d44ccb6798..1aa41ff67a 100644 --- a/sample-operators/webpage/k8s/webpage.yaml +++ b/sample-operators/webpage/k8s/webpage.yaml @@ -13,6 +13,6 @@ spec: Hello Operator World - Hello World! 22 + Hello World!