diff --git a/pkg/nextgen/v1/schema.json b/pkg/nextgen/v1/schema.json index 9e11452..97e49e1 100644 --- a/pkg/nextgen/v1/schema.json +++ b/pkg/nextgen/v1/schema.json @@ -44,6 +44,8 @@ "required": ["type", "count"], "properties": { "type": {"type": "string"}, + "schedule": {"type": "boolean"}, + "exclusive": {"type": "boolean"}, "count": {"type": "integer", "minimum": 1}, "unit": {"type": "string"}, "with": {"$ref": "#/definitions/with"} @@ -53,7 +55,7 @@ "with": { "type": "array", "minItems": 1, - "items": {"$ref": "#/definitions/with"} + "items": {"$ref": "#/definitions/resources"} }, "steps": { "type": "array", @@ -112,25 +114,6 @@ "tasks": {"$ref": "#/definitions/tasks"} }, "additionalProperties": false - }, - "slot_vertex": { - "description": "special slot resource type - label assigns to task slot", - "type": "object", - "required": ["type", "count", "with", "label"], - "properties": { - "type": {"enum": ["slot"]}, - "count": {"type": "integer", "minimum": 1}, - "unit": {"type": "string"}, - "label": {"type": "string"}, - "exclusive": {"type": "boolean"}, - "with": { - "type": "array", - "minItems": 1, - "maxItems": 2, - "items": {"oneOf": [{"$ref": "#/definitions/intranode_resource_vertex"}]} - } - }, - "additionalProperties": false } } } diff --git a/pkg/nextgen/v1/types.go b/pkg/nextgen/v1/types.go index 98d46ac..5b09e09 100644 --- a/pkg/nextgen/v1/types.go +++ b/pkg/nextgen/v1/types.go @@ -41,6 +41,7 @@ type Resource struct { With []Resource `yaml:"with,omitempty" json:"with,omitempty"` Label string `yaml:"label,omitempty" json:"label,omitempty"` Exclusive bool `yaml:"exclusive,omitempty" json:"exclusive,omitempty"` + Schedule bool `yaml:"schedule,omitempty" json:"schedule,omitempty"` } type Attributes struct {