Skip to content

Commit 272d61a

Browse files
committed
wip
1 parent 73cd3cb commit 272d61a

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ public static void main(String[] args) throws IOException {
2828
Config config = new ConfigBuilder().withNamespace(null).build();
2929
KubernetesClient client = new DefaultKubernetesClient(config);
3030
Operator operator = new Operator(client);
31-
if (WEBPAGE_CLASSIC_RECONCILER_ENV_VALUE.equals(System.getenv(WEBPAGE_RECONCILER_ENV))) {
31+
String reconcilerEnvVar = System.getenv(WEBPAGE_RECONCILER_ENV);
32+
if (WEBPAGE_CLASSIC_RECONCILER_ENV_VALUE.equals(reconcilerEnvVar)) {
3233
operator.register(new WebPageReconciler(client));
3334
} else if (WEBPAGE_MANAGED_DEPENDENT_RESOURCE_ENV_VALUE
34-
.equals(System.getenv(WEBPAGE_RECONCILER_ENV))) {
35+
.equals(reconcilerEnvVar)) {
3536
operator.register(new WebPageManagedDependentsReconciler());
3637
} else {
3738
operator.register(new WebPageStandaloneDependentsReconciler(client));

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
import java.util.Arrays;
44
import java.util.Map;
55

6-
import io.javaoperatorsdk.operator.sample.dependents.ConfigMapDependentResource;
7-
import io.javaoperatorsdk.operator.sample.dependents.DeploymentDependentResource;
8-
import io.javaoperatorsdk.operator.sample.dependents.IngressDependentResource;
9-
import io.javaoperatorsdk.operator.sample.dependents.ServiceDependentResource;
106
import org.slf4j.Logger;
117
import org.slf4j.LoggerFactory;
128

@@ -19,6 +15,10 @@
1915
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
2016
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
2117
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
18+
import io.javaoperatorsdk.operator.sample.dependents.ConfigMapDependentResource;
19+
import io.javaoperatorsdk.operator.sample.dependents.DeploymentDependentResource;
20+
import io.javaoperatorsdk.operator.sample.dependents.IngressDependentResource;
21+
import io.javaoperatorsdk.operator.sample.dependents.ServiceDependentResource;
2222

2323
import static io.javaoperatorsdk.operator.sample.Utils.*;
2424

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/dependents/ConfigMapDependentResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6-
import io.javaoperatorsdk.operator.sample.WebPage;
76
import org.slf4j.Logger;
87
import org.slf4j.LoggerFactory;
98

@@ -13,6 +12,7 @@
1312
import io.javaoperatorsdk.operator.api.reconciler.Context;
1413
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUKubernetesDependentResource;
1514
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
15+
import io.javaoperatorsdk.operator.sample.WebPage;
1616

1717
import static io.javaoperatorsdk.operator.sample.Utils.configMapName;
1818
import static io.javaoperatorsdk.operator.sample.Utils.deploymentName;

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/dependents/DeploymentDependentResource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
// this annotation only activates when using managed dependents and is not otherwise needed
2020
@KubernetesDependent(labelSelector = WebPageManagedDependentsReconciler.SELECTOR)
21-
public class DeploymentDependentResource extends CRUKubernetesDependentResource<Deployment, WebPage> {
21+
public class DeploymentDependentResource
22+
extends CRUKubernetesDependentResource<Deployment, WebPage> {
2223

2324
public DeploymentDependentResource() {
2425
super(Deployment.class);

0 commit comments

Comments
 (0)