Skip to content

Commit 8db727b

Browse files
authored
Merge pull request #3 from ovvesley/nfs-server
created nfs server
2 parents fa15c1e + f1b0054 commit 8db727b

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

cmd/server/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"github.com/ovvesley/akoflow/pkg/server/config"
55
"github.com/ovvesley/akoflow/pkg/server/engine/garbagecollector"
66
"github.com/ovvesley/akoflow/pkg/server/engine/monitor"
7+
"github.com/ovvesley/akoflow/pkg/server/engine/orchestrator"
8+
"github.com/ovvesley/akoflow/pkg/server/engine/worker"
79
)
8-
import "github.com/ovvesley/akoflow/pkg/server/engine/worker"
9-
import "github.com/ovvesley/akoflow/pkg/server/engine/orchestrator"
1010
import "github.com/ovvesley/akoflow/pkg/server/engine/httpserver"
1111

1212
func main() {

pkg/server/entities/workflow_activity_entity/workflow_activity_entity.go

+21-6
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ type WorkflowActivityDatabase struct {
3232
ResourceK8sBase64 string
3333
Status int
3434
DependOnActivity *int
35-
CreatedAt string
36-
StartedAt string
37-
FinishedAt string
35+
CreatedAt *string
36+
StartedAt *string
37+
FinishedAt *string
3838
}
3939

4040
type WorkflowActivityDependencyDatabase struct {
@@ -121,6 +121,21 @@ func DatabaseToWorkflowActivities(params ParamsDatabaseToWorkflowActivities) Wor
121121
return WorkflowActivities{}
122122
}
123123

124+
createdAt := ""
125+
if params.WorkflowActivityDatabase.CreatedAt != nil {
126+
createdAt = *params.WorkflowActivityDatabase.CreatedAt
127+
}
128+
129+
startedAt := ""
130+
if params.WorkflowActivityDatabase.StartedAt != nil {
131+
startedAt = *params.WorkflowActivityDatabase.StartedAt
132+
}
133+
134+
finishedAt := ""
135+
if params.WorkflowActivityDatabase.FinishedAt != nil {
136+
finishedAt = *params.WorkflowActivityDatabase.FinishedAt
137+
}
138+
124139
return WorkflowActivities{
125140
Id: params.WorkflowActivityDatabase.Id,
126141
Name: params.WorkflowActivityDatabase.Name,
@@ -132,8 +147,8 @@ func DatabaseToWorkflowActivities(params ParamsDatabaseToWorkflowActivities) Wor
132147
DependsOn: wfa.DependsOn,
133148
NodeSelector: wfa.NodeSelector,
134149
KeepDisk: wfa.KeepDisk,
135-
CreatedAt: params.WorkflowActivityDatabase.CreatedAt,
136-
StartedAt: params.WorkflowActivityDatabase.StartedAt,
137-
FinishedAt: params.WorkflowActivityDatabase.FinishedAt,
150+
CreatedAt: createdAt,
151+
StartedAt: startedAt,
152+
FinishedAt: finishedAt,
138153
}
139154
}

pkg/server/services/create_nfs_service/create_nfs_service.go

+2-9
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ func (c *CreateNfsService) Create() bool {
356356
resultServiceAccount := conn.ServiceAccount().CreateServiceAccount(serviceAccount)
357357
if !resultServiceAccount.Success {
358358
log.Printf("Failed to create ServiceAccount: %s", resultServiceAccount.Message)
359-
return false
360359

361360
}
362361
fmt.Println(resultServiceAccount.Message)
@@ -366,7 +365,7 @@ func (c *CreateNfsService) Create() bool {
366365
resultService := conn.Service().CreateService(service)
367366
if !resultService.Success {
368367
log.Printf("Failed to create Service: %s", resultService.Message)
369-
return false
368+
370369
}
371370
fmt.Println(resultService.Message)
372371

@@ -375,7 +374,6 @@ func (c *CreateNfsService) Create() bool {
375374
resultPvc := conn.PersistentVolumeClain().CreatePvc(pvc)
376375
if !resultPvc.Success {
377376
log.Printf("Failed to create PersistentVolumeClaim: %s", resultPvc.Message)
378-
return false
379377

380378
}
381379
fmt.Println(resultPvc.Message)
@@ -385,7 +383,6 @@ func (c *CreateNfsService) Create() bool {
385383
resultDeployment := conn.Deployment().CreateDeployment(deployment)
386384
if !resultDeployment.Success {
387385
log.Printf("Failed to create Deployment: %s", resultDeployment.Message)
388-
return false
389386

390387
}
391388
fmt.Println(resultDeployment.Message)
@@ -395,7 +392,6 @@ func (c *CreateNfsService) Create() bool {
395392
resultClusterRole := conn.ClusterRole().CreateClusterRole(clusterRole)
396393
if !resultClusterRole.Success {
397394
log.Printf("Failed to create ClusterRole: %s", resultClusterRole.Message)
398-
return false
399395

400396
}
401397
fmt.Println(resultClusterRole.Message)
@@ -404,7 +400,7 @@ func (c *CreateNfsService) Create() bool {
404400
clusterRoleBinding := c.createClusterRoleBinding()
405401
resultClusterRoleBinding := conn.ClusterRoleBinding().CreateClusterRoleBinding(clusterRoleBinding)
406402
if !resultClusterRoleBinding.Success {
407-
log.Fatalf("Failed to create ClusterRoleBinding: %s", resultClusterRoleBinding.Message)
403+
log.Printf("Failed to create ClusterRoleBinding: %s", resultClusterRoleBinding.Message)
408404
}
409405
fmt.Println(resultClusterRoleBinding.Message)
410406

@@ -413,7 +409,6 @@ func (c *CreateNfsService) Create() bool {
413409
resultRole := conn.Role().CreateRole(role)
414410
if !resultRole.Success {
415411
log.Printf("Failed to create Role: %s", resultRole.Message)
416-
return false
417412

418413
}
419414
fmt.Println(resultRole.Message)
@@ -423,7 +418,6 @@ func (c *CreateNfsService) Create() bool {
423418
resultRoleBinding := conn.RoleBinding().CreateRoleBinding(roleBinding)
424419
if !resultRoleBinding.Success {
425420
log.Printf("Failed to create RoleBinding: %s", resultRoleBinding.Message)
426-
return false
427421

428422
}
429423
fmt.Println(resultRoleBinding.Message)
@@ -433,7 +427,6 @@ func (c *CreateNfsService) Create() bool {
433427
resultStorageClass := conn.StorageClass().CreateStorageClass(storageClass)
434428
if !resultStorageClass.Success {
435429
log.Printf("Failed to create StorageClass: %s", resultStorageClass.Message)
436-
return false
437430
}
438431
fmt.Println(resultStorageClass.Message)
439432

0 commit comments

Comments
 (0)