Skip to content

Commit c2fbacf

Browse files
committed
fix IT
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent 34874e0 commit c2fbacf

File tree

4 files changed

+50
-12
lines changed

4 files changed

+50
-12
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.Set;
44

5+
import io.javaoperatorsdk.operator.api.reconciler.Constants;
56
import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
67
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
78
import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
@@ -10,7 +11,7 @@
1011

1112
public final class KubernetesDependentResourceConfigBuilder<R> {
1213

13-
private Set<String> namespaces;
14+
private Set<String> namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
1415
private String labelSelector;
1516
private boolean createResourceOnlyIfNotExistingWithSSA;
1617
private ResourceDiscriminator<R, ?> resourceDiscriminator;
@@ -77,7 +78,8 @@ public KubernetesDependentResourceConfigBuilder<R> withGenericFilter(
7778
}
7879

7980
public KubernetesDependentResourceConfig<R> build() {
80-
return new KubernetesDependentResourceConfig<>(namespaces, labelSelector, false,
81+
return new KubernetesDependentResourceConfig<>(namespaces, labelSelector,
82+
namespaces != Constants.SAME_AS_CONTROLLER_NAMESPACES_SET,
8183
createResourceOnlyIfNotExistingWithSSA, resourceDiscriminator, useSSA, onAddFilter,
8284
onUpdateFilter, onDeleteFilter, genericFilter);
8385
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentSSAMigrationIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,10 @@ private DependnetSSACustomResource reconcileWithLegacyOperator(Operator legacyOp
144144
private Operator createOperator(KubernetesClient client, boolean legacyDependentHandling,
145145
String fieldManager) {
146146
Operator operator = new Operator(client,
147-
o -> o.withSSABasedCreateUpdateMatchForDependentResources(!legacyDependentHandling)
148-
.withCloseClientOnStop(false));
149-
operator.register(new DependentSSAReconciler(), o -> {
147+
o -> o.withCloseClientOnStop(false));
148+
var reconciler = new DependentSSAReconciler(!legacyDependentHandling);
149+
reconciler.setKubernetesClient(client);
150+
operator.register(reconciler, o -> {
150151
o.settingNamespace(namespace);
151152
if (fieldManager != null) {
152153
o.withFieldManager(fieldManager);
@@ -155,7 +156,6 @@ private Operator createOperator(KubernetesClient client, boolean legacyDependent
155156
return operator;
156157
}
157158

158-
159159
public DependnetSSACustomResource testResource() {
160160
DependnetSSACustomResource resource = new DependnetSSACustomResource();
161161
resource.setMetadata(new ObjectMetaBuilder()
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,43 @@
11
package io.javaoperatorsdk.operator.sample.dependentssa;
22

3+
import java.util.Map;
34
import java.util.concurrent.atomic.AtomicInteger;
45

6+
import io.fabric8.kubernetes.api.model.ConfigMap;
7+
import io.fabric8.kubernetes.client.KubernetesClient;
58
import io.javaoperatorsdk.operator.api.reconciler.*;
6-
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
9+
import io.javaoperatorsdk.operator.junit.KubernetesClientAware;
10+
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfigBuilder;
11+
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
712
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
813

9-
@ControllerConfiguration(dependents = {@Dependent(type = SSAConfigMapDependent.class)})
14+
@ControllerConfiguration
1015
public class DependentSSAReconciler
11-
implements Reconciler<DependnetSSACustomResource>, TestExecutionInfoProvider {
16+
implements Reconciler<DependnetSSACustomResource>, TestExecutionInfoProvider,
17+
KubernetesClientAware,
18+
EventSourceInitializer<DependnetSSACustomResource> {
1219

1320
private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
1421

22+
private SSAConfigMapDependent ssaConfigMapDependent = new SSAConfigMapDependent();
23+
private KubernetesClient kubernetesClient;
24+
25+
public DependentSSAReconciler() {
26+
this(true);
27+
}
28+
29+
public DependentSSAReconciler(boolean useSSA) {
30+
ssaConfigMapDependent.configureWith(new KubernetesDependentResourceConfigBuilder<ConfigMap>()
31+
.withUseSSA(useSSA)
32+
.build());
33+
}
34+
1535
@Override
1636
public UpdateControl<DependnetSSACustomResource> reconcile(
1737
DependnetSSACustomResource resource,
1838
Context<DependnetSSACustomResource> context) {
39+
40+
ssaConfigMapDependent.reconcile(resource, context);
1941
numberOfExecutions.addAndGet(1);
2042
return UpdateControl.noUpdate();
2143
}
@@ -24,4 +46,21 @@ public int getNumberOfExecutions() {
2446
return numberOfExecutions.get();
2547
}
2648

49+
@Override
50+
public KubernetesClient getKubernetesClient() {
51+
return kubernetesClient;
52+
}
53+
54+
@Override
55+
public void setKubernetesClient(KubernetesClient kubernetesClient) {
56+
this.kubernetesClient = kubernetesClient;
57+
ssaConfigMapDependent.setKubernetesClient(kubernetesClient);
58+
}
59+
60+
@Override
61+
public Map<String, EventSource> prepareEventSources(
62+
EventSourceContext<DependnetSSACustomResource> context) {
63+
return EventSourceInitializer.nameEventSourcesFromDependentResource(context,
64+
ssaConfigMapDependent);
65+
}
2766
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentssa/SSAConfigMapDependent.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
88
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
99
import io.javaoperatorsdk.operator.api.reconciler.Context;
10-
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.BooleanWithUndefined;
1110
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
12-
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
1311

14-
@KubernetesDependent(useSSA = BooleanWithUndefined.TRUE)
1512
public class SSAConfigMapDependent extends
1613
CRUDKubernetesDependentResource<ConfigMap, DependnetSSACustomResource> {
1714

0 commit comments

Comments
 (0)