Skip to content

Support CNPG clusters #666

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

Merged
olevitt merged 1 commit into from
Mar 30, 2026
Merged

Support CNPG clusters #666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmReleaseHealthResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
package fr.insee.onyxia.api.services.impl;

import fr.insee.onyxia.model.service.HealthCheckResult;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.apps.DaemonSet;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.StatefulSet;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public final class HelmReleaseHealthResolver {

private static final Logger LOGGER = LoggerFactory.getLogger(HelmReleaseHealthResolver.class);

private static final ResourceDefinitionContext CNPG_CLUSTER =
new ResourceDefinitionContext.Builder()
.withGroup("postgresql.cnpg.io")
.withVersion("v1")
.withPlural("clusters")
.withNamespaced(true)
.build();

static List<HealthCheckResult> checkHelmReleaseHealth(
String namespace, String manifest, KubernetesClient kubernetesClient) {
// Identify the Helm release secret
Expand All @@ -33,12 +45,13 @@
return checkHealth(namespace, resources, kubernetesClient);
}

private static List<HealthCheckResult> checkHealth(

Check warning on line 48 in onyxia-api/src/main/java/fr/insee/onyxia/api/services/impl/HelmReleaseHealthResolver.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A "Brain Method" was detected. Refactor it to reduce at least one of the following metrics: LOC from 92 to 64, Complexity from 17 to 14, Nesting Level from 4 to 2, Number of Variables from 16 to 6. 


See more on https://sonarcloud.io/project/issues?id=InseeFrLab_onyxia-api&issues=AZ0kp89tar6aFTbyXDM9&open=AZ0kp89tar6aFTbyXDM9&pullRequest=666
String namespace, List<HasMetadata> resources, KubernetesClient kubernetesClient) {
List<HealthCheckResult> results = new ArrayList<>();
for (HasMetadata resource : resources) {
String name = resource.getMetadata().getName();
String kind = resource.getKind();
String apiVersion = resource.getApiVersion();
HealthCheckResult result = new HealthCheckResult();
result.setName(name);
result.setKind(kind);
Expand Down Expand Up @@ -96,6 +109,25 @@
details.setReady(daemonSet.getStatus().getNumberReady());
}
break;
case "Cluster":
if (!"postgresql.cnpg.io/v1".equals(apiVersion)) continue;
GenericKubernetesResource raw =
kubernetesClient
.genericKubernetesResources(CNPG_CLUSTER)
.inNamespace(namespace)
.withName(name)
.get();
if (raw.getAdditionalProperties().get("status") instanceof Map) {
Map<String, Object> status =
Collections.unmodifiableMap(
(Map<String, Object>)
raw.getAdditionalProperties().get("status"));
details.setDesired(
Integer.parseInt(status.get("instances").toString()));
details.setReady(
Integer.parseInt(status.get("readyInstances").toString()));
}
break;
default:
continue;
}
Expand Down
Loading