Skip to content

Commit 6a5a3e3

Browse files
committed
fix: more ConfigurationService holding removal
1 parent c51b4bc commit 6a5a3e3

File tree

4 files changed

+3
-23
lines changed

4 files changed

+3
-23
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ public List<DependentResourceSpec> getDependentResources() {
162162
KubernetesDependent::addOwnerReference,
163163
KubernetesDependent.ADD_OWNER_REFERENCE_DEFAULT);
164164
KubernetesDependentResourceConfig config =
165-
new KubernetesDependentResourceConfig(
166-
addOwnerReference, namespaces, labelSelector, getConfigurationService());
165+
new KubernetesDependentResourceConfig(addOwnerReference, namespaces, labelSelector);
167166
specs.add(new DependentResourceSpec(dependentType, config));
168167
} else {
169168
specs.add(new DependentResourceSpec(dependentType));

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ public boolean watchAllNamespaces() {
4747
return watchAllNamespaces;
4848
}
4949

50-
public ConfigurationService getConfigurationService() {
51-
return ConfigurationServiceProvider.instance();
52-
}
53-
5450
@Override
5551
public Class<R> getResourceClass() {
5652
return resourceClass;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import io.fabric8.kubernetes.api.model.HasMetadata;
66
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
7-
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
87
import io.javaoperatorsdk.operator.api.reconciler.dependent.ManagedDependentResourceContext;
98
import io.javaoperatorsdk.operator.processing.Controller;
109

@@ -14,7 +13,7 @@ public class DefaultContext<P extends HasMetadata> implements Context<P> {
1413
private final Controller<P> controller;
1514
private final P primaryResource;
1615
private final ControllerConfiguration<P> controllerConfiguration;
17-
private ManagedDependentResourceContext managedDependentResourceContext;
16+
private final ManagedDependentResourceContext managedDependentResourceContext;
1817

1918
public DefaultContext(RetryInfo retryInfo, Controller<P> controller, P primaryResource) {
2019
this.retryInfo = retryInfo;

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

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

3-
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
4-
53
import static io.javaoperatorsdk.operator.api.reconciler.Constants.EMPTY_STRING;
64
import static io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent.ADD_OWNER_REFERENCE_DEFAULT;
75

@@ -10,16 +8,14 @@ public class KubernetesDependentResourceConfig {
108
private boolean addOwnerReference = ADD_OWNER_REFERENCE_DEFAULT;
119
private String[] namespaces = new String[0];
1210
private String labelSelector = EMPTY_STRING;
13-
private ConfigurationService configurationService;
1411

1512
public KubernetesDependentResourceConfig() {}
1613

1714
public KubernetesDependentResourceConfig(boolean addOwnerReference, String[] namespaces,
18-
String labelSelector, ConfigurationService configurationService) {
15+
String labelSelector) {
1916
this.addOwnerReference = addOwnerReference;
2017
this.namespaces = namespaces;
2118
this.labelSelector = labelSelector;
22-
this.configurationService = configurationService;
2319
}
2420

2521
public KubernetesDependentResourceConfig setAddOwnerReference(
@@ -38,12 +34,6 @@ public KubernetesDependentResourceConfig setLabelSelector(String labelSelector)
3834
return this;
3935
}
4036

41-
public KubernetesDependentResourceConfig setConfigurationService(
42-
ConfigurationService configurationService) {
43-
this.configurationService = configurationService;
44-
return this;
45-
}
46-
4737
public boolean addOwnerReference() {
4838
return addOwnerReference;
4939
}
@@ -55,8 +45,4 @@ public String[] namespaces() {
5545
public String labelSelector() {
5646
return labelSelector;
5747
}
58-
59-
public ConfigurationService getConfigurationService() {
60-
return configurationService;
61-
}
6248
}

0 commit comments

Comments
 (0)