Skip to content

Commit b81e4f2

Browse files
committed
refactor: more unneeded client recording removal
Signed-off-by: Chris Laprun <[email protected]>
1 parent 3cdfd99 commit b81e4f2

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractExternalDependentResource.java

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.processing.dependent;
22

33
import io.fabric8.kubernetes.api.model.HasMetadata;
4-
import io.fabric8.kubernetes.client.KubernetesClient;
54
import io.javaoperatorsdk.operator.api.reconciler.Context;
65
import io.javaoperatorsdk.operator.api.reconciler.dependent.RecentOperationCacheFiller;
76
import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
@@ -18,7 +17,6 @@ public abstract class AbstractExternalDependentResource<R, P extends HasMetadata
1817
@SuppressWarnings("rawtypes")
1918
private DependentResourceWithExplicitState dependentResourceWithExplicitState;
2019
private InformerEventSource<?, P> externalStateEventSource;
21-
private KubernetesClient kubernetesClient;
2220

2321
@SuppressWarnings("unchecked")
2422
protected AbstractExternalDependentResource(Class<R> resourceType) {
@@ -83,7 +81,7 @@ protected void handleExplicitStateCreation(P primary, R created, Context<P> cont
8381
public void deleteTargetResource(P primary, R resource, String key,
8482
Context<P> context) {
8583
if (isDependentResourceWithExplicitState) {
86-
getKubernetesClient()
84+
context.getClient()
8785
.resource(dependentResourceWithExplicitState.stateResource(primary, resource))
8886
.delete();
8987
}
@@ -99,18 +97,4 @@ public void handleDeleteTargetResource(P primary, R resource, String key,
9997
protected InformerEventSource getExternalStateEventSource() {
10098
return externalStateEventSource;
10199
}
102-
103-
/**
104-
* It's here just to manage the explicit state resource in case the dependent resource implements
105-
* {@link RecentOperationCacheFiller}.
106-
*
107-
* @return kubernetes client.
108-
*/
109-
public KubernetesClient getKubernetesClient() {
110-
return kubernetesClient;
111-
}
112-
113-
public void setKubernetesClient(KubernetesClient kubernetesClient) {
114-
this.kubernetesClient = kubernetesClient;
115-
}
116100
}

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ConfigMapDeleterBulkDependentResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public ConfigMap desired(BulkDependentTestCustomResource primary, String key,
5555
.withLabels(Map.of(LABEL_KEY, LABEL_VALUE))
5656
.build());
5757
configMap.setData(
58-
Map.of("number", "" + key, ADDITIONAL_DATA_KEY, primary.getSpec().getAdditionalData()));
58+
Map.of("number", key, ADDITIONAL_DATA_KEY, primary.getSpec().getAdditionalData()));
5959
return configMap;
6060
}
6161

0 commit comments

Comments
 (0)