Merge branch 'main' of https://cloud.o-forge.io/core/oc-monitord

env.env

@@ -0,0 +1,4 @@
+KUBERNETES_SERVICE_HOST=192.168.1.169
+KUBE_CA="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTVlk3ZHZhNEdYTVdkMy9jMlhLN3JLYjlnWXgyNSthaEE0NmkyNVBkSFAKRktQL2UxSVMyWVF0dzNYZW1TTUQxaStZdzJSaVppNUQrSVZUamNtNHdhcnFvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWtlUVJpNFJiODduME5yRnZaWjZHClc2SU55NnN3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnRXA5ck04WmdNclRZSHYxZjNzOW5DZXZZeWVVa3lZUk4KWjUzazdoaytJS1FDSVFDbk05TnVGKzlTakIzNDFacGZ5ays2NEpWdkpSM3BhcmVaejdMd2lhNm9kdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+KUBE_CERT="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJWUxWNkFPQkdrU1F3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl6TVRFeU1ETTJNQjRYRFRJME1EZ3dPREV3TVRNMU5sb1hEVEkxTURndwpPREV3TVRNMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGQ2Q1MFdPeWdlQ2syQzcKV2FrOWY4MVAvSkJieVRIajRWOXBsTEo0ck5HeHFtSjJOb2xROFYxdUx5RjBtOTQ2Nkc0RmRDQ2dqaXFVSk92Swp3NVRPNnd5alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJkOFI5cXVWK2pjeUVmL0ovT1hQSzMyS09XekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTArbThqTDBJVldvUTZ0dnB4cFo4NVlMalF1SmpwdXM0aDdnSXRxS3NmUVVDSUI2M2ZNdzFBMm5OVWU1TgpIUGZOcEQwSEtwcVN0Wnk4djIyVzliYlJUNklZCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRc3hXWk9pbnIrcVp4TmFEQjVGMGsvTDF5cE01VHAxOFRaeU92ektJazQKRTFsZWVqUm9STW0zNmhPeVljbnN3d3JoNnhSUnBpMW5RdGhyMzg0S0Z6MlBvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBYZkVmYXJsZm8zTWhIL3lmemx6Cnl0OWlqbHN3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxJL2dNYnNMT3MvUUpJa3U2WHVpRVMwTEE2cEJHMXgKcnBlTnpGdlZOekZsQWlFQW1wdjBubjZqN3M0MVI0QzFNMEpSL0djNE53MHdldlFmZWdEVGF1R2p3cFk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+KUBE_DATA="LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5ZS1BFb1dhd1NKUzJlRW5oWmlYMk5VZlY1ZlhKV2krSVNnV09TNFE5VTlvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVUozblJZN0tCNEtUWUx0WnFUMS96VS84a0Z2Sk1lUGhYMm1Vc25pczBiR3FZblkyaVZEeApYVzR2SVhTYjNqcm9iZ1YwSUtDT0twUWs2OHJEbE03ckRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="

main.go

@@ -84,6 +84,7 @@ func main() {
 	err := new_wf.LoadFrom(conf.GetConfig().WorkflowID, conf.GetConfig().PeerID)
 	if err != nil {
 
+
 		logger.Error().Msg("Could not retrieve workflow " + conf.GetConfig().WorkflowID + " from oc-catalog API")
 	}
 

workflow_builder/admiralty_setter.go

@@ -30,32 +30,38 @@ func (s *AdmiraltySetter) InitializeAdmiralty(localPeerID string,remotePeerID st
 	}
 	remotePeer := data.ToPeer()
 
-	data = oclib.NewRequest(oclib.LibDataEnum(oclib.PEER),"",localPeerID,nil,nil).LoadOne(localPeerID)
+			data = oclib.NewRequest(oclib.LibDataEnum(oclib.PEER),"",localPeerID,nil,nil).LoadOne(localPeerID)
-	if data.Code != 200 {
+			if data.Code != 200 {
-		logger.Error().Msg("Error while trying to instantiate local peer " + remotePeerID)
+				logger.Error().Msg("Error while trying to instantiate local peer " + remotePeerID)
-		return fmt.Errorf(data.Err)
+				return fmt.Errorf(data.Err)
-	}
+			}
-	localPeer := data.ToPeer()
+			localPeer := data.ToPeer()
 
-	caller := tools.NewHTTPCaller(
+			caller := tools.NewHTTPCaller(
-		map[tools.DataType]map[tools.METHOD]string{
+				map[tools.DataType]map[tools.METHOD]string{
-			tools.ADMIRALTY_SOURCE: {
+					tools.ADMIRALTY_SOURCE: {
-				tools.POST :"/:id",
+						tools.POST :"/:id",
-			},
+					},
-			tools.ADMIRALTY_KUBECONFIG: {
+					tools.ADMIRALTY_KUBECONFIG: {
-				tools.GET:"/:id",
+						tools.GET:"/:id",
-			},
+					},
-			tools.ADMIRALTY_SECRET: {
+					tools.ADMIRALTY_SECRET: {
-				tools.POST:"/:id",
+						tools.POST:"/:id",
-			},
+					},
+					tools.ADMIRALTY_TARGET: {
+						tools.POST:"/:id",
+					},
+					tools.ADMIRALTY_NODES: {
+						tools.GET:"/:id",
+					},
 			tools.ADMIRALTY_TARGET: {
-				tools.POST:"/:id",
+					tools.POST:"/:id",
+				},
+				tools.ADMIRALTY_NODES: {
+					tools.GET:"/:id",
+				},
 			},
-			tools.ADMIRALTY_NODES: {
+		)
-				tools.GET:"/:id",
-			},
-		},
-	)
 
 	logger.Info().Msg(" Creating the Admiralty Source on " + remotePeerID + " ns-" + s.Id + "\n\n")
 	_ = s.callRemoteExecution(remotePeer, []int{http.StatusCreated, http.StatusConflict},caller, s.Id, tools.ADMIRALTY_SOURCE, tools.POST, nil, true)

workflow_builder/argo_builder.go

@@ -9,28 +9,24 @@ import (
 	"oc-monitord/conf"
 	. "oc-monitord/models"
 	tools2 "oc-monitord/tools"
-	"os"
 	"strings"
-	"time"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
 	"cloud.o-forge.io/core/oc-lib/logs"
 	"cloud.o-forge.io/core/oc-lib/models/common/enum"
 	"cloud.o-forge.io/core/oc-lib/models/resources"
 	w "cloud.o-forge.io/core/oc-lib/models/workflow"
-	"github.com/nwtgck/go-fakelish"
 	"github.com/rs/zerolog"
-	"gopkg.in/yaml.v3"
 )
 
 var logger zerolog.Logger
 
 type ArgoBuilder struct {
-	OriginWorkflow 	*w.Workflow
+	OriginWorkflow *w.Workflow
-	Workflow       	Workflow
+	Workflow       Workflow
-	Services       	[]*Service
+	Services       []*Service
-	Timeout        	int
+	Timeout        int
-	RemotePeers		[]string
+	RemotePeers    []string
 }
 
 type Workflow struct {
@@ -177,7 +173,7 @@ func (b *ArgoBuilder) createArgoTemplates(namespace string,
 	_, firstItems, lastItems = b.addTaskToArgo(b.Workflow.getDag(), id, processing, firstItems, lastItems)
 	template := &Template{Name: getArgoName(processing.GetName(), id)}
 	fmt.Println("Creating template for", template.Name)
-	isReparted, peerId := b.isProcessingReparted(*processing,id)
+	isReparted, peerId := b.isProcessingReparted(*processing, id)
 	template.CreateContainer(processing, b.Workflow.getDag())
 	if isReparted {
 		b.RemotePeers = append(b.RemotePeers, peerId)
@@ -367,16 +363,15 @@ func getArgoName(raw_name string, component_id string) (formatedName string) {
 
 // Verify if a processing resource is attached to another Compute than the one hosting
 // the current Open Cloud instance. If true return the peer ID to contact
-func (b *ArgoBuilder) isProcessingReparted(processing resources.ProcessingResource, graphID string) (bool,string) {
+func (b *ArgoBuilder) isProcessingReparted(processing resources.ProcessingResource, graphID string) (bool, string) {
 	computeAttached := b.retrieveProcessingCompute(graphID)
 	if computeAttached == nil {
-		logger.Error().Msg("No compute was found attached to processing " + processing.Name + " : " + processing.UUID )
+		logger.Error().Msg("No compute was found attached to processing " + processing.Name + " : " + processing.UUID)
 		panic(0)
 	}
 
-	
 	// Creates an accessor srtictly for Peer Collection
-	req := oclib.NewRequest(oclib.LibDataEnum(oclib.PEER),"","",nil,nil)
+	req := oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), "", "", nil, nil)
 	if req == nil {
 		fmt.Println("TODO : handle error when trying to create a request on the Peer Collection")
 		return false, ""
@@ -391,8 +386,8 @@ func (b *ArgoBuilder) isProcessingReparted(processing resources.ProcessingResour
 
 	peer := *res.ToPeer()
 
-	isNotReparted, _ := peer.IsMySelf()
+	isNotReparted := peer.State == 1
-	fmt.Println("Result IsMySelf for ", peer.UUID ," : ", isNotReparted)
+	fmt.Println("Result IsMySelf for ", peer.UUID, " : ", isNotReparted)
 
 	return !isNotReparted, peer.UUID
 }
@@ -401,9 +396,9 @@ func (b *ArgoBuilder) retrieveProcessingCompute(graphID string) *resources.Compu
 	for _, link := range b.OriginWorkflow.Graph.Links {
 		// If a link contains the id of the processing
 		var oppositeId string
-		if link.Source.ID == graphID{
+		if link.Source.ID == graphID {
 			oppositeId = link.Destination.ID
-		} else if(link.Destination.ID == graphID){
+		} else if link.Destination.ID == graphID {
 			oppositeId = link.Source.ID
 		}
 		fmt.Println("OppositeId : ", oppositeId)
@@ -421,7 +416,6 @@ func (b *ArgoBuilder) retrieveProcessingCompute(graphID string) *resources.Compu
 	return nil
 }
 
-
 // Execute the last actions once the YAML file for the Argo Workflow is created
 func (b *ArgoBuilder) CompleteBuild(executionsId string) (string, error) {
 	fmt.Println("DEV :: Completing build")
@@ -429,38 +423,8 @@ func (b *ArgoBuilder) CompleteBuild(executionsId string) (string, error) {
 	// Setup admiralty for each node
 	for _, peer := range b.RemotePeers {
 		fmt.Println("DEV :: Launching Admiralty Setup for ", peer)
-		setter.InitializeAdmiralty(conf.GetConfig().PeerID,peer)
+		setter := AdmiraltySetter{Id: executionsId}
+		setter.InitializeAdmiralty(conf.GetConfig().PeerID, peer)
 	}
-
+	return nil
-	// Update the name of the admiralty node to use 
-	for _, template := range b.Workflow.Spec.Templates {
-		if len(template.Metadata.Annotations) > 0 {
-			if resp, ok := template.Metadata.Annotations["multicluster.admiralty.io/clustername"]; ok {
-				fmt.Println(resp)
-				template.Metadata.Annotations["multicluster.admiralty.io/clustername"] = "target-" + conf.GetConfig().ExecutionID
-			}
-		}
-	}
-
-	// Generate the YAML file
-	random_name := fakelish.GenerateFakeWord(5, 8) + "-" + fakelish.GenerateFakeWord(5, 8)
-	b.Workflow.Metadata.Name = "oc-monitor-" + random_name
-	logger = oclib.GetLogger()
-	yamlified, err := yaml.Marshal(b.Workflow)
-	if err != nil {
-		logger.Error().Msg("Could not transform object to yaml file")
-		return "", err 
-	}
-	// Give a unique name to each argo file with its timestamp DD:MM:YYYY_hhmmss
-	current_timestamp := time.Now().Format("02_01_2006_150405")
-	file_name := random_name + "_" + current_timestamp + ".yml"
-	workflows_dir := "./argo_workflows/"
-	err = os.WriteFile(workflows_dir+file_name, []byte(yamlified), 0660)
-	
-	if err != nil {
-		logger.Error().Msg("Could not write the yaml file")
-		return "", err
-	}
-
-	return workflows_dir + file_name, nil
 }