Skip to content

Commit 93c2b1b

Browse files
committed
fix: rebase on main
1 parent 7efc4fa commit 93c2b1b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.fabric8.kubernetes.api.model.HasMetadata;
77
import io.javaoperatorsdk.operator.api.reconciler.Context;
88
import io.javaoperatorsdk.operator.api.reconciler.Ignore;
9-
import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
109
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
1110
import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
1211
import io.javaoperatorsdk.operator.processing.event.ResourceID;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/CRUDKubernetesDependentResource.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package io.javaoperatorsdk.operator.processing.dependent.kubernetes;
22

33
import io.fabric8.kubernetes.api.model.HasMetadata;
4-
import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
54
import io.javaoperatorsdk.operator.api.reconciler.Ignore;
6-
import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
5+
import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
76
import io.javaoperatorsdk.operator.processing.dependent.Creator;
87
import io.javaoperatorsdk.operator.processing.dependent.Updater;
98

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/CRUDNoGCKubernetesDependentResource.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package io.javaoperatorsdk.operator.processing.dependent.kubernetes;
22

33
import io.fabric8.kubernetes.api.model.HasMetadata;
4+
import io.javaoperatorsdk.operator.api.reconciler.Ignore;
45
import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
56
import io.javaoperatorsdk.operator.processing.dependent.Creator;
67
import io.javaoperatorsdk.operator.processing.dependent.Updater;
78

9+
@Ignore
810
public class CRUDNoGCKubernetesDependentResource<R extends HasMetadata, P extends HasMetadata>
911
extends KubernetesDependentResource<R, P>
1012
implements Creator<R, P>, Updater<R, P>, Deleter<P> {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import io.javaoperatorsdk.operator.api.reconciler.Constants;
1818
import io.javaoperatorsdk.operator.api.reconciler.Context;
1919
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
20-
import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
2120
import io.javaoperatorsdk.operator.api.reconciler.Ignore;
21+
import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
2222
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
2323
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.KubernetesClientAware;
2424
import io.javaoperatorsdk.operator.processing.dependent.AbstractEventSourceHolderDependentResource;

0 commit comments

Comments
 (0)