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

.vscode/launch.json

@@ -1,18 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch Package",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${fileDirname}",
-            "args": ["-e","e3b7772e-dc9f-4bc1-9f5d-533e23e6cd57" ,"-u","http://127.0.0.1:3100","-m" ,"mongodb://127.0.0.1:27017","-d","DC_myDC"],
-            "env": {"OCMONITOR_LOKIURL":"http://127.0.0.1:3100","OCMONITOR_WORKFLOW":"8d0f1814-b5ca-436c-ba3f-116d99198fd2","KUBERNETES_SERVICE_HOST":"","OCMONITOR_MONGOURL":"mongodb://127.0.0.1:27017","OCMONITOR_DATABASE":"DC_myDC","test_service":"true"}
-        }
-    ]
-}
-

README.md

@@ -47,76 +47,6 @@ In rules add a new entry :
 
 This command **must return "yes"**
 
-## Allow services to be joined with reverse proxy
-
-Since the development has been realised in a K3S environment, we will use the lightweight solution provided by **traefik**. 
-
-We need to install **metallb** to expose our cluster to the exterior and allow packets to reach traefik.
-
-### Deploy traefik and metallb
-
-- Make sure that helm is installed, else visit : https://helm.sh/docs/intro/install/ 
-
-- Add the repositories for traefik and metallb
-> helm repo add metallb https://metallb.github.io/metallb 
-> helm repo add traefik https://helm.traefik.io/traefik
-
->helm repo update
-
-- Create the namespaces for each
-> kubectl create ns traefik-ingress
-> kubectl create ns metallb-system 
-
-- Configure the deployment 
-
-```
-cat > traefik-values.yaml <<EOF
-globalArguments:
-deployment:
-  kind: DaemonSet
-providers:
-  kubernetesCRD:
-    enabled: true
-service:
-  type: LoadBalancer
-ingressRoute:
-  dashboard:
-    enabled: false
-EOF
-```
-
-- Launch the installs
-> helm upgrade --install metallb metallb/metallb --namespace metallb-system
-
-> helm install --namespace=traefik-ingress traefik traefik/traefik --values=./traefik-values.yaml
-
-### Configure metallb
-
-```
-cat << 'EOF' | kubectl apply -f -
-apiVersion: metallb.io/v1beta1
-kind: IPAddressPool
-metadata:
-  name: default-pool
-  namespace: metallb-system
-spec:
-  addresses:
-  - 192.168.0.200-192.168.0.250
----
-apiVersion: metallb.io/v1beta1
-kind: L2Advertisement
-metadata:
-  name: default
-  namespace: metallb-system
-spec:
-  ipAddressPools:
-  - default-pool
-EOF
-```
-
-- Check that the services created in traefik-ingress have an external IP
-
-> kubectl get service -n traefik-ingress -o wide
 
 ## TODO
 

demo_nginx/nginx.conf

@@ -1,30 +0,0 @@
-# nginx.conf
-user  nginx;
-worker_processes  auto;
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-events {
-  worker_connections  1024;
-}
-http {
-  include       /etc/nginx/mime.types;
-  default_type  application/octet-stream;
-  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-  '$status $body_bytes_sent "$http_referer" '
-  '"$http_user_agent" "$http_x_forwarded_for"';
-  access_log  /var/log/nginx/access.log  main;
-  sendfile        on;
-  #tcp_nopush     on;
-  
-  keepalive_timeout  65;
-  #gzip  on;
-  #include /etc/nginx/conf.d/*.conf;
-server {
-  listen 80;
-  location / {
-    root   /usr/share/nginx/html;
-    index  index.html index.htm;
-    try_files $uri $uri/ /index.html;
-  }
-}
-}

go.mod

@@ -3,7 +3,7 @@ module oc-monitord
 go 1.22.0
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f
+	cloud.o-forge.io/core/oc-lib v0.0.0-20240924075418-021b461b0a7d
 	github.com/akamensky/argparse v1.4.0
 	github.com/goraz/onion v0.1.3
 	github.com/nats-io/nats-server/v2 v2.10.18
@@ -17,10 +17,10 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.22.0 // indirect
+	github.com/go-playground/validator/v10 v10.22.1 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -38,9 +38,9 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	go.mongodb.org/mongo-driver v1.16.1 // indirect
+	go.mongodb.org/mongo-driver v1.17.0 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.18.0 // indirect

go.sum

@@ -40,8 +40,12 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20240826085916-d0e1474f8f34 h1:40XQgwR9HxXSn
 cloud.o-forge.io/core/oc-lib v0.0.0-20240826085916-d0e1474f8f34/go.mod h1:1hhYh5QWAbYw9cKplQ0ZD9PMgU8t6gPqiYF8sldv1HU=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240828135227-14d6a5f11c4e h1:/KWO/gIcP5f7T4r00715fNz0Y/Hil6Bj3J1ycuES1Zw=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240828135227-14d6a5f11c4e/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f h1:v9mw3uNg/DJswOvHooMu8/BMedA+vIXbma+8iUwsjUI=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240830071403-db78c70dc349 h1:bEIY1lCsA78/mJqFE0gV6likAv5ZifH3RMnLJxiSk3o=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240830071403-db78c70dc349/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240830131445-af18dba5563c h1:4ZoM9ONJiaeLHSi0s8gsCe4lHuRHXkfK+eDSnTCspa0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240830131445-af18dba5563c/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240924075418-021b461b0a7d h1:f8cT/NunF+eoZLU5B9gmiT4ky99zPmnQBbj4tj23KuA=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240924075418-021b461b0a7d/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
 github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
@@ -67,6 +71,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
 github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
+github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -85,6 +91,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
+github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -167,6 +175,8 @@ go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4B
 go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
 go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8=
 go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
+go.mongodb.org/mongo-driver v1.17.0 h1:Hp4q2MCjvY19ViwimTs00wHi7G4yzxh4/2+nTx8r40k=
+go.mongodb.org/mongo-driver v1.17.0/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -175,6 +185,8 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
 golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -185,6 +197,8 @@ golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=

main.go

@@ -19,6 +19,7 @@ import (
 	oclib "cloud.o-forge.io/core/oc-lib"
 
 	"cloud.o-forge.io/core/oc-lib/logs"
+	"cloud.o-forge.io/core/oc-lib/models/utils"
 	"cloud.o-forge.io/core/oc-lib/models/workflow_execution"
 
 	"github.com/akamensky/argparse"
@@ -46,6 +47,8 @@ const localConfigFile = "./conf/local_ocmonitord_conf.json"
 
 func main() {
 
+	os.Setenv("test_service", "true") // Only for service demo, delete before merging on main
+
 	monitorLocal = false
 	// Test if monitor is launched outside (with parameters) or in a k8s environment (env variables sets)
 	if os.Getenv("KUBERNETES_SERVICE_HOST") == "" {
@@ -123,7 +126,7 @@ func getWorkflowId(exec_id string) string {
 	return wf_exec.WorkflowID
 }
 
-// So far we only log the output from 
+// So far we only log the output from
 
 func executeWorkflow(argo_file_path string) {
 	// var stdout, stderr, stdout_logs, stderr_logs 	io.ReadCloser
@@ -241,7 +244,7 @@ func setConf(is_k8s bool, o *onion.Onion, parser *argparse.Parser) {
 			fmt.Println(parser.Usage(err))
 			os.Exit(1)
 		}
-		
+
 		conf.GetConfig().Logs = "debug"
 
 		conf.GetConfig().LokiURL = *url
@@ -253,7 +256,6 @@ func setConf(is_k8s bool, o *onion.Onion, parser *argparse.Parser) {
 
 }
 
-
 func initOnion(o *onion.Onion) *onion.Onion {
 	logger = logs.CreateLogger("oc-monitord")
 	configFile := ""
@@ -305,10 +307,11 @@ func checkStatus(current string, previous string) {
 func updateStatus(status string) {
 	exec_id := conf.GetConfig().ExecutionID
 
-	wf_exec := &workflow_execution.WorkflowExecution{}
+	wf_exec := &workflow_execution.WorkflowExecution{AbstractObject: utils.AbstractObject{UUID: conf.GetConfig().ExecutionID}}
 	wf_exec.ArgoStatusToState(status)
 
 	serialized := wf_exec.Serialize()
+
 	res := oclib.UpdateOne(oclib.LibDataEnum(oclib.WORKFLOW_EXECUTION), serialized, exec_id)
 
 	if res.Code != 200 {

models/ingress.go

@@ -1,101 +0,0 @@
-package models
-
-import "strconv"
-
-// apiVersion: networking.k8s.io/v1
-// kind: Ingress
-// metadata:
-//   name: example-ingress
-//   namespace: argo
-//   annotations:
-//     traefik.ingress.kubernetes.io/router.entrypoints: web  # Utilisation de l'entrypoint HTTP standard
-// spec:
-//   rules:
-//   - http:
-//       paths:
-//       - path: /dtf
-//         pathType: Prefix
-//         backend:
-//           service:
-//             name: workflow-service-qtjk2
-//             port:
-//               number: 80
-
-var ingress_manifest = &Manifest{
-	ApiVersion: "networking.k8s.io/v1",
-	Kind: "Ingress",
-	Metadata: Metadata{
-		GenerateName: "ingress-argo-",
-	},
-}
-
-type Ingress struct {
-	ApiVersion string      `yaml:"apiVersion,omitempty"`
-	Kind       string      `yaml:"kind,omitempty"`
-	Metadata   Metadata    `yaml:"metadata,omitempty"`
-	Spec       IngressSpec `yaml:"spec,omitempty"`
-}
-
-
-
-type IngressSpec struct {
-	Rules []Rule `yaml:"rules,omitempty"`
-}
-
-type Rule struct {
-	HTTP HTTP `yaml:"http,omitempty"`
-}
-
-type HTTP struct {
-	Paths []Path `yaml:"paths,omitempty"`
-}
-
-type Path struct {
-	Path     string  `yaml:"path,omitempty"`
-	PathType string  `yaml:"pathType,omitempty"`
-	Backend  Backend `yaml:"backend,omitempty"`
-}
-
-type Backend struct {
-	ServiceName string `yaml:"serviceName,omitempty"`
-	ServicePort int64  `yaml:"servicePort,omitempty"`
-}
-
-func NewIngress(contract map[string]map[string]string, serviceName string) Ingress {
-	new_ingr := Ingress{
-		ApiVersion: "networking.k8s.io/v1",
-		Kind:       "Ingress",
-		Metadata: Metadata{
-			GenerateName: "ingress-argo-",
-		},
-		Spec: IngressSpec{
-			Rules: []Rule{
-				{
-					HTTP: HTTP{
-						Paths: []Path{},
-						},
-					},
-				},
-			},
-		}
-
-	for port_to_reverse_str, translations := range contract{
-		
-		port, _ := strconv.ParseInt(port_to_reverse_str,10,64)
-
-		port_reverse := Path{
-			Path:     translations["reverse"],
-			PathType: "Prefix",
-			Backend: Backend{
-				ServiceName: serviceName,
-				ServicePort:port,
-			},
-		}
-
-		new_ingr.Spec.Rules[0].HTTP.Paths = append(new_ingr.Spec.Rules[0].HTTP.Paths, port_reverse)
-
-	}
-
-	return new_ingr
-}
-

models/k8s_manifest.go

@@ -1,12 +0,0 @@
-package models
-
-type Manifest struct {
-	ApiVersion string   `yaml:"apiVersion,omitempty"`
-	Kind       string   `yaml:"kind"`
-	Metadata   Metadata `yaml:"metadata,omitempty"`
-}
-
-type Metadata struct {
-    Name      		string	`yaml:"name"`
-    GenerateName	string	`yaml:"generateName"`
-}

models/services.go

@@ -10,11 +10,16 @@ type ServiceResource struct {
 }
 
 type Service struct {
-    Manifest
+    APIVersion string            `yaml:"apiVersion"`
+    Kind       string            `yaml:"kind"`
+    Metadata   Metadata          `yaml:"metadata"`
     Spec       ServiceSpec       `yaml:"spec"`
 }
 
-
+type Metadata struct {
+    Name      string            `yaml:"name"`
+    
+}
 
 // ServiceSpec is the specification of the Kubernetes Service
 type ServiceSpec struct {

traefik-values.yaml

@@ -1,11 +0,0 @@
-globalArguments:
-deployment:
-  kind: DaemonSet
-providers:
-  kubernetesCRD:
-    enabled: true
-service:
-  type: LoadBalancer
-ingressRoute:
-  dashboard:
-    enabled: false

workflow_builder/argo_builder.go

@@ -5,17 +5,14 @@
 package workflow_builder
 
 import (
-	"oc-monitord/models"
 	. "oc-monitord/models"
 	"os"
 	"slices"
-	"strconv"
 	"strings"
 	"time"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
 	"cloud.o-forge.io/core/oc-lib/models/resource_model"
-	"cloud.o-forge.io/core/oc-lib/models/resources/processing"
 	"cloud.o-forge.io/core/oc-lib/models/resources/workflow/graph"
 	w "cloud.o-forge.io/core/oc-lib/models/workflow"
 	"github.com/nwtgck/go-fakelish"
@@ -25,26 +22,23 @@ import (
 
 var logger zerolog.Logger
 
-type ServiceExposure int 
-const (
-	PAT 	ServiceExposure = iota
-	Reverse
-	Both
-)
-
 type ArgoBuilder struct {
 	OriginWorkflow 	w.Workflow
 	Workflow       	Workflow
-	Services		[]Service
+	Services		*Service
 	Timeout        	int
 }
 
 type Workflow struct {
-	Manifest
+	ApiVersion string `yaml:"apiVersion"`
-	Spec ArgoSpec `yaml:"spec,omitempty"`
+	Kind       string `yaml:"kind"`
+	Metadata   struct {
+		Name string `yaml:"name"`
+	} `yaml:"metadata"`
+	Spec Spec `yaml:"spec,omitempty"`
 }
 
-type ArgoSpec struct {
+type Spec struct {
 	Entrypoint string                `yaml:"entrypoint"`
 	Arguments  []Parameter           `yaml:"arguments,omitempty"`
 	Volumes    []VolumeClaimTemplate `yaml:"volumeClaimTemplates,omitempty"`
@@ -52,12 +46,13 @@ type ArgoSpec struct {
 	Timeout    int                   `yaml:"activeDeadlineSeconds,omitempty"`
 }
 
-
-
 func (b *ArgoBuilder) CreateDAG() (string, error) {
 	
 	// handle services by checking if there is only one processing with hostname and port
-		
+	
+	b.createNginxVolumes()
+	
+	
 	b.createTemplates()
 	b.createDAGstep()
 	b.createVolumes()
@@ -67,7 +62,7 @@ func (b *ArgoBuilder) CreateDAG() (string, error) {
 		b.Workflow.Spec.Timeout = b.Timeout
 	}
 	b.Workflow.Spec.Entrypoint = "dag"
-	b.Workflow.Manifest.ApiVersion = "argoproj.io/v1alpha1"
+	b.Workflow.ApiVersion = "argoproj.io/v1alpha1"
 	b.Workflow.Kind = "Workflow"
 	random_name := generateWfName()
 	b.Workflow.Metadata.Name = "oc-monitor-" + random_name
@@ -96,7 +91,6 @@ func (b *ArgoBuilder) createTemplates() {
 		var command string
 		var args string
 		var env string
-		var serv models.Service
 
 		comp_res := comp.Processing
 
@@ -120,39 +114,24 @@ func (b *ArgoBuilder) createTemplates() {
 		new_temp := Template{Name: argo_name, Container: temp_container}
 		new_temp.Inputs.Parameters = inputs_container
 		new_temp.Container.VolumeMounts = append(new_temp.Container.VolumeMounts, VolumeMount{Name: "workdir", MountPath: "/mnt/vol"}) // TODO : replace this with a search of the storage / data source name
+		new_temp.Container.VolumeMounts = append(new_temp.Container.VolumeMounts, VolumeMount{Name: "nginx-demo", MountPath: "/usr/share/nginx"}) // Used for processing services' demo with nginx 
 		
 		if (b.isService(comp.ID)){
-
+			serv := b.CreateService(comp)
-			serv_type := getServiceExposure(*comp.Processing)
+			b.createService(serv, argo_name, comp.ID)
-			if serv_type == PAT || serv_type == Both{
+			new_temp.Metadata.Labels = make(map[string]string)
-				serv = b.CreateKubeService(comp, NodePort)
+			new_temp.Metadata.Labels["app"] = "oc-service"		// Construct the template for the k8s service and add a link in graph between k8s service and processing
-				b.addKubeServiceToWorkflow(serv, argo_name, comp.ID)
-				new_temp.Metadata.Labels = make(map[string]string)
-				new_temp.Metadata.Labels["app"] = serv.Spec.Selector["app"]		// Construct the template for the k8s service and add a link in graph between k8s service and processing
-				b.addServiceToArgo(serv)
-				ingress := b.CreateIngress(comp,serv)
-				b.addIngressToWorfklow(ingress, argo_name, comp.ID)
-
-			}
-			if serv_type == Reverse || serv_type == Both{
-				serv = b.CreateKubeService(comp, ClusterIP)
-				// create ingress by passing the service and the processing (or reverse)
-				b.addKubeServiceToWorkflow(serv, argo_name, comp.ID)
-				new_temp.Metadata.Labels = make(map[string]string)
-				new_temp.Metadata.Labels["app"] = serv.Spec.Selector["app"]		// Construct the template for the k8s service and add a link in graph between k8s service and processing
-				b.addServiceToArgo(serv)
-			}
-
-			
 			// if err != nil {
 			// 	// TODO
 			// }
 		}
 		
 		b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, new_temp)
-
 	}
 
+	if b.Services != nil {
+		b.addServiceToArgo()
+	}
 
 }
 
@@ -174,9 +153,8 @@ func (b *ArgoBuilder) createDAGstep() {
 		new_dag.Tasks = append(new_dag.Tasks, step)
 	}
 
-	for i, _ := range b.Services {
+	if b.Services != nil {
-		name := "workflow-service-pod-"+strconv.Itoa(i + 1)
+		new_dag.Tasks = append(new_dag.Tasks, Task{Name:"workflow-service-pod", Template: "workflow-service-pod"})
-		new_dag.Tasks = append(new_dag.Tasks, Task{Name: name , Template: name})
 	}
 
 	b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, Template{Name: "dag", Dag: new_dag})
@@ -192,6 +170,15 @@ func (b *ArgoBuilder) createVolumes() {
 	b.Workflow.Spec.Volumes = append(b.Workflow.Spec.Volumes, new_volume)
 }
 
+// For demo purposes, until we implement the use of storage ressources
+func (b *ArgoBuilder) createNginxVolumes() {
+	new_volume := VolumeClaimTemplate{}
+	new_volume.Metadata.Name = "nginx-demo"
+	new_volume.Spec.AccessModes = []string{"ReadWriteOnce"}
+	new_volume.Spec.Resources.Requests.Storage = "1Gi"
+
+	b.Workflow.Spec.Volumes = append(b.Workflow.Spec.Volumes, new_volume)
+}
 
 
 func (b *ArgoBuilder) getDependency(current_computing_id string) (dependencies []string) {
@@ -332,29 +319,14 @@ func (b *ArgoBuilder) isService(id string) bool{
 	return is_exposed
 }
 
-func getServiceExposure(service processing.ProcessingResource) ServiceExposure{
-	var exposure_type ServiceExposure
 
-	contract := getExposeContract(service.ResourceModel.Model["expose"])
+func (b *ArgoBuilder) addLabel(name string, id string) {
-	_, pat := contract["PAT"]
+	argo_name := getArgoName(name,id)
-	_, reverse := contract["reverse"]
+	for _, template := range b.Workflow.Spec.Templates{
-	
+		if template.Name == argo_name{
-	if pat && reverse {
+			template.Metadata.Labels["app"] = "service-workflow"			
-		exposure_type=  Both
+			return
+		}
 	}
-	if pat {
-		exposure_type = PAT
-	}
-	if reverse{
-		exposure_type = Reverse 
-	}
-
-	return exposure_type
-	
 }
 
-func (b *ArgoBuilder) CreateIngress(processing processing.ProcessingResource, service Service) Ingress{
-	contract := getExposeContract(processing.ResourceModel.Model["expose"])
-	new_ingress := models.NewIngress(contract,service.Metadata.Name)
-	return new_ingress
-}

workflow_builder/argo_services.go

@@ -7,19 +7,11 @@ import (
 
 	"cloud.o-forge.io/core/oc-lib/models/resource_model"
 	"cloud.o-forge.io/core/oc-lib/models/resources/workflow/graph"
-	"github.com/nwtgck/go-fakelish"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"gopkg.in/yaml.v3"
 )
 
-type ServiceType string 
-
-const (
-	NodePort	ServiceType = "NodePort"
-	ClusterIP	ServiceType = "ClusterIP"
-)
-
 // TODO : refactor this method or the deserialization process in oc-lib to get rid of the mongo code
 func getExposeContract(expose resource_model.Model) map[string]map[string]string {
 	contract := make(map[string]map[string]string,0)
@@ -48,7 +40,7 @@ func getExposeContract(expose resource_model.Model) map[string]map[string]string
 }
 
 
-func (b *ArgoBuilder) CreateKubeService(processing graph.GraphItem, service_type ServiceType) models.Service{
+func (b *ArgoBuilder) CreateService(processing graph.GraphItem) models.Service{
 	
 	// model {
 	// 	Type : "dict",
@@ -65,24 +57,23 @@ func (b *ArgoBuilder) CreateKubeService(processing graph.GraphItem, service_type
 	// }
 	
 
-	new_service := models.Service{
+	new_service := models.Service{APIVersion: "v1", 
-		Manifest: models.Manifest{
+							Kind: "Service", 
-			ApiVersion: "v1", 
+							Metadata: models.Metadata{
-			Kind: "Service", 
+								Name: "workflow-service" ,
-			Metadata: models.Metadata{
+							}, 
-				Name: "workflow-service-"+ processing.Processing.Name + "-" + processing.ID ,
+							Spec: models.ServiceSpec{
-				},
+								Selector: map[string]string{"app": "oc-service"},
-			},
+								Ports: []models.ServicePort{
-			Spec: models.ServiceSpec{
+								},
-				Selector: map[string]string{"app": "service-" + fakelish.GenerateFakeWord(5, 8)},
+								Type: "NodePort",
-				Ports: []models.ServicePort{
+							},
-				},
+					}
-				Type: string(service_type),
-			},
-	}
-
-	completeServicePorts(&new_service, processing)
 	
+	completeServicePorts(&new_service, processing)
+	yamlified, _ := yaml.Marshal(new_service)
+	x := string(yamlified)
+	_ = x
 	return new_service
 }
 
@@ -99,7 +90,7 @@ func completeServicePorts(service *models.Service, processing graph.GraphItem) {
 			return
 		}
 
-		// This condition allows us to create NodePort if PAT is filled or a ClusterIP that only expose port 80 and 443 (for Ingress)
+		
 		if _, ok := translation_dict["PAT"]; ok{
 			port_translation, err := strconv.ParseInt(translation_dict["PAT"], 10, 64)
 			if err != nil {
@@ -107,6 +98,8 @@ func completeServicePorts(service *models.Service, processing graph.GraphItem) {
 				return
 			}
 			
+
+
 			new_port_translation := models.ServicePort{
 				Name: strings.ToLower(processing.Processing.Name) + processing.ID,
 				Port:  port_translation-30000,
@@ -115,52 +108,32 @@ func completeServicePorts(service *models.Service, processing graph.GraphItem) {
 				Protocol: "TCP",
 			}
 			service.Spec.Ports = append(service.Spec.Ports, new_port_translation)
-		} else {
+		} 
-			port_spec := []models.ServicePort{
-				models.ServicePort{
-					Name: strings.ToLower(processing.Processing.Name) + processing.ID + "-80",
-					Port:  80,
-					TargetPort: 80,
-					Protocol: "TCP",
-			},
-			models.ServicePort{
-				Name: strings.ToLower(processing.Processing.Name) + processing.ID + "-443",
-				Port:  443,
-				TargetPort: 443,
-				Protocol: "TCP",
-			},
-		
-		}
-		service.Spec.Ports = append(service.Spec.Ports,port_spec...)
 
-		}
 	}
+
 	return
+}
+
+func (b *ArgoBuilder) createService(service models.Service, processing_name string, processing_id string) {
+	if b.Services != nil{
+		b.Services.Spec.Ports = append(b.Services.Spec.Ports, service.Spec.Ports...)
+		}else {
+			b.Services = &service
+		}
+		
+	b.addLabel(processing_name,processing_id)
 
 }
 
-// The k8s service passed as the parameter only expose one port because it is the result of CreateService()
+func (b *ArgoBuilder) addServiceToArgo() error {
-// we check if this port is already exposed by a service in the workflow and we proceed to the creation of a new service OR 
+	service_manifest, err := yaml.Marshal(b.Services)
-// add the port to the list of port exposed by an existing if portAlreadyExposed is false 
-func (b *ArgoBuilder) addKubeServiceToWorkflow(service models.Service, processing_name string, processing_id string) (label string) {
-	if exposed, service_available_port := b.portAlreadyExposed(service.Spec.Ports[0].TargetPort); exposed && service_available_port != nil{
-		// The port you want to expose is already exposed by all the existing services
-		service_available_port.Spec.Ports = append(service_available_port.Spec.Ports, service.Spec.Ports...)
-		return service_available_port.Spec.Selector["app"]
-	} 
-
-	b.Services = append(b.Services, service)
-	return service.Spec.Selector["app"]	
-}
-
-func (b *ArgoBuilder) addServiceToArgo(service models.Service) error {
-	service_manifest, err := yaml.Marshal(service)
 	if err != nil {
 		logger.Error().Msg("Could not marshal service manifest")
 		return err
 	}
 	
-	service_template := models.Template{Name: "workflow-service-pod-" + strconv.Itoa(len(b.Services)), 
+	service_template := models.Template{Name: "workflow-service-pod", 
 								Resource: models.ServiceResource{
 									Action: "create", 
 									SuccessCondition: "status.succeeded > 0",
@@ -172,44 +145,4 @@ func (b *ArgoBuilder) addServiceToArgo(service models.Service) error {
 	b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, service_template)
 
 	return nil
-}
-
-
-func (b *ArgoBuilder) addLabel(name string, id string) {
-	argo_name := getArgoName(name,id)
-	for _, template := range b.Workflow.Spec.Templates{
-		if template.Name == argo_name{
-			template.Metadata.Labels["app"] = "service-workflow"			
-			return
-		}
-	}
-}
-
-func (b *ArgoBuilder) portAlreadyExposed(port int64) (exposed bool, service *models.Service ){
-	// For all already existing k8s services, test if the port in parameter is already exposed and returns the first service that doesn't yet expose this port 
-	for _, s := range b.Services {
-		i := 0
-		port_exposed := false
-		for !port_exposed {
-			if s.Spec.Ports[i].TargetPort == port {
-				port_exposed = true
-			}
-		}
-		if !port_exposed {
-			return false, &s
-		}
-	}
-
-	return true, nil
-}
-
-// If contract has a reverse value
-	// Test if service already exist for the argo service
-		// Yes : create ingress, associate it with the existing kube service (name + exposed port on service) 
-		// No : 
-			// - create template for a service that expose the port of the argo service (pod)
-			// - store the name of the service and its port exposed
-			// - create template for an ingress : manifest must contain the path, name of the service and port exposed on the service
-func (b *ArgoBuilder) addIngress(){
-
 }