add sysapps (#220)

baetyl · Jan 11, 2021 · aa00359 · aa00359
1 parent 37a7294
commit aa00359
Showing 1 changed file with 23 additions and 17 deletions.
diff --git a/spec/v1/node.go b/spec/v1/node.go
@@ -16,23 +16,24 @@ import (
 
 // maxJSONLevel the max level of json
 const (
-	maxJSONLevel               = 5
-	milliPrecision             = 1000
-	KeySyncMode                = "syncMode"
-	CloudMode         SyncMode = "cloud"
-	LocalMode         SyncMode = "local"
-	KeyNodeProps               = "nodeprops"
-	KeyDevices                 = "devices"
-	KeyApps                    = "apps"
-	KeySysApps                 = "sysapps"
-	KeyAppStats                = "appstats"
-	KeySysAppStats             = "sysappstats"
-	KeyAccelerator             = "accelerator"
-	NVAccelerator              = "nvidia"
-	ResourceGPU                = "gpu"
-	KeyGPUUsedMemory           = "usedMemory"
-	KeyGPUTotalMemory          = "totalMemory"
-	KeyGPUPercent              = "percent"
+	maxJSONLevel                = 5
+	milliPrecision              = 1000
+	KeySyncMode                 = "syncMode"
+	CloudMode          SyncMode = "cloud"
+	LocalMode          SyncMode = "local"
+	KeyNodeProps                = "nodeprops"
+	KeyDevices                  = "devices"
+	KeyApps                     = "apps"
+	KeySysApps                  = "sysapps"
+	KeyAppStats                 = "appstats"
+	KeySysAppStats              = "sysappstats"
+	KeyAccelerator              = "accelerator"
+	KeyOptionalSysApps          = "optionalSysApps"
+	NVAccelerator               = "nvidia"
+	ResourceGPU                 = "gpu"
+	KeyGPUUsedMemory            = "usedMemory"
+	KeyGPUTotalMemory           = "totalMemory"
+	KeyGPUPercent               = "percent"
 )
 
 type SyncMode string
@@ -52,6 +53,7 @@ type Node struct {
 	Attributes        map[string]interface{} `json:"attr,omitempty" yaml:"attr,omitempty"`
 	Report            Report                 `json:"report,omitempty" yaml:"report,omitempty"`
 	Desire            Desire                 `json:"desire,omitempty" yaml:"desire,omitempty"`
+	OptionalSysApps   []string               `json:"optionalSysApps,omitempty" yaml:"optionalSysApps,omitempty"`
 	Description       string                 `json:"description,omitempty" yaml:"description,omitempty"`
 }
 
@@ -65,6 +67,7 @@ type NodeView struct {
 	Annotations       map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
 	Report            *ReportView       `json:"report,omitempty" yaml:"report,omitempty"`
 	Desire            Desire            `json:"desire,omitempty" yaml:"desire,omitempty"`
+	OptionalSysApps   []string          `json:"optionalSysApps,omitempty" yaml:"optionalSysApps,omitempty"`
 	Description       string            `json:"description,omitempty" yaml:"description,omitempty"`
 	Ready             bool              `json:"ready"`
 	Mode              SyncMode          `json:"mode"`
@@ -228,6 +231,9 @@ func (n *Node) View(timeout time.Duration) (*NodeView, error) {
 		if val, ok := attr[KeyAccelerator]; ok {
 			view.Accelerator, _ = val.(string)
 		}
+		if val, ok := attr[KeyOptionalSysApps]; ok {
+			view.OptionalSysApps, _ = val.([]string)
+		}
 	}
 	if err = view.populateNodeStats(timeout); err != nil {
 		return nil, errors.Trace(err)