Skip to content

Commit 571802f

Browse files
committed
rebase and related fixes
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 373a085 commit 571802f

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66

77
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
88
import io.fabric8.kubernetes.api.model.HasMetadata;
9-
import io.javaoperatorsdk.operator.api.config.Informable;
109
import io.fabric8.kubernetes.client.KubernetesClient;
11-
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
12-
import io.javaoperatorsdk.operator.api.config.DefaultResourceConfiguration;
13-
import io.javaoperatorsdk.operator.api.config.ResourceConfiguration;
14-
import io.javaoperatorsdk.operator.api.config.Utils;
10+
import io.javaoperatorsdk.operator.api.config.Informable;
1511
import io.javaoperatorsdk.operator.processing.GroupVersionKind;
1612
import io.javaoperatorsdk.operator.processing.event.source.PrimaryToSecondaryMapper;
1713
import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
@@ -62,11 +58,11 @@ default String name() {
6258
return getInformerConfig().getName();
6359
}
6460

65-
/**
66-
* Use of a specific kubernetes client, typically a client connects to a different cluster. Note
67-
* that this is solely for multi cluster support.
68-
*/
69-
KubernetesClient getKubernetesClient();
61+
/**
62+
* Use of a specific kubernetes client, typically a client connects to a different cluster. Note
63+
* that this is solely for multi cluster support.
64+
*/
65+
KubernetesClient getKubernetesClient();
7066

7167
class DefaultInformerEventSourceConfiguration<R extends HasMetadata>
7268
implements InformerEventSourceConfiguration<R> {
@@ -110,10 +106,10 @@ public Optional<GroupVersionKind> getGroupVersionKind() {
110106
return Optional.ofNullable(groupVersionKind);
111107
}
112108

113-
@Override
114-
public KubernetesClient getKubernetesClient() {
115-
return kubernetesClient;
116-
}
109+
@Override
110+
public KubernetesClient getKubernetesClient() {
111+
return kubernetesClient;
112+
}
117113
}
118114

119115
@SuppressWarnings({"unused", "UnusedReturnValue"})

0 commit comments

Comments
 (0)