Skip to content

Commit 91079f0

Browse files
committed
fixes
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 8a26331 commit 91079f0

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public class GlueReconciler implements Reconciler<Glue>, Cleaner<Glue> {
4040

4141
private static final Logger log = LoggerFactory.getLogger(GlueReconciler.class);
4242
public static final String DEPENDENT_NAME_ANNOTATION_KEY =
43-
"io.javaoperatorsdk.operator.resourceflow/name";
43+
"io.javaoperatorsdk.operator.glue/resource-name";
4444
public static final String PARENT_GLUE_FINALIZER_PREFIX =
45-
"io.javaoperatorsdk.operator.resourceflow.glue/";
45+
"io.javaoperatorsdk.operator.glue/";
4646
public static final String GLUE_RECONCILER_NAME = "glue";
4747

4848

@@ -97,6 +97,7 @@ public UpdateControl<Glue> reconcile(Glue primary,
9797
@Override
9898
public DeleteControl cleanup(Glue primary, Context<Glue> context) {
9999

100+
registerRelatedResourceInformers(context, primary);
100101
var actualWorkflow = buildWorkflowAndRegisterInformers(primary, context);
101102
var result = actualWorkflow.cleanup(primary, context);
102103
result.throwAggregateExceptionIfErrorsPresent();
@@ -147,9 +148,8 @@ private UpdateControl<Glue> removeErrorMessageFromGlueStatusIfPresent(Glue prima
147148

148149
private void registerRelatedResourceInformers(Context<Glue> context,
149150
Glue glue) {
150-
glue.getSpec().getRelatedResources().forEach(r -> {
151-
informerRegister.registerInformerForRelatedResource(context, glue, r);
152-
});
151+
glue.getSpec().getRelatedResources()
152+
.forEach(r -> informerRegister.registerInformerForRelatedResource(context, glue, r));
153153
}
154154

155155
// todo test

src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerRegister.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,14 @@ public InformerEventSource<GenericKubernetesResource, Glue> registerInformer(
9797
var configBuilder = InformerEventSourceConfiguration.from(gvk, Glue.class)
9898
.withSecondaryToPrimaryMapper(mapper)
9999
.withName(gvk.toString());
100+
configBuilder.withName(gvk.toString());
100101
labelSelectorForGVK(gvk).ifPresent(ls -> {
101102
log.debug("Registering label selector: {} for informer for gvk: {}", ls, gvk);
102103
configBuilder.withLabelSelector(ls);
103104
});
104105

105106
var newInformer = informerProducer.createInformer(configBuilder.build(), context);
106-
107+
log.debug("Registering informer for gvk: {}", gvk);
107108
return (InformerEventSource<GenericKubernetesResource, Glue>) context
108109
.eventSourceRetriever()
109110
.dynamicallyRegisterEventSource(newInformer);

0 commit comments

Comments
 (0)