Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MGDSTRM-9751 - JOSDK and fabric8 update #863

Merged
merged 3 commits into from
Feb 2, 2023
Merged

MGDSTRM-9751 - JOSDK and fabric8 update #863

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5456606
JOSDK and fabric8 upgrade
biswassri Jan 31, 2023
43d55df
Changes from PR review
biswassri Feb 1, 2023
eff85f7
Fix for Controller
biswassri Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaAgentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.bf2.operator.controllers;

import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
Expand Down Expand Up @@ -44,9 +43,8 @@
*/
@ApplicationScoped
@ControllerConfiguration(
finalizerName = Constants.NO_FINALIZER,
MikeEdgar marked this conversation as resolved.
Show resolved Hide resolved
generationAwareEventProcessing = false,
eventFilters = { ControllerEventFilter.class })
onUpdateFilter = ControllerEventFilter.class)
public class ManagedKafkaAgentController implements Reconciler<ManagedKafkaAgent> {

@Inject
Expand Down
15 changes: 2 additions & 13 deletions operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
package org.bf2.operator.controllers;

import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
import io.javaoperatorsdk.operator.api.reconciler.EventSourceInitializer;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
import io.micrometer.core.annotation.Counted;
import io.micrometer.core.annotation.Timed;
import org.bf2.common.ConditionUtils;
Expand Down Expand Up @@ -41,17 +36,15 @@
import javax.inject.Inject;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

@ControllerConfiguration(
MikeEdgar marked this conversation as resolved.
Show resolved Hide resolved
finalizerName = Constants.NO_FINALIZER,
generationAwareEventProcessing = false,
eventFilters = { ControllerEventFilter.class })
public class ManagedKafkaController implements Reconciler<ManagedKafka>, EventSourceInitializer<HasMetadata> {
onUpdateFilter = ControllerEventFilter.class)
public class ManagedKafkaController implements Reconciler<ManagedKafka> {

// 1 for bootstrap URL + 1 for Admin API server
private static final int NUM_NON_BROKER_ROUTES = 2;
Expand Down Expand Up @@ -128,10 +121,6 @@ public UpdateControl<ManagedKafka> reconcile(ManagedKafka managedKafka, Context
}
}

@Override
public List<EventSource> prepareEventSources(EventSourceContext<HasMetadata> context) {
return Arrays.asList(eventSource);
}
biswassri marked this conversation as resolved.
Show resolved Hide resolved

/**
* Extract from the current KafkaInstance overall status (Kafka, Canary and AdminServer)
Expand Down
11 changes: 4 additions & 7 deletions operator/src/main/java/org/bf2/operator/events/ControllerEventFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.zjsonpatch.JsonDiff;
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilter;
import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
import org.jboss.logging.Logger;

import java.util.Collections;
Expand All @@ -29,20 +28,18 @@
* </ul>
*
*/
public class ControllerEventFilter implements ResourceEventFilter<HasMetadata> {
public class ControllerEventFilter implements OnUpdateFilter<HasMetadata> {

private static Logger log = Logger.getLogger(ControllerEventFilter.class);

@Override
public boolean acceptChange(ControllerConfiguration<HasMetadata> configuration,
HasMetadata oldResource,
HasMetadata newResource) {
public boolean accept(HasMetadata oldResource,
HasMetadata newResource) {
MikeEdgar marked this conversation as resolved.
Show resolved Hide resolved

Optional<ObjectMeta> oldMeta = meta(oldResource);
Optional<ObjectMeta> newMeta = meta(newResource);

boolean resourceChanged =
oldResource == null || // Always accept an "add" change
changed(oldMeta, newMeta, this::generation) ||
changed(oldMeta, newMeta, this::annotations) ||
changed(oldMeta, newMeta, this::labels);
Expand Down
4 changes: 2 additions & 2 deletions operator/src/main/java/org/bf2/operator/events/ResourceEventSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ protected void handleEvent(HasMetadata resource, ResourceAction action) {
// the operator may not have inited yet
if (getEventHandler() != null) {
ResourceID.fromFirstOwnerReference(resource).ifPresentOrElse(
ownerId -> getEventHandler().handleEvent(new ResourceEvent(action, ownerId)),
MikeEdgar marked this conversation as resolved.
Show resolved Hide resolved
ownerId -> getEventHandler().handleEvent(new ResourceEvent(action, ownerId, null )),
() -> log.warnf("%s %s/%s does not have OwnerReference", resource.getKind(), resource.getMetadata().getNamespace(), resource.getMetadata().getName()));
}
}
public void handleEvent(CustomResource resource) {
if (getEventHandler() != null) {
getEventHandler().handleEvent(new ResourceEvent(ResourceAction.UPDATED, ResourceID.fromResource(resource)));
getEventHandler().handleEvent(new ResourceEvent(ResourceAction.UPDATED, ResourceID.fromResource(resource), null));
}
}
}
18 changes: 4 additions & 14 deletions operator/src/test/java/org/bf2/operator/events/ControllerEventFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package org.bf2.operator.events;

import io.fabric8.kubernetes.api.model.HasMetadata;
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
import org.bf2.operator.resources.v1alpha1.ManagedKafka;
import org.bf2.operator.resources.v1alpha1.ManagedKafkaBuilder;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import java.util.Map;

Expand All @@ -16,18 +13,11 @@
class ControllerEventFilterTest {

ControllerEventFilter target;
ControllerConfiguration<HasMetadata> mockConfiguration;

@BeforeEach
@SuppressWarnings("unchecked")
void setup() {
target = new ControllerEventFilter();
mockConfiguration = Mockito.mock(ControllerConfiguration.class);
}

@Test
void testAddResourceAccepted() {
assertTrue(target.acceptChange(mockConfiguration, null, new ManagedKafka()));
}

@Test
Expand All @@ -43,7 +33,7 @@ void testChangedGenerationAccepted() {
.endMetadata()
.build();

assertTrue(target.acceptChange(mockConfiguration, oldMk, newMk));
assertTrue(target.accept(oldMk, newMk));
}

@Test
Expand All @@ -59,7 +49,7 @@ void testChangedAnnotationsAccepted() {
.endMetadata()
.build();

assertTrue(target.acceptChange(mockConfiguration, oldMk, newMk));
assertTrue(target.accept(oldMk, newMk));
}

@Test
Expand All @@ -75,7 +65,7 @@ void testChangedLabelsAccepted() {
.endMetadata()
.build();

assertTrue(target.acceptChange(mockConfiguration, oldMk, newMk));
assertTrue(target.accept(oldMk, newMk));
}

@Test
Expand All @@ -95,6 +85,6 @@ void testUnchangedNotAccepted() {
.endMetadata()
.build();

assertFalse(target.acceptChange(mockConfiguration, oldMk, newMk));
assertFalse(target.accept(oldMk, newMk));
}
}
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus-plugin.version>${quarkus.platform.version}</quarkus-plugin.version>
<strimzi.version>0.29.0</strimzi.version>
<fabric8.client.version>5.12.2</fabric8.client.version>
<quarkus.operator.extension>3.0.9</quarkus.operator.extension>
<fabric8.client.version>5.12.4</fabric8.client.version>
<quarkus.operator.extension>4.0.7</quarkus.operator.extension>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<junit.platform.version>1.7.2</junit.platform.version>
<sundrio.version>0.50.4</sundrio.version>
Expand Down