Skip to content

refactor: remove multiple loadYaml implementations #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
metacosm merged 2 commits into from
Feb 17, 2022
Merged

refactor: remove multiple loadYaml implementations #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3235b8f
refactor: remove multiple loadYaml implementations
metacosm Feb 16, 2022
9861b24
fix: provide proper class loader! :facepalm:
metacosm Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions ...avaoperatorsdk/operator/sample/standalonedependent/StandaloneDependentTestReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion ...perator/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentDependentResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion ...t-operator/src/main/java/io/javaoperatorsdk/operator/sample/ServiceDependentResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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())
Expand Down
11 changes: 0 additions & 11 deletions ...rs/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
}
}
}
16 changes: 3 additions & 13 deletions ...operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package io.javaoperatorsdk.operator.sample;

import java.io.IOException;
import java.io.InputStream;
import java.time.Duration;
import java.util.*;

Expand All @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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<>();
Expand Down Expand Up @@ -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> {
Expand Down