Merge branch 'next' of github.com:java-operator-sdk/java-operator-sdk into next

Author: csviri

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java

@@ -1,12 +1,10 @@
 package io.javaoperatorsdk.operator.sample.standalonedependent;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.utils.Serialization;
+import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.junit.KubernetesClientAware;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
@@ -52,21 +50,13 @@ public KubernetesClient getKubernetesClient() {
     return this.kubernetesClient;
   }
 
-  private <T> T loadYaml(Class<T> clazz, String yaml) {
-    try (InputStream is = getClass().getResourceAsStream(yaml)) {
-      return Serialization.unmarshal(is, clazz);
-    } catch (IOException ex) {
-      throw new IllegalStateException("Cannot find yaml on classpath: " + yaml);
-    }
-  }
-
   private class DeploymentDependentResource extends
       KubernetesDependentResource<Deployment, StandaloneDependentTestCustomResource> {
 
     @Override
     protected Deployment desired(StandaloneDependentTestCustomResource primary, Context context) {
-      Deployment deployment = StandaloneDependentTestReconciler.this.loadYaml(Deployment.class,
-          "nginx-deployment.yaml");
+      Deployment deployment =
+          ReconcilerUtils.loadYaml(Deployment.class, getClass(), "nginx-deployment.yaml");
       deployment.getMetadata().setName(primary.getMetadata().getName());
       deployment.getMetadata().setNamespace(primary.getMetadata().getNamespace());
       return deployment;

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

@@ -3,6 +3,7 @@
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
+import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
@@ -16,7 +17,8 @@ private static String tomcatImage(Tomcat tomcat) {
 
   @Override
   protected Deployment desired(Tomcat tomcat, Context context) {
-    Deployment deployment = TomcatReconciler.loadYaml(Deployment.class, "deployment.yaml");
+    Deployment deployment =
+        ReconcilerUtils.loadYaml(Deployment.class, getClass(), "deployment.yaml");
     final ObjectMeta tomcatMetadata = tomcat.getMetadata();
     final String tomcatName = tomcatMetadata.getName();
     deployment = new DeploymentBuilder(deployment)

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java

@@ -3,6 +3,7 @@
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.ServiceBuilder;
+import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 
@@ -11,7 +12,7 @@ public class ServiceDependentResource extends KubernetesDependentResource<Servic
   @Override
   protected Service desired(Tomcat tomcat, Context context) {
     final ObjectMeta tomcatMetadata = tomcat.getMetadata();
-    return new ServiceBuilder(TomcatReconciler.loadYaml(Service.class, "service.yaml"))
+    return new ServiceBuilder(ReconcilerUtils.loadYaml(Service.class, getClass(), "service.yaml"))
         .editMetadata()
         .withName(tomcatMetadata.getName())
         .withNamespace(tomcatMetadata.getNamespace())

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java

@@ -1,15 +1,12 @@
 package io.javaoperatorsdk.operator.sample;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Objects;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentStatus;
-import io.fabric8.kubernetes.client.utils.Serialization;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -54,12 +51,4 @@ private Tomcat updateTomcatStatus(Tomcat tomcat, Deployment deployment) {
     tomcat.setStatus(status);
     return tomcat;
   }
-
-  static <T> T loadYaml(Class<T> clazz, String yaml) {
-    try (InputStream is = TomcatReconciler.class.getResourceAsStream(yaml)) {
-      return Serialization.unmarshal(is, clazz);
-    } catch (IOException ex) {
-      throw new IllegalStateException("Cannot find yaml on classpath: " + yaml);
-    }
-  }
 }

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

@@ -1,7 +1,5 @@
 package io.javaoperatorsdk.operator.sample;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.time.Duration;
 import java.util.*;
 
@@ -12,14 +10,14 @@
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.utils.Serialization;
 import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.AssociatedSecondaryResourceIdentifier;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 
+import static io.javaoperatorsdk.operator.ReconcilerUtils.loadYaml;
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_FINALIZER;
 import static org.awaitility.Awaitility.await;
 
@@ -92,7 +90,7 @@ private void createDependentResources(KubernetesClient client) {
           @Override
           protected Deployment desired(WebPage webPage, Context context) {
             var deploymentName = deploymentName(webPage);
-            Deployment deployment = loadYaml(Deployment.class, "deployment.yaml");
+            Deployment deployment = loadYaml(Deployment.class, getClass(), "deployment.yaml");
             deployment.getMetadata().setName(deploymentName);
             deployment.getMetadata().setNamespace(webPage.getMetadata().getNamespace());
             deployment.getSpec().getSelector().getMatchLabels().put("app", deploymentName);
@@ -125,7 +123,7 @@ protected Class<Deployment> resourceType() {
 
           @Override
           protected Service desired(WebPage webPage, Context context) {
-            Service service = loadYaml(Service.class, "service.yaml");
+            Service service = loadYaml(Service.class, getClass(), "service.yaml");
             service.getMetadata().setName(serviceName(webPage));
             service.getMetadata().setNamespace(webPage.getMetadata().getNamespace());
             Map<String, String> labels = new HashMap<>();
@@ -153,14 +151,6 @@ private static String serviceName(WebPage nginx) {
     return nginx.getMetadata().getName();
   }
 
-  private <T> T loadYaml(Class<T> clazz, String yaml) {
-    try (InputStream is = getClass().getResourceAsStream(yaml)) {
-      return Serialization.unmarshal(is, clazz);
-    } catch (IOException ex) {
-      throw new IllegalStateException("Cannot find yaml on classpath: " + yaml);
-    }
-  }
-
   private class ConfigMapDependentResource extends KubernetesDependentResource<ConfigMap, WebPage>
       implements
       AssociatedSecondaryResourceIdentifier<WebPage> {