|
7 | 7 | import org.slf4j.Logger;
|
8 | 8 | import org.slf4j.LoggerFactory;
|
9 | 9 |
|
10 |
| -import io.fabric8.kubernetes.api.model.ObjectMeta; |
11 | 10 | import io.fabric8.kubernetes.api.model.Service;
|
12 |
| -import io.fabric8.kubernetes.api.model.ServiceBuilder; |
13 | 11 | import io.fabric8.kubernetes.api.model.apps.Deployment;
|
14 | 12 | import io.fabric8.kubernetes.api.model.apps.DeploymentStatus;
|
15 | 13 | import io.fabric8.kubernetes.client.KubernetesClient;
|
|
19 | 17 | import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
|
20 | 18 | import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
|
21 | 19 | import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResourceConfiguration;
|
22 |
| -import io.javaoperatorsdk.operator.api.reconciler.dependent.Updater; |
23 | 20 |
|
24 | 21 | import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER;
|
25 | 22 |
|
|
34 | 31 | labelSelector = "app.kubernetes.io/managed-by=tomcat-operator",
|
35 | 32 | updatable = true, builder = DeploymentDependentResource.class,
|
36 | 33 | updater = DeploymentDependentResource.class),
|
37 |
| - @DependentResourceConfiguration(resourceType = Service.class, creatable = false, |
38 |
| - updatable = true) |
| 34 | + @DependentResourceConfiguration(resourceType = Service.class, |
| 35 | + builder = ServiceDependentResource.class) |
39 | 36 | })
|
40 |
| -public class TomcatReconciler implements Reconciler<Tomcat>, Updater<Service, Tomcat> { |
| 37 | +public class TomcatReconciler implements Reconciler<Tomcat> { |
41 | 38 |
|
42 | 39 | private final Logger log = LoggerFactory.getLogger(getClass());
|
43 | 40 |
|
@@ -74,20 +71,6 @@ private Tomcat updateTomcatStatus(Tomcat tomcat, Deployment deployment) {
|
74 | 71 | return tomcat;
|
75 | 72 | }
|
76 | 73 |
|
77 |
| - @Override |
78 |
| - public Service update(Service fetched, Tomcat tomcat) { |
79 |
| - final ObjectMeta tomcatMetadata = tomcat.getMetadata(); |
80 |
| - return new ServiceBuilder(loadYaml(Service.class, "service.yaml")) |
81 |
| - .editMetadata() |
82 |
| - .withName(tomcatMetadata.getName()) |
83 |
| - .withNamespace(tomcatMetadata.getNamespace()) |
84 |
| - .endMetadata() |
85 |
| - .editSpec() |
86 |
| - .addToSelector("app", tomcatMetadata.getName()) |
87 |
| - .endSpec() |
88 |
| - .build(); |
89 |
| - } |
90 |
| - |
91 | 74 | static <T> T loadYaml(Class<T> clazz, String yaml) {
|
92 | 75 | try (InputStream is = TomcatReconciler.class.getResourceAsStream(yaml)) {
|
93 | 76 | return Serialization.unmarshal(is, clazz);
|
|
0 commit comments