Skip to content

Commit cabe07d

Browse files
committed
fix: make things work again after rebase
1 parent 408fc9c commit cabe07d

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ public <R> Optional<R> getSecondaryResource(Class<R> expectedType,
5454
return discriminator.distinguish(expectedType, primaryResource, this);
5555
}
5656

57-
@Override
58-
public <R> Optional<R> getSecondaryResource(Class<R> expectedType,
59-
ResourceDiscriminator<R, P> discriminator) {
60-
return discriminator.distinguish(expectedType, primaryResource, this);
61-
}
62-
6357
@Override
6458
public ControllerConfiguration<P> getControllerConfiguration() {
6559
return controllerConfiguration;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ protected Resource<R> prepare(R desired, P primary, String actionName) {
162162
} else if (useDefaultAnnotationsToIdentifyPrimary()) {
163163
addDefaultSecondaryToPrimaryMapperAnnotations(desired, primary);
164164
}
165-
return client.resource(desired).inNamespace(desired.getMetadata().getNamespace())
166-
.resource(desired);
165+
return client.resource(desired).inNamespace(desired.getMetadata().getNamespace());
167166
}
168167

169168
@Override

0 commit comments

Comments
 (0)