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 756f9984ef..19b130da88 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 @@ -30,14 +30,13 @@ import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource; import static io.javaoperatorsdk.operator.sample.Utils.*; +import static io.javaoperatorsdk.operator.sample.WebPageManagedDependentsReconciler.SELECTOR; /** Shows how to implement reconciler using the low level api directly. */ -@ControllerConfiguration( - labelSelector = WebPageReconciler.LOW_LEVEL_LABEL_KEY) +@ControllerConfiguration public class WebPageReconciler implements Reconciler, ErrorStatusHandler, EventSourceInitializer { - public static final String LOW_LEVEL_LABEL_KEY = "low-level"; public static final String INDEX_HTML = "index.html"; private static final Logger log = LoggerFactory.getLogger(WebPageReconciler.class); @@ -52,19 +51,19 @@ public WebPageReconciler(KubernetesClient kubernetesClient) { public Map prepareEventSources(EventSourceContext context) { var configMapEventSource = new InformerEventSource<>(InformerConfiguration.from(ConfigMap.class, context) - .withLabelSelector(LOW_LEVEL_LABEL_KEY) + .withLabelSelector(SELECTOR) .build(), context); var deploymentEventSource = new InformerEventSource<>(InformerConfiguration.from(Deployment.class, context) - .withLabelSelector(LOW_LEVEL_LABEL_KEY) + .withLabelSelector(SELECTOR) .build(), context); var serviceEventSource = new InformerEventSource<>(InformerConfiguration.from(Service.class, context) - .withLabelSelector(LOW_LEVEL_LABEL_KEY) + .withLabelSelector(SELECTOR) .build(), context); var ingressEventSource = new InformerEventSource<>(InformerConfiguration.from(Ingress.class, context) - .withLabelSelector(LOW_LEVEL_LABEL_KEY) + .withLabelSelector(SELECTOR) .build(), context); return EventSourceInitializer.nameEventSources(configMapEventSource, deploymentEventSource, serviceEventSource, ingressEventSource); @@ -224,7 +223,7 @@ private ConfigMap makeDesiredHtmlConfigMap(String ns, String configMapName, WebP public static Map lowLevelLabel() { Map labels = new HashMap<>(); - labels.put(LOW_LEVEL_LABEL_KEY, "true"); + labels.put(SELECTOR, "true"); return labels; } diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java index f3b086ebb4..0bb692a4d0 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java @@ -22,13 +22,10 @@ /** * Shows how to implement reconciler using standalone dependent resources. */ -@ControllerConfiguration( - labelSelector = WebPageStandaloneDependentsReconciler.DEPENDENT_RESOURCE_LABEL_SELECTOR) +@ControllerConfiguration public class WebPageStandaloneDependentsReconciler implements Reconciler, ErrorStatusHandler, EventSourceInitializer { - public static final String DEPENDENT_RESOURCE_LABEL_SELECTOR = "!low-level"; - private static final Logger log = LoggerFactory.getLogger(WebPageStandaloneDependentsReconciler.class);