Skip to content

feat(AdditionnalRef): implement multi ref #6

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

Open
jlore-decathlon wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(AdditionnalRef): implement multi ref #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3520f63
feat(AdditionnalRef): implement multi ref
jlore-decathlon Nov 27, 2023
e7de207
feat(AdditionnalRef): implement multi ref
jlore-decathlon Nov 27, 2023
992ae9d
feat(AdditionnalRef): implement multi ref
jlore-decathlon Nov 27, 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
2 changes: 2 additions & 0 deletions src/main/java/com/decathlon/github/kubernetesstatus/model/v1beta1/GitHubDeploymentSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;


@Data
Expand All @@ -15,6 +16,7 @@
@ApiModel(description = "GitHubDeployment spec part.")
public class GitHubDeploymentSpec {
private NamespacedObject sourceRef;
private List<NamespacedObject> additionnalRef;
private ExtractRule extract;
private RepositoryDetail repository;

Expand Down
35 changes: 25 additions & 10 deletions src/main/java/com/decathlon/github/kubernetesstatus/service/CaptureService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.decathlon.github.kubernetesstatus.service;

import com.decathlon.github.kubernetesstatus.model.v1beta1.GitHubDeployment;
import com.decathlon.github.kubernetesstatus.model.v1beta1.GitHubDeploymentSpec;
import com.decathlon.github.kubernetesstatus.model.v1beta1.GitHubDeploymentStatus;
import com.decathlon.github.kubernetesstatus.service.kstatus.Status;
import com.decathlon.github.kubernetesstatus.service.kstatus.data.KubeObjectResult;
import com.decathlon.github.kubernetesstatus.service.kstatus.data.KubeObjectStatus;
import com.decathlon.github.kubernetesstatus.service.kubernetes.DynamicObjectExtractor;
import com.decathlon.github.kubernetesstatus.service.kubernetes.EventManager;
import com.google.gson.JsonArray;
Expand All @@ -18,9 +20,7 @@
import org.apache.logging.log4j.util.Strings;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.HashMap;
import java.util.Objects;
import java.util.*;
import java.util.regex.Pattern;

@Service
Expand All @@ -35,26 +35,41 @@ public class CaptureService {


public void capture(GitHubDeployment deployment) {
List<DynamicKubernetesObject> dynamicKubernetesObjects = new ArrayList<>();
KubeObjectResult status = null;


log.debug("[{}/{}] Observing GitHub Deployment", deployment.getMetadata().getNamespace(), deployment.getMetadata().getName());

var kobj=dynamicObjectExtractor.extractKubeObject(deployment.getSpec().getSourceRef());
if (kobj==null) {
dynamicKubernetesObjects.add(dynamicObjectExtractor.extractKubeObject(deployment.getSpec().getSourceRef()));
if (dynamicKubernetesObjects.isEmpty() || dynamicKubernetesObjects.get(0) ==null) {
return;
}

log.info("[{}/{}] Will check {}/{} kubernetes object", deployment.getMetadata().getNamespace(), deployment.getMetadata().getName(), kobj.getMetadata().getNamespace(), kobj.getMetadata().getName());
for(GitHubDeploymentSpec.NamespacedObject namespacedObject : deployment.getSpec().getAdditionnalRef()) {
dynamicKubernetesObjects.add(dynamicObjectExtractor.extractKubeObject(namespacedObject));
}

var ref=extractRef(deployment, kobj);
for(DynamicKubernetesObject dynamicKubernetesObject : dynamicKubernetesObjects) {
log.info("[{}/{}] Will check {}/{} kubernetes object", deployment.getMetadata().getNamespace(), deployment.getMetadata().getName(), dynamicKubernetesObject.getMetadata().getNamespace(), dynamicKubernetesObject.getMetadata().getName());
KubeObjectResult statusTemp = Status.compute(dynamicKubernetesObject);

if(status == null || status.status().canMoveTo(statusTemp.status())) {
status = statusTemp;
}
if(status.status().compareTo(KubeObjectStatus.CURRENT) != 0 ) break;
}


var ref=extractRef(deployment, dynamicKubernetesObjects.get(0));
if (ref==null){
log.warn("[{}/{}] Cannot extract ref from kube object with extract rule {}", deployment.getMetadata().getNamespace(), deployment.getMetadata().getName(), deployment.getSpec().getExtract());
return;
}

var status=Status.compute(kobj);

log.info("[{}/{}] ref found is {}, computed status is {}", deployment.getMetadata().getNamespace(), deployment.getMetadata().getName(), ref, status);

updateGhd(deployment, kobj.getMetadata(), status, ref);
updateGhd(deployment, dynamicKubernetesObjects.get(0).getMetadata(), status, ref);
Copy link

@mveroone mveroone Feb 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't you compute the boolean product of all elements of the array instead of taking the first one ? that seems to defeat the purpose ?

}

private void updateGhd(GitHubDeployment deployment, V1ObjectMeta metadata, KubeObjectResult status, String ref) {
Expand Down