demo

Dockerfile

@@ -1,4 +1,3 @@
-ARG KUBERNETES_HOST=${KUBERNETES_HOST:-"127.0.0.1"}
 FROM golang:alpine AS deps
 
 ARG MONITORD_IMAGE
@@ -26,8 +25,6 @@ FROM ${MONITORD_IMAGE:-oc-monitord}:latest AS monitord
 
 FROM scratch
 
-ENV KUBERNETES_SERVICE_HOST=$KUBERNETES_HOST
-
 WORKDIR /app
 
 COPY docker_schedulerd.json /etc/oc/schedulerd.json
@@ -37,7 +34,7 @@ COPY --from=builder /app/oc-schedulerd /usr/bin/oc-schedulerd
 
 COPY docker_schedulerd.json /etc/oc/schedulerd.json
 
-# COPY argo_workflows .
+COPY argo_workflows .
 
 EXPOSE 8080
 

README.md

@@ -1,34 +1,23 @@
 # oc-scheduler
 
-oc-schedulerd is a daemon performing to actions at the same time :
+OC-Scheduler retrieves the content of submitted workflows and prepare them to be executed. 
-- subscribing to the local NATS instance' custom channels for message commanding either the scheduling or the removing of an execution.  
-- polling oc-catalog for scheduled executions 
 
-Depending on the environment it is running in, oc-schedulerd will either :
+make dev
-- execute the oc-monitord binary
-- run an oc-monitord container 
 
-## Parameters
+## Parsing 
 
-oc-schedulerd uses json files to load its configuration. The template for this configuration file is below
+From a workflow's name we retrieve the xml graph associated and parse it in order to create the object representing each componant.
+Each object is linked to another, represented by a links object with the two object IDs has attributes.
 
-```json
+TODO : 
-{
+- [x] Retrieve the user input's for each component.
-    "LOKI_URL" : "http://[IP/URL]:3100",
-    "MONGO_URL":"mongodb://[IP/URL]:27017/", 
-    "NATS_URL":"nats://[IP/URL]:4222",
-    "MONGO_DATABASE":"",
-    "MONITORD_PATH": "",
-    "KUBERNETES_SERVICE_HOST" : "[IP/URL]",
-    "MONITOR_MODE": "",
-    "KUBE_CA": "",
-    "KUBE_CERT": "",
-    "KUBE_DATA": ""
-}
-```
 
-**monitor_mode** : should be either "local","container", ""
+## Organising 
 
-## TODO
+TODO : 
+- [ ] create an argo file from the graph/worfklow
+    - [ ] Create a different entry for each component
+    - [ ] execute each element in the right order 
 
-- [ ] Implement the discovery of current mode : local, local in container, as a container
+## CHANGE ENV FOR KUBE
+Add your proper CA, Cert & Data + external IP for kube config.

conf/conf.go

@@ -8,18 +8,18 @@ import (
 )
 
 type Config struct {
-	MonitorPath 	string
+	MonitorPath string
-	MongoUrl    	string
+	MongoUrl    string
-	DBName      	string
+	DBName      string
-	Logs        	string
+	Logs        string
-	LokiUrl     	string
+	LokiUrl     string
-	NatsUrl     	string
+	NatsUrl     string
-	Mode			string
+	Mode        string
-	KubeHost    	string
+	KubeHost    string
-	KubePort    	string
+	KubePort    string
-	KubeCA      	string
+	KubeCA      string
-	KubeCert    	string
+	KubeCert    string
-	KubeData    	string
+	KubeData    string
 }
 
 var instance *Config

daemons/execute_monitor_container.go

@@ -1,146 +0,0 @@
-package daemons
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"oc-schedulerd/conf"
-
-	"github.com/rs/zerolog"
-)
-
-type ContainerMonitor struct {
-	Monitor 	LocalMonitor
-	KubeCA		string
-	KubeCert	string
-	KubeData	string
-	KubeHost	string
-	KubePort	string
-}
-
-func NewContainerMonitor(executionsId string, peerId string, duration int) (Executor){
-	return &ContainerMonitor{
-		Monitor: LocalMonitor{	
-			ExecutionID: executionsId,
-			PeerID: peerId,
-			Duration: duration,
-			LokiUrl: conf.GetConfig().LokiUrl,
-			MongoUrl: conf.GetConfig().MongoUrl,
-			DBName: conf.GetConfig().DBName,
-		},
-		KubeCA: conf.GetConfig().KubeCA,
-		KubeCert: conf.GetConfig().KubeCert,
-		KubeData: conf.GetConfig().KubeData,
-		KubeHost: conf.GetConfig().KubeHost,
-		KubePort: conf.GetConfig().KubePort,
-	}
-}
-
-func (cm *ContainerMonitor) PrepareMonitorExec() []string { 
-
-	args := []string{
-		"-e", cm.Monitor.ExecutionID,
-		"-p", cm.Monitor.PeerID,
-		"-u", cm.Monitor.LokiUrl,
-		"-m", cm.Monitor.MongoUrl,
-		"-d", cm.Monitor.DBName,
-		"-M", "kubernetes",
-		"-H", cm.KubeHost,
-		"-P", cm.KubePort,
-		"-C", cm.KubeCert, 
-		"-D", cm.KubeData,
-		"-c", cm.KubeCA,
-	}
-
-	if cm.Monitor.Duration > 0 {
-		args = append(args, "-t", fmt.Sprintf("%d", cm.Monitor.Duration))
-	}
-
-	return args 
-	
-}
-
-// Contact the docker's API at the KubeHost's URL to :
-// - Check if the image exists
-// - Create the container
-// - Start the container
-func (cm *ContainerMonitor) LaunchMonitor(args []string, l zerolog.Logger) {
-	
-	var containerID string 
-	imageName := "oc-monitord"
-	url := "http://" + cm.KubeHost + ":2375"
-
-	resp, err := http.Get(url + "/images/" + imageName + "/json")
-	if err != nil {
-		l.Fatal().Msg("Error when contacting the docker API on " + url + ": " + err.Error())
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		d, _ := io.ReadAll(resp.Body)
-		l.Fatal().Msg("Couldn't find the oc-monitord image : " + string(d))
-	}
-	
-	dataCreation := map[string]interface{}{"Image": imageName, "Cmd" : args}
-	byteData, err := json.Marshal(dataCreation)
-	if err != nil {
-		l.Fatal().Msg("Error when contacting the creating request body : " + err.Error())
-	}
-	
-	r, _ := http.NewRequest("POST",url + "/containers/create", bytes.NewBuffer(byteData))
-	r.Header.Add("Content-Type","application/json")
-	resp, err = http.DefaultClient.Do(r)
-	if err != nil {
-		l.Fatal().Msg("Error when contacting the docker API on " + url + ": " + err.Error())
-	}
-
-	if resp.StatusCode == 201 {
-		var d map[string]interface{}
-
-		b, err := io.ReadAll(resp.Body)
-		if err != nil {
-			l.Fatal().Msg(err.Error())
-		}
-
-		err = json.Unmarshal(b, &d)
-		if err != nil {
-			l.Fatal().Msg(err.Error())
-		}
-
-		containerID = d["Id"].(string)
-	} else {
-		d, _ := io.ReadAll(resp.Body)
-		l.Fatal().Msg("Error when creating the container on " + url + "\n " + string(d))
-	}
-
-	networkName := "oc"
-
-	dataNetwork, _ := json.Marshal(map[string]string{"Container" : containerID})
-	r, _ = http.NewRequest("POST",url + "/networks/" + networkName + "/connect", bytes.NewBuffer(dataNetwork))
-	r.Header.Add("Content-Type","application/json")
-	resp, err = http.DefaultClient.Do(r)
-	if err != nil {
-		l.Fatal().Msg("Error when contacting the docker API on " + url + ": " + err.Error())
-	}
-	if resp.StatusCode != 200 {
-		d, _ := io.ReadAll(resp.Body)
-		l.Error().Msg("Error when adding container to the network : " + string(d))
-		return
-	}
-
-	resp, err = http.Post( url + "/containers/" + containerID + "/start", "", nil)
-	if err != nil {
-		l.Fatal().Msg("Error when contacting the docker API on " + url + ": " + err.Error())
-	}
-
-	if resp.StatusCode >= 300 {
-		d, _ := io.ReadAll(resp.Body)
-		l.Fatal().Msg("Error when starting the container on " + url + "\n " + string(d))
-	}
-
-	l.Info().Msg("Started container " + containerID)
-	// we can add logging with GET /containers/id/logs?stdout=true&follow=true
-
-	// logExecution(stdoutMonitord, l)
-}

daemons/execute_monitor_local.go

@@ -12,62 +12,33 @@ type LocalMonitor struct {
 	ExecutionID string
 	PeerID      string
 	Duration    int
-	LokiUrl		string
+	Logger      zerolog.Logger
-	MongoUrl	string
-	DBName		string
-
 }
 
-func NewLocalMonitor(executionsId string, peerId string, duration int) (Executor){
+func (lm *LocalMonitor) LaunchLocalMonitor() {
-	return &LocalMonitor{
+	if lm.ExecutionID == "" {
-		ExecutionID: executionsId,
+		lm.Logger.Error().Msg("Missing parameter in LocalMonitor")
-		PeerID: peerId,
-		Duration: duration,
-		LokiUrl: conf.GetConfig().LokiUrl,
-		MongoUrl: conf.GetConfig().MongoUrl,
-		DBName: conf.GetConfig().DBName,
 	}
+	lm.execKube()
 }
 
-// func (lm *LocalMonitor) LaunchLocalMonitor() {
+func (lm *LocalMonitor) execKube() {
-// 	if lm.ExecutionID == "" {
-// 		lm.Logger.Error().Msg("Missing parameter in LocalMonitor")
-// 	}
-
-// }
-
-func (lm *LocalMonitor) PrepareMonitorExec() []string {
-
 	args := []string{
-		"-e", lm.ExecutionID,
+		"-e", lm.ExecutionID, "-p", lm.PeerID, "-u", conf.GetConfig().LokiUrl, "-m", conf.GetConfig().MongoUrl,
-		"-p", lm.PeerID,
+		"-d", conf.GetConfig().DBName,
-		"-u", lm.LokiUrl,
-		"-m", lm.MongoUrl,
-		"-d", lm.DBName,
 	}
 
-
+	if conf.GetConfig().Mode == "kubernetes" {
+		args = append(args, []string{"-M", conf.GetConfig().Mode, "-H", conf.GetConfig().KubeHost, "-P", conf.GetConfig().KubePort,
+			"-C", conf.GetConfig().KubeCert, "-D", conf.GetConfig().KubeData, "-c", conf.GetConfig().KubeCA}...)
+	}
 	if lm.Duration > 0 {
 		args = append(args, "-t", fmt.Sprintf("%d", lm.Duration))
 	}
-
-	return args
-}
-
-func (lm *LocalMonitor) LaunchMonitor(args []string, l zerolog.Logger)  {
 	cmd := exec.Command(conf.GetConfig().MonitorPath, args...)
 	fmt.Printf("Command : %v\n", cmd)
-
+	err := cmd.Start()
-	stdoutMonitord, err := cmd.StdoutPipe()
 	if err != nil {
-		l.Error().Msg("Could not retrieve stdoutpipe for execution of oc-monitord" + err.Error())
+		lm.Logger.Error().Msg("Could not start oc-monitor for " + lm.ExecutionID + " : " + err.Error())
 	}
-
-	err = cmd.Start()
-	if err != nil {
-		l.Error().Msg("Could not start oc-monitor for " + lm.ExecutionID + " : " + err.Error())
-	}
-
-	logExecution(stdoutMonitord, l)
 }
-

daemons/execution_manager.go

@@ -2,7 +2,7 @@ package daemons
 
 import (
 	"fmt"
-	"oc-schedulerd/conf"
+	"os"
 	"time"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
@@ -38,44 +38,22 @@ func (em *ExecutionManager) RetrieveNextExecutions() {
 func (em *ExecutionManager) executeExecution(Execution *workflow_execution.WorkflowExecution) {
 	// start execution
 	// create the yaml that describes the pod : filename, path/url to Loki
-	var executor Executor
+	exec_method := os.Getenv("MONITOR_METHOD")
-	// exec_method := os.Getenv("MONITOR_METHOD")
 	logger := oclib.GetLogger()
-	duration := 0
+	if exec_method == "k8s" {
-	if Execution.EndDate != nil {
+		logger.Error().Msg("TODO : executing oc-monitor in a k8s")
-		duration = int(Execution.EndDate.Sub(Execution.ExecDate).Seconds())
+	} else {
+		logger.Debug().Msg("Executing oc-monitor localy")
+		duration := 0
+		if Execution.EndDate != nil {
+			duration = int(Execution.EndDate.Sub(Execution.ExecDate).Seconds())
+		}
+		monitor := LocalMonitor{
+			Logger:      logger,
+			Duration:    duration,
+			ExecutionID: Execution.UUID,
+			PeerID:      Execution.CreatorID,
+		}
+		monitor.LaunchLocalMonitor()
 	}
-
-	if conf.GetConfig().Mode == "local" {
-		executor = NewLocalMonitor(Execution.ExecutionsID, Execution.CreatorID, duration)
-	}
-
-	if conf.GetConfig().Mode == "container" {
-		executor = NewContainerMonitor(Execution.ExecutionsID, Execution.CreatorID, duration)
-	}
-
-	if executor == nil {
-		logger.Fatal().Msg("Could not create logger")
-	}
-	args := executor.PrepareMonitorExec()
-	executor.LaunchMonitor(args,logger)
-
-	// if exec_method == "k8s" {
-	// 	logger.Error().Msg("TODO : executing oc-monitor in a k8s")
-	// } else {
-	// 	logger.Debug().Msg("Executing oc-monitor localy")
-	// 	duration := 0
-	// 	if Execution.EndDate != nil {
-	// 		duration = int(Execution.EndDate.Sub(Execution.ExecDate).Seconds())
-	// 	}
-	// 	monitor := LocalMonitor{
-	// 		Logger:      	logger,
-	// 		Duration:    	duration,
-	// 		ExecutionID: 	Execution.ExecutionsID,
-	// 		PeerID:     	Execution.CreatorID,
-	// 		LokiUrl:		conf.GetConfig().LokiUrl,
-			
-	// 	}
-	// 	monitor.LaunchLocalMonitor()
-	// }
 }

daemons/interface.go

@@ -1,21 +0,0 @@
-package daemons
-
-import (
-	"bufio"
-	"io"
-
-	"github.com/rs/zerolog"
-)
-
-type Executor interface {
-	PrepareMonitorExec() []string
-	LaunchMonitor(args []string, l zerolog.Logger)
-}
-
-func logExecution(reader io.ReadCloser, l zerolog.Logger) {
-	scanner := bufio.NewScanner(reader)
-	for scanner.Scan() {
-		output := scanner.Text()
-		l.Debug().Msg(output)
-	}
-}

daemons/schedule_manager.go

@@ -111,11 +111,11 @@ func (s *ScheduleManager) listenForChange(nc *nats.Conn, chanName string, delete
 // Used at launch of the component to retrieve the next scheduled workflows
 // and then every X minutes in case some workflows were scheduled before launch
 func (s *ScheduleManager) SchedulePolling() {
-	var sleep_time float64 = 20
+	var sleep_time float64 = 1
 	for {
 		s.getNextScheduledWorkflows(1)
 		s.Logger.Info().Msg("Current list of schedules -------> " + fmt.Sprintf("%v", len(Executions.Execs)))
-		time.Sleep(time.Second * time.Duration(sleep_time))
+		time.Sleep(time.Minute * time.Duration(sleep_time))
 	}
 }
 func (s *ScheduleManager) getExecution(from time.Time, to time.Time) (exec_list []*workflow_execution.WorkflowExecution, err error) {

docker-compose.yml

@@ -3,12 +3,10 @@ version: '3.4'
 services:
   oc-schedulerd:
     env_file:
-    - path: ./env.env
+      - path: ./env.env
-      required: false
+        required: false
     environment: 
       - MONGO_DATABASE=DC_myDC
-      - KUBE_CA=${KUBE_CA:-LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJWUxWNkFPQkdrU1F3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl6TVRFeU1ETTJNQjRYRFRJME1EZ3dPREV3TVRNMU5sb1hEVEkxTURndwpPREV3TVRNMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGQ2Q1MFdPeWdlQ2syQzcKV2FrOWY4MVAvSkJieVRIajRWOXBsTEo0ck5HeHFtSjJOb2xROFYxdUx5RjBtOTQ2Nkc0RmRDQ2dqaXFVSk92Swp3NVRPNnd5alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJkOFI5cXVWK2pjeUVmL0ovT1hQSzMyS09XekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTArbThqTDBJVldvUTZ0dnB4cFo4NVlMalF1SmpwdXM0aDdnSXRxS3NmUVVDSUI2M2ZNdzFBMm5OVWU1TgpIUGZOcEQwSEtwcVN0Wnk4djIyVzliYlJUNklZCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRc3hXWk9pbnIrcVp4TmFEQjVGMGsvTDF5cE01VHAxOFRaeU92ektJazQKRTFsZWVqUm9STW0zNmhPeVljbnN3d3JoNnhSUnBpMW5RdGhyMzg0S0Z6MlBvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBYZkVmYXJsZm8zTWhIL3lmemx6Cnl0OWlqbHN3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxJL2dNYnNMT3MvUUpJa3U2WHVpRVMwTEE2cEJHMXgKcnBlTnpGdlZOekZsQWlFQW1wdjBubjZqN3M0MVI0QzFNMEpSL0djNE53MHdldlFmZWdEVGF1R2p3cFk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K}
-      - KUBE_TOKEN=${KUBE_TOKEN:-LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5ZS1BFb1dhd1NKUzJlRW5oWmlYMk5VZlY1ZlhKV2krSVNnV09TNFE5VTlvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVUozblJZN0tCNEtUWUx0WnFUMS96VS84a0Z2Sk1lUGhYMm1Vc25pczBiR3FZblkyaVZEeApYVzR2SVhTYjNqcm9iZ1YwSUtDT0twUWs2OHJEbE03ckRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=}
     image: 'oc-schedulerd:latest'
     ports:
       - 9001:8080

docker_schedulerd.json

@@ -4,8 +4,6 @@
     "NATS_URL":"nats://nats:4222",
     "MONGO_DATABASE":"DC_myDC",
     "MONITORD_PATH": "oc-monitord",
-    "MODE": "kubernetes",
+    "MODE": "kubernetes"
-    "KUBE_CA": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTkRNMk56UTNPRGt3SGhjTk1qVXdOREF6TVRBd05qSTVXaGNOTXpVd05EQXhNVEF3TmpJNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTkRNMk56UTNPRGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUL1NDWEMycjFTWGdza0FvTGJKSEtIem4zQXYva2t0ZElpSk42WlBsWVEKY3p0dXV5K3JBMHJ5VUlkZnIyK3VCRS9VN0NjSlhPL004QVdyODFwVklzVmdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVVFHOVBQQ0g0c1lMbFkvQk5CdnN5CklEam1PK0l3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUtJeFc4NERQTW1URXVVN0Z3ek44SFB6ZHdldWh6U20KVzNYMU9tczFSQVNRQWlFQXI4UTJZSGtNQndSOThhcWtTa2JqU1dhejg0OEY2VkZLWjFacXpNbDFZaTg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
-    "KUBE_CERT": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJZWFxQUp2bHhmYzh3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOelF6TmpjME56ZzVNQjRYRFRJMU1EUXdNekV3TURZeU9Wb1hEVEkyTURRdwpNekV3TURZeU9Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJJelpGSlJUVHJmYXlNNFoKTjlRclN4MC9wbDdoZGdvWFM5bGEydmFFRkhlYVFaalRML2NZd1dMUnhoOWVOa01SRDZjTk4reWZkSXE2aWo1SQo5RTlENGdLalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFFzUkZXUlNweDV0RGZnZDh1UTdweUw0ZERMVEFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQStXZTlBVXJRUm5pWjVCUERELzJwWjA3TzFQWWFIc01ycTZZcVB4VlV5cGdDSUhrRE8rcVlMYUhkUEhXZgpWUGszNXJmejM0Qk4xN2VyaEVxRjF0U0c1MWFqCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTkRNMk56UTNPRGt3SGhjTk1qVXdOREF6TVRBd05qSTVXaGNOTXpVd05EQXhNVEF3TmpJNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTkRNMk56UTNPRGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUNDF1NXIzM0JyenZ3ZXZaWHM2TEg3T1k4NGhOOGRrODdnTlhaUndBdWkKdXJBaU45TFdYcmYxeFoyaXp5d0FiVGk1ZVc2Q1hIMjhDdEVSWUlrcjNoTXdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBMRVJWa1VxY2ViUTM0SGZMa082CmNpK0hReTB3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQUpLWGZLdXBzdklONEtQVW50c1lPNXhiaGhSQmhSYlIKN3JyeWs2VHpZMU5JQWlBVktKWis3UUxzeGFyQktORnI3eTVYYlNGanI3Y1gyQmhOYy9wdnFLcWtFUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
-    "KUBE_DATA": "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUVJd01wVjdzMHc2S0VTQ2FBWDhvSVZPUHloa2U0Q3duNWZQZnhOaUYyM3JvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFak5rVWxGTk90OXJJemhrMzFDdExIVCttWHVGMkNoZEwyVnJhOW9RVWQ1cEJtTk12OXhqQgpZdEhHSDE0MlF4RVBwdzAzN0o5MGlycUtQa2owVDBQaUFnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
 }
+

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"oc-schedulerd/conf"
 	"oc-schedulerd/daemons"
 	"os"
@@ -9,8 +10,8 @@ import (
 )
 
 func main() {
+
 	oclib.InitDaemon("oc-schedulerd")
-	l := oclib.GetLogger()
 	o := oclib.GetConfLoader()
 
 	c := oclib.SetConfig(
@@ -20,37 +21,17 @@ func main() {
 		o.GetStringDefault("LOKI_URL", ""),
 		o.GetStringDefault("LOG_LEVEL", "info"),
 	)
-
 	conf.GetConfig().DBName = c.MongoDatabase
 	conf.GetConfig().MongoUrl = c.MongoUrl
 	conf.GetConfig().NatsUrl = c.NATSUrl
 	conf.GetConfig().LokiUrl = c.LokiUrl
 	conf.GetConfig().Mode = o.GetStringDefault("MODE", "")
+	conf.GetConfig().KubeHost = o.GetStringDefault("KUBERNETES_SERVICE_HOST", os.Getenv("KUBERNETES_SERVICE_HOST"))
+	conf.GetConfig().KubePort = o.GetStringDefault("KUBERNETES_SERVICE_PORT", "6443")
 
-	if conf.GetConfig().Mode == "container" {
+	conf.GetConfig().KubeCA = o.GetStringDefault("KUBE_CA", os.Getenv("KUBE_CA"))
-		conf.GetConfig().KubeHost = o.GetStringDefault("KUBERNETES_SERVICE_HOST", os.Getenv("KUBERNETES_SERVICE_HOST"))
+	conf.GetConfig().KubeCert = o.GetStringDefault("KUBE_CERT", os.Getenv("KUBE_CERT"))
-		conf.GetConfig().KubePort = o.GetStringDefault("KUBERNETES_SERVICE_PORT", "6443")
+	conf.GetConfig().KubeData = o.GetStringDefault("KUBE_DATA", os.Getenv("KUBE_DATA"))
-
-		conf.GetConfig().KubeCA = o.GetStringDefault("KUBE_CA", os.Getenv("KUBE_CA"))
-		conf.GetConfig().KubeCert = o.GetStringDefault("KUBE_CERT", os.Getenv("KUBE_CERT"))
-		conf.GetConfig().KubeData = o.GetStringDefault("KUBE_DATA", os.Getenv("KUBE_DATA"))
-	}
-
-	// Test if oc-monitor binary is reachable
-	// For local executions
-	if _, err := os.Stat("../oc-monitord/oc-monitord"); err == nil {
-		conf.GetConfig().MonitorPath = "../oc-monitord/oc-monitord"
-	}
-	// For container executions
-	if _, err := os.Stat("/usr/bin/oc-monitord"); conf.GetConfig().MonitorPath == "" && err == nil {
-		conf.GetConfig().MonitorPath = "/usr/bin/oc-monitord"
-	}
-
-	if conf.GetConfig().MonitorPath == "" {
-		l.Fatal().Msg("Could not find oc-monitord binary")
-	}
-
-	l.Info().Msg("oc-monitord binary at " + conf.GetConfig().MonitorPath)
 
 	sch_mngr := daemons.ScheduleManager{Logger: oclib.GetLogger()}
 	exe_mngr := daemons.ExecutionManager{}
@@ -60,4 +41,5 @@ func main() {
 
 	exe_mngr.RetrieveNextExecutions()
 
+	fmt.Print("stop")
 }

schedulerd.json

@@ -1,12 +0,0 @@
-{
-    "LOKI_URL" : "http://172.16.0.181:3100",
-    "MONGO_URL":"mongodb://172.16.0.181:27017/", 
-    "NATS_URL":"nats://172.16.0.181:4222",
-    "MONGO_DATABASE":"DC_myDC",
-    "MONITORD_PATH": "../oc-monitord/oc-monitord",
-    "KUBERNETES_SERVICE_HOST" : "172.16.0.181",
-    "MODE": "container",
-    "KUBE_CA": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTkRNMk56UTNPRGt3SGhjTk1qVXdOREF6TVRBd05qSTVXaGNOTXpVd05EQXhNVEF3TmpJNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTkRNMk56UTNPRGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUL1NDWEMycjFTWGdza0FvTGJKSEtIem4zQXYva2t0ZElpSk42WlBsWVEKY3p0dXV5K3JBMHJ5VUlkZnIyK3VCRS9VN0NjSlhPL004QVdyODFwVklzVmdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVVFHOVBQQ0g0c1lMbFkvQk5CdnN5CklEam1PK0l3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUtJeFc4NERQTW1URXVVN0Z3ek44SFB6ZHdldWh6U20KVzNYMU9tczFSQVNRQWlFQXI4UTJZSGtNQndSOThhcWtTa2JqU1dhejg0OEY2VkZLWjFacXpNbDFZaTg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
-    "KUBE_CERT": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJZWFxQUp2bHhmYzh3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOelF6TmpjME56ZzVNQjRYRFRJMU1EUXdNekV3TURZeU9Wb1hEVEkyTURRdwpNekV3TURZeU9Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJJelpGSlJUVHJmYXlNNFoKTjlRclN4MC9wbDdoZGdvWFM5bGEydmFFRkhlYVFaalRML2NZd1dMUnhoOWVOa01SRDZjTk4reWZkSXE2aWo1SQo5RTlENGdLalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFFzUkZXUlNweDV0RGZnZDh1UTdweUw0ZERMVEFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQStXZTlBVXJRUm5pWjVCUERELzJwWjA3TzFQWWFIc01ycTZZcVB4VlV5cGdDSUhrRE8rcVlMYUhkUEhXZgpWUGszNXJmejM0Qk4xN2VyaEVxRjF0U0c1MWFqCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTkRNMk56UTNPRGt3SGhjTk1qVXdOREF6TVRBd05qSTVXaGNOTXpVd05EQXhNVEF3TmpJNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTkRNMk56UTNPRGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUNDF1NXIzM0JyenZ3ZXZaWHM2TEg3T1k4NGhOOGRrODdnTlhaUndBdWkKdXJBaU45TFdYcmYxeFoyaXp5d0FiVGk1ZVc2Q1hIMjhDdEVSWUlrcjNoTXdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBMRVJWa1VxY2ViUTM0SGZMa082CmNpK0hReTB3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQUpLWGZLdXBzdklONEtQVW50c1lPNXhiaGhSQmhSYlIKN3JyeWs2VHpZMU5JQWlBVktKWis3UUxzeGFyQktORnI3eTVYYlNGanI3Y1gyQmhOYy9wdnFLcWtFUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
-    "KUBE_DATA": "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUVJd01wVjdzMHc2S0VTQ2FBWDhvSVZPUHloa2U0Q3duNWZQZnhOaUYyM3JvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFak5rVWxGTk90OXJJemhrMzFDdExIVCttWHVGMkNoZEwyVnJhOW9RVWQ1cEJtTk12OXhqQgpZdEhHSDE0MlF4RVBwdzAzN0o5MGlycUtQa2owVDBQaUFnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
-}