Skip to content

Commit

Permalink
Remove WorkflowData API
Browse files Browse the repository at this point in the history 
The WorkflowData API relates to multi worker workflows that aren't
implemented in the Kube backend. With the move to the Kube backend we're
taking the opportunity to reset and implement this sanely when its
needed, not before.
  • Loading branch information
@chrisdoherty4
chrisdoherty4 committed Nov 11, 2022
1 parent 9df0dad commit 56f3cee
Show file tree
Hide file tree
Showing 9 changed files with 567 additions and 732 deletions.
666 changes: 326 additions & 340 deletions config/crd/bases/tinkerbell.org_hardware.yaml
View file

Large diffs are not rendered by default.

92 changes: 42 additions & 50 deletions config/crd/bases/tinkerbell.org_templates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,66 +3,58 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: templates.tinkerbell.org
spec:
group: tinkerbell.org
names:
categories:
- tinkerbell
- tinkerbell
kind: Template
listKind: TemplateList
plural: templates
shortNames:
- tpl
- tpl
singular: template
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.state
name: State
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Template is the Schema for the Templates API.
properties:
apiVersion:
description:
"APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
type: string
kind:
description:
"Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
type: string
metadata:
type: object
spec:
description: TemplateSpec defines the desired state of Template.
properties:
data:
type: string
type: object
status:
description: TemplateStatus defines the observed state of Template.
properties:
state:
description: TemplateState represents the template state.
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
- additionalPrinterColumns:
- jsonPath: .status.state
name: State
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Template is the Schema for the Templates API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: TemplateSpec defines the desired state of Template.
properties:
data:
type: string
type: object
status:
description: TemplateStatus defines the observed state of Template.
properties:
state:
description: TemplateState represents the template state.
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
233 changes: 112 additions & 121 deletions config/crd/bases/tinkerbell.org_workflows.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,144 +3,135 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: workflows.tinkerbell.org
spec:
group: tinkerbell.org
names:
categories:
- tinkerbell
- tinkerbell
kind: Workflow
listKind: WorkflowList
plural: workflows
shortNames:
- wf
- wf
singular: workflow
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .spec.templateRef
name: Template
type: string
- jsonPath: .status.state
name: State
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Workflow is the Schema for the Workflows API.
properties:
apiVersion:
description:
"APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
type: string
kind:
description:
"Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
type: string
metadata:
type: object
spec:
description: WorkflowSpec defines the desired state of Workflow.
properties:
hardwareMap:
additionalProperties:
type: string
description: A mapping of template devices to hadware mac addresses
type: object
hardwareRef:
description: Name of the Hardware associated with this workflow.
type: string
templateRef:
description: Name of the Template associated with this workflow.
- additionalPrinterColumns:
- jsonPath: .spec.templateRef
name: Template
type: string
- jsonPath: .status.state
name: State
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Workflow is the Schema for the Workflows API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: WorkflowSpec defines the desired state of Workflow.
properties:
hardwareMap:
additionalProperties:
type: string
type: object
status:
description: WorkflowStatus defines the observed state of Workflow.
properties:
globalTimeout:
description: GlobalTimeout represents the max execution time
format: int64
type: integer
state:
description: State is the state of the workflow in Tinkerbell.
type: string
tasks:
description: Tasks are the tasks to be completed
items:
description:
Task represents a series of actions to be completed
by a worker.
properties:
actions:
items:
description: Action represents a workflow action.
properties:
command:
items:
type: string
type: array
environment:
additionalProperties:
type: string
type: object
image:
type: string
message:
description: A mapping of template devices to hadware mac addresses
type: object
hardwareRef:
description: Name of the Hardware associated with this workflow.
type: string
templateRef:
description: Name of the Template associated with this workflow.
type: string
type: object
status:
description: WorkflowStatus defines the observed state of Workflow.
properties:
globalTimeout:
description: GlobalTimeout represents the max execution time
format: int64
type: integer
state:
description: State is the state of the workflow in Tinkerbell.
type: string
tasks:
description: Tasks are the tasks to be completed
items:
description: Task represents a series of actions to be completed
by a worker.
properties:
actions:
items:
description: Action represents a workflow action.
properties:
command:
items:
type: string
name:
type: array
environment:
additionalProperties:
type: string
pid:
type: object
image:
type: string
message:
type: string
name:
type: string
pid:
type: string
seconds:
format: int64
type: integer
startedAt:
format: date-time
type: string
status:
type: string
timeout:
format: int64
type: integer
volumes:
items:
type: string
seconds:
format: int64
type: integer
startedAt:
format: date-time
type: string
status:
type: string
timeout:
format: int64
type: integer
volumes:
items:
type: string
type: array
type: object
type: array
environment:
additionalProperties:
type: string
type: array
type: object
name:
type: array
environment:
additionalProperties:
type: string
volumes:
items:
type: string
type: array
worker:
type: object
name:
type: string
volumes:
items:
type: string
required:
- actions
- name
- worker
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
type: array
worker:
type: string
required:
- actions
- name
- worker
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
Loading

0 comments on commit 56f3cee

Please sign in to comment.