Skip to content

Commit

Permalink
Merge branch 'main' into add-keycloak-support
Browse files Browse the repository at this point in the history
  • Loading branch information
carlesarnal authored Feb 4, 2025
2 parents 0d8fa0b + 61e53f3 commit 1040bd3
Show file tree
Hide file tree
Showing 11 changed files with 116 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,13 @@

import static io.apicurio.registry.operator.api.v1.ContainerNames.REGISTRY_APP_CONTAINER_NAME;
import static io.apicurio.registry.operator.resource.LabelDiscriminators.AppDeploymentDiscriminator;
import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_APP;
import static io.apicurio.registry.operator.resource.ResourceKey.APP_DEPLOYMENT_KEY;
import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_SERVICE_KEY;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;
import static java.util.Objects.requireNonNull;
import static java.util.Optional.ofNullable;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_APP,
resourceDiscriminator = AppDeploymentDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = AppDeploymentDiscriminator.class)
public class AppDeploymentResource extends CRUDKubernetesDependentResource<Deployment, ApicurioRegistry3> {

private static final Logger log = LoggerFactory.getLogger(AppDeploymentResource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_APP,
resourceDiscriminator = AppIngressDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = AppIngressDiscriminator.class)
public class AppIngressResource extends CRUDKubernetesDependentResource<Ingress, ApicurioRegistry3> {

private static final Logger log = LoggerFactory.getLogger(AppIngressResource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static io.apicurio.registry.operator.resource.LabelDiscriminators.*;
import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_APP;
import static io.apicurio.registry.operator.resource.LabelDiscriminators.AppServiceDiscriminator;
import static io.apicurio.registry.operator.resource.ResourceKey.APP_SERVICE_KEY;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_APP,
resourceDiscriminator = AppServiceDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = AppServiceDiscriminator.class)
public class AppServiceResource extends CRUDKubernetesDependentResource<Service, ApicurioRegistry3> {

private static final Logger log = LoggerFactory.getLogger(AppServiceResource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,14 @@
import java.util.LinkedHashMap;

import static io.apicurio.registry.operator.api.v1.ContainerNames.STUDIO_UI_CONTAINER_NAME;
import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_STUDIO_UI;
import static io.apicurio.registry.operator.resource.ResourceKey.*;
import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.addEnvVar;
import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.getContainerFromDeployment;
import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;
import static java.util.Optional.ofNullable;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_STUDIO_UI,
resourceDiscriminator = StudioUIDeploymentDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = StudioUIDeploymentDiscriminator.class)
public class StudioUIDeploymentResource
extends CRUDKubernetesDependentResource<Deployment, ApicurioRegistry3> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@
import org.slf4j.LoggerFactory;

import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_STUDIO_UI;
import static io.apicurio.registry.operator.resource.ResourceKey.*;
import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_INGRESS_KEY;
import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_SERVICE_KEY;
import static io.apicurio.registry.operator.utils.IngressUtils.getHost;
import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_STUDIO_UI,
resourceDiscriminator = StudioUIIngressDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = StudioUIIngressDiscriminator.class)
public class StudioUIIngressResource extends CRUDKubernetesDependentResource<Ingress, ApicurioRegistry3> {

private static final Logger log = LoggerFactory.getLogger(StudioUIIngressResource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_STUDIO_UI;
import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_SERVICE_KEY;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_STUDIO_UI,
resourceDiscriminator = StudioUIServiceDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = StudioUIServiceDiscriminator.class)
public class StudioUIServiceResource extends CRUDKubernetesDependentResource<Service, ApicurioRegistry3> {

private static final Logger log = LoggerFactory.getLogger(StudioUIServiceResource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,14 @@

import static io.apicurio.registry.operator.api.v1.ContainerNames.REGISTRY_UI_CONTAINER_NAME;
import static io.apicurio.registry.operator.resource.LabelDiscriminators.UIDeploymentDiscriminator;
import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_UI;
import static io.apicurio.registry.operator.resource.ResourceKey.*;
import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.addEnvVar;
import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.getContainerFromDeployment;
import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;
import static java.util.Optional.ofNullable;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_UI,
resourceDiscriminator = UIDeploymentDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = UIDeploymentDiscriminator.class)
public class UIDeploymentResource extends CRUDKubernetesDependentResource<Deployment, ApicurioRegistry3> {

private static final Logger log = LoggerFactory.getLogger(UIDeploymentResource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
import static io.apicurio.registry.operator.utils.IngressUtils.withIngressRule;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_UI,
resourceDiscriminator = UIIngressDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = UIIngressDiscriminator.class)
public class UIIngressResource extends CRUDKubernetesDependentResource<Ingress, ApicurioRegistry3> {

private static final Logger log = LoggerFactory.getLogger(UIIngressResource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static io.apicurio.registry.operator.resource.LabelDiscriminators.*;
import static io.apicurio.registry.operator.resource.ResourceFactory.COMPONENT_UI;
import static io.apicurio.registry.operator.resource.LabelDiscriminators.UIServiceDiscriminator;
import static io.apicurio.registry.operator.resource.ResourceKey.UI_SERVICE_KEY;
import static io.apicurio.registry.operator.utils.Mapper.toYAML;

@KubernetesDependent(
labelSelector = "app.kubernetes.io/name=apicurio-registry,app.kubernetes.io/component=" + COMPONENT_UI,
resourceDiscriminator = UIServiceDiscriminator.class
)
@KubernetesDependent(resourceDiscriminator = UIServiceDiscriminator.class)
public class UIServiceResource extends CRUDKubernetesDependentResource<Service, ApicurioRegistry3> {

private static final Logger log = LoggerFactory.getLogger(UIServiceResource.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.ConfigBuilder;
Expand All @@ -14,6 +15,7 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.javaoperatorsdk.operator.Operator;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.processing.event.ResourceID;
import io.quarkiverse.operatorsdk.runtime.QuarkusConfigurationService;
import jakarta.enterprise.inject.Instance;
import jakarta.enterprise.inject.spi.CDI;
Expand All @@ -24,12 +26,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.FileInputStream;
import java.io.IOException;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -56,6 +59,7 @@ public enum OperatorDeployment {
protected static Instance<Reconciler<? extends HasMetadata>> reconcilers;
protected static QuarkusConfigurationService configuration;
protected static KubernetesClient client;
protected static PodLogManager podLogManager;
protected static PortForwardManager portForwardManager;
protected static IngressManager ingressManager;
protected static String deploymentTarget;
Expand All @@ -81,9 +85,11 @@ public static void before() throws Exception {

portForwardManager = new PortForwardManager(client, namespace);
ingressManager = new IngressManager(client, namespace);
podLogManager = new PodLogManager(client);

if (operatorDeployment == OperatorDeployment.remote) {
createTestResources();
startOperatorLogs();
} else {
createOperator();
registerReconcilers();
Expand Down Expand Up @@ -178,6 +184,21 @@ private static void createTestResources() throws Exception {
});
}

private static void startOperatorLogs() {
List<Pod> operatorPods = new ArrayList<>();
await().ignoreExceptions().untilAsserted(() -> {
operatorPods.clear();
operatorPods.addAll(client.pods()
.withLabels(Map.of(
"app.kubernetes.io/name", "apicurio-registry-operator",
"app.kubernetes.io/component", "operator",
"app.kubernetes.io/part-of", "apicurio-registry"))
.list().getItems());
assertThat(operatorPods).hasSize(1);
});
podLogManager.startPodLog(ResourceID.fromResource(operatorPods.get(0)));
}

private static void cleanTestResources() throws Exception {
if (cleanup) {
log.info("Deleting generated resources from Namespace {}", namespace);
Expand Down Expand Up @@ -261,7 +282,7 @@ static void createNamespace(KubernetesClient client, String namespace) {
}

static String calculateNamespace() {
return ("apicurio-registry-operator-test-" + UUID.randomUUID()).substring(0, 63);
return "test-" + UUID.randomUUID().toString().substring(0, 7);
}

static void setDefaultAwaitilityTimings() {
Expand Down Expand Up @@ -306,7 +327,7 @@ public static void after() throws Exception {
} else {
cleanTestResources();
}

podLogManager.stopAndWait();
if (cleanup) {
log.info("Deleting namespace : {}", namespace);
assertThat(client.namespaces().withName(namespace).delete()).isNotNull();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package io.apicurio.registry.operator.it;

import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.dsl.LogWatch;
import io.javaoperatorsdk.operator.processing.event.ResourceID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.time.Duration;
import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;

import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;

public class PodLogManager {

private static final Logger log = LoggerFactory.getLogger(PodLogManager.class);

private final KubernetesClient k8sClient;

private final Map<ResourceID, AtomicBoolean> activePodLogMap = new ConcurrentHashMap<>();

public PodLogManager(KubernetesClient k8sClient) {
this.k8sClient = k8sClient;
}

private String getNamespace(ResourceID id) {
return id.getNamespace().orElse("default");
}

public void startPodLog(ResourceID podID) {
k8sClient.pods().inNamespace(getNamespace(podID)).withName(podID.getName()).waitUntilReady(60,
SECONDS);
new Thread(() -> {
StringBuilder chunk = new StringBuilder();
try (
LogWatch logWatch = k8sClient.pods().inNamespace(getNamespace(podID)).withName(podID.getName()).watchLog();
BufferedReader reader = new BufferedReader(new InputStreamReader(logWatch.getOutput()))
) {
AtomicBoolean stop = new AtomicBoolean(false);
log.debug("START LOG of pod {}/{}", getNamespace(podID), podID.getName());
activePodLogMap.put(podID, stop);
var lastWriteAt = Instant.now();
while (!stop.get()) {
var line = reader.readLine();
if (line != null) {
chunk.append(getNamespace(podID)).append("/").append(podID.getName()).append(" >>> ")
.append(line).append("\n");
if (lastWriteAt.plus(Duration.ofSeconds(5)).isBefore(Instant.now())) {
log.debug("LOG of pod {}/{}:\n{}", getNamespace(podID), podID.getName(), chunk);
chunk.setLength(0);
lastWriteAt = Instant.now();
}
} else {
stop.set(true);
}
}
} catch (Exception ex) {
log.error("Error while reading logs of pod {}/{}", getNamespace(podID), podID.getName(), ex);
} finally {
if (chunk.length() > 0) {
log.debug("LOG of pod {}/{}:\n{}", getNamespace(podID), podID.getName(), chunk);
}
log.debug("END LOG of pod {}/{}", getNamespace(podID), podID.getName());
activePodLogMap.remove(podID);
}
}).start();
}

public void stopAndWait() {
activePodLogMap.values().forEach(stop -> stop.set(true));
await().until(activePodLogMap::isEmpty);
}
}

0 comments on commit 1040bd3

Please sign in to comment.