Skip to content

feat: automatically derive the the dependent resource type if not specified #2772

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.javaoperatorsdk.operator.processing.dependent;

import java.lang.reflect.ParameterizedType;
import java.util.Optional;

import io.fabric8.kubernetes.api.model.HasMetadata;
Expand All @@ -23,13 +24,25 @@ public abstract class AbstractEventSourceHolderDependentResource<
private boolean isCacheFillerEventSource;
protected String eventSourceNameToUse;

@SuppressWarnings("unchecked")
protected AbstractEventSourceHolderDependentResource() {
this(null, null);
}

protected AbstractEventSourceHolderDependentResource(Class<R> resourceType) {
this(resourceType, null);
}

@SuppressWarnings("unchecked")
protected AbstractEventSourceHolderDependentResource(Class<R> resourceType, String name) {
super(name);
this.resourceType = resourceType;
if (resourceType == null) {
this.resourceType =
(Class<R>)
((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
} else {
this.resourceType = resourceType;
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public abstract class AbstractExternalDependentResource<

private InformerEventSource<?, P> externalStateEventSource;

protected AbstractExternalDependentResource() {}

@SuppressWarnings("unchecked")
protected AbstractExternalDependentResource(Class<R> resourceType) {
super(resourceType);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public abstract class AbstractPollingDependentResource<R, P extends HasMetadata>
public static final Duration DEFAULT_POLLING_PERIOD = Duration.ofMillis(5000);
private Duration pollingPeriod;

protected AbstractPollingDependentResource() {}

protected AbstractPollingDependentResource(Class<R> resourceType) {
this(resourceType, DEFAULT_POLLING_PERIOD);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public abstract class PerResourcePollingDependentResource<R, P extends HasMetada
extends AbstractPollingDependentResource<R, P>
implements PerResourcePollingEventSource.ResourceFetcher<R, P> {

public PerResourcePollingDependentResource() {}

public PerResourcePollingDependentResource(Class<R> resourceType) {
super(resourceType);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public abstract class CRUDKubernetesDependentResource<R extends HasMetadata, P e
extends KubernetesDependentResource<R, P>
implements Creator<R, P>, Updater<R, P>, GarbageCollected<P> {

public CRUDKubernetesDependentResource() {}

public CRUDKubernetesDependentResource(Class<R> resourceType) {
super(resourceType);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public abstract class KubernetesDependentResource<R extends HasMetadata, P exten
private KubernetesDependentResourceConfig<R> kubernetesDependentResourceConfig;
private volatile Boolean useSSA;

public KubernetesDependentResource() {}

public KubernetesDependentResource(Class<R> resourceType) {
this(resourceType, null);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ public class SchemaDependentResource

private MySQLDbConfig dbConfig;

public SchemaDependentResource() {
super(Schema.class);
}

@Override
public Optional<ResourcePollerConfig> configuration() {
return Optional.of(new ResourcePollerConfig(getPollingPeriod(), dbConfig));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ public class SecretDependentResource extends KubernetesDependentResource<Secret,
public static final String MYSQL_SECRET_USERNAME = "mysql.secret.user.name";
public static final String MYSQL_SECRET_PASSWORD = "mysql.secret.user.password";

public SecretDependentResource() {
super(Secret.class);
}

private static String encode(String value) {
return Base64.getEncoder().encodeToString(value.getBytes());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
public class DeploymentDependentResource
extends CRUDKubernetesDependentResource<Deployment, Tomcat> {

public DeploymentDependentResource() {
super(Deployment.class);
}

private static String tomcatImage(Tomcat tomcat) {
return "tomcat:" + tomcat.getSpec().getVersion();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
informer = @Informer(labelSelector = "app.kubernetes.io/managed-by=tomcat-operator"))
public class ServiceDependentResource extends CRUDKubernetesDependentResource<Service, Tomcat> {

public ServiceDependentResource() {
super(Service.class);
}

@Override
protected Service desired(Tomcat tomcat, Context<Tomcat> context) {
final ObjectMeta tomcatMetadata = tomcat.getMetadata();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
public class ConfigMapDependentResource
extends CRUDKubernetesDependentResource<ConfigMap, WebPage> {

public ConfigMapDependentResource() {
super(ConfigMap.class);
}

@Override
protected ConfigMap desired(WebPage webPage, Context<WebPage> context) {
Map<String, String> data = new HashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
public class DeploymentDependentResource
extends CRUDKubernetesDependentResource<Deployment, WebPage> {

public DeploymentDependentResource() {
super(Deployment.class);
}

@Override
protected Deployment desired(WebPage webPage, Context<WebPage> context) {
Map<String, String> labels = new HashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
informer = @Informer(labelSelector = WebPageManagedDependentsReconciler.SELECTOR))
public class IngressDependentResource extends CRUDKubernetesDependentResource<Ingress, WebPage> {

public IngressDependentResource() {
super(Ingress.class);
}

@Override
protected Ingress desired(WebPage webPage, Context<WebPage> context) {
return makeDesiredIngress(webPage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ public class ServiceDependentResource
.CRUDKubernetesDependentResource<
Service, WebPage> {

public ServiceDependentResource() {
super(Service.class);
}

@Override
protected Service desired(WebPage webPage, Context<WebPage> context) {
Map<String, String> serviceLabels = new HashMap<>();
Expand Down