From a32a182e52bce721760debe0225047eec571b1b7 Mon Sep 17 00:00:00 2001 From: qingliu Date: Thu, 8 Feb 2024 21:56:29 +0800 Subject: [PATCH] feat: update tekton scheme to v0.56 --- scheme/tekton.dev/v1_Pipeline.json | 288 +++++++- scheme/tekton.dev/v1_PipelineList.json | 288 +++++++- scheme/tekton.dev/v1_PipelineRun.json | 540 +++++++++++--- scheme/tekton.dev/v1_PipelineRunList.json | 540 +++++++++++--- scheme/tekton.dev/v1_Task.json | 197 ++++- scheme/tekton.dev/v1_TaskList.json | 197 ++++- scheme/tekton.dev/v1_TaskRun.json | 357 +++++++-- scheme/tekton.dev/v1_TaskRunList.json | 357 +++++++-- scheme/tekton.dev/v1beta1_ClusterTask.json | 197 ++++- .../tekton.dev/v1beta1_ClusterTaskList.json | 197 ++++- scheme/tekton.dev/v1beta1_Pipeline.json | 291 +++++++- scheme/tekton.dev/v1beta1_PipelineList.json | 291 +++++++- scheme/tekton.dev/v1beta1_PipelineRun.json | 697 ++++++++++++++---- .../tekton.dev/v1beta1_PipelineRunList.json | 697 ++++++++++++++---- scheme/tekton.dev/v1beta1_Task.json | 197 ++++- scheme/tekton.dev/v1beta1_TaskList.json | 197 ++++- scheme/tekton.dev/v1beta1_TaskRun.json | 383 ++++++++-- scheme/tekton.dev/v1beta1_TaskRunList.json | 383 ++++++++-- .../v1alpha1_ClusterInterceptor.json | 19 + .../v1alpha1_ClusterInterceptorList.json | 19 + .../v1alpha1_EventListener.json | 197 ++++- .../v1alpha1_EventListenerList.json | 197 ++++- .../triggers.tekton.dev/v1alpha1_Trigger.json | 6 +- .../v1alpha1_TriggerList.json | 6 +- .../v1alpha1_TriggerTemplate.json | 2 +- .../v1alpha1_TriggerTemplateList.json | 2 +- .../v1beta1_EventListener.json | 197 ++++- .../v1beta1_EventListenerList.json | 197 ++++- .../triggers.tekton.dev/v1beta1_Trigger.json | 6 +- .../v1beta1_TriggerList.json | 6 +- .../v1beta1_TriggerTemplate.json | 2 +- .../v1beta1_TriggerTemplateList.json | 2 +- 32 files changed, 6312 insertions(+), 840 deletions(-) diff --git a/scheme/tekton.dev/v1_Pipeline.json b/scheme/tekton.dev/v1_Pipeline.json index f1bce2bb..6891e0d1 100644 --- a/scheme/tekton.dev/v1_Pipeline.json +++ b/scheme/tekton.dev/v1_Pipeline.json @@ -334,6 +334,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -386,7 +389,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -722,6 +732,21 @@ "additionalProperties": false, "type": "object" }, + "IncludeParams": { + "properties": { + "name": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "IntOrString": { "required": [ "Type", @@ -878,6 +903,13 @@ "$ref": "#/definitions/Param" }, "type": "array" + }, + "include": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/IncludeParams" + }, + "type": "array" } }, "additionalProperties": false, @@ -1082,6 +1114,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1116,7 +1154,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1191,6 +1230,27 @@ "additionalProperties": false, "type": "object" }, + "PipelineRef": { + "properties": { + "name": { + "type": "string" + }, + "apiVersion": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "PipelineResult": { "required": [ "name", @@ -1226,6 +1286,9 @@ }, "PipelineSpec": { "properties": { + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -1271,6 +1334,12 @@ "name": { "type": "string" }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, "taskRef": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRef" @@ -1281,27 +1350,47 @@ }, "when": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" }, @@ -1334,6 +1423,16 @@ "timeout": { "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?(ns|us|µs|μs|ms|s|m|h))+$", "type": "string" + }, + "pipelineRef": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PipelineRef" + }, + "pipelineSpec": { + "$ref": "#/definitions/PipelineSpec" + }, + "onError": { + "type": "string" } }, "additionalProperties": false, @@ -1465,11 +1564,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1535,6 +1629,36 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1547,8 +1671,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1559,7 +1689,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1567,10 +1704,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -1977,6 +2128,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -1991,6 +2159,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "properties": { "image": { @@ -2130,6 +2324,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -2155,6 +2362,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1_PipelineList.json b/scheme/tekton.dev/v1_PipelineList.json index 491eb039..fdf8a551 100644 --- a/scheme/tekton.dev/v1_PipelineList.json +++ b/scheme/tekton.dev/v1_PipelineList.json @@ -334,6 +334,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -386,7 +389,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -722,6 +732,21 @@ "additionalProperties": false, "type": "object" }, + "IncludeParams": { + "properties": { + "name": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "IntOrString": { "required": [ "Type", @@ -896,6 +921,13 @@ "$ref": "#/definitions/Param" }, "type": "array" + }, + "include": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/IncludeParams" + }, + "type": "array" } }, "additionalProperties": false, @@ -1100,6 +1132,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1134,7 +1172,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1235,6 +1274,27 @@ "additionalProperties": false, "type": "object" }, + "PipelineRef": { + "properties": { + "name": { + "type": "string" + }, + "apiVersion": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "PipelineResult": { "required": [ "name", @@ -1270,6 +1330,9 @@ }, "PipelineSpec": { "properties": { + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -1315,6 +1378,12 @@ "name": { "type": "string" }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, "taskRef": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRef" @@ -1325,27 +1394,47 @@ }, "when": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" }, @@ -1378,6 +1467,16 @@ "timeout": { "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?(ns|us|µs|μs|ms|s|m|h))+$", "type": "string" + }, + "pipelineRef": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PipelineRef" + }, + "pipelineSpec": { + "$ref": "#/definitions/PipelineSpec" + }, + "onError": { + "type": "string" } }, "additionalProperties": false, @@ -1509,11 +1608,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1579,6 +1673,36 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1591,8 +1715,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1603,7 +1733,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1611,10 +1748,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2021,6 +2172,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2035,6 +2203,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "properties": { "image": { @@ -2174,6 +2368,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -2199,6 +2406,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1_PipelineRun.json b/scheme/tekton.dev/v1_PipelineRun.json index 2f817fb1..35c28ac4 100644 --- a/scheme/tekton.dev/v1_PipelineRun.json +++ b/scheme/tekton.dev/v1_PipelineRun.json @@ -181,27 +181,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -328,26 +348,6 @@ "additionalProperties": false, "type": "object" }, - "ConfigSource": { - "properties": { - "uri": { - "type": "string" - }, - "digest": { - "patternProperties": { - ".*": { - "type": "string" - } - }, - "type": "object" - }, - "entryPoint": { - "type": "string" - } - }, - "additionalProperties": false, - "type": "object" - }, "ContainerPort": { "required": [ "containerPort" @@ -445,6 +445,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -497,7 +500,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -610,6 +620,94 @@ "additionalProperties": false, "type": "object" }, + "FeatureFlags": { + "required": [ + "DisableAffinityAssistant", + "DisableCredsInit", + "RunningInEnvWithInjectedSidecars", + "RequireGitSSHSecretKnownHosts", + "EnableTektonOCIBundles", + "ScopeWhenExpressionsToTask", + "EnableAPIFields", + "SendCloudEventsForRuns", + "AwaitSidecarReadiness", + "EnforceNonfalsifiability", + "EnableKeepPodOnCancel", + "VerificationNoMatchPolicy", + "EnableProvenanceInStatus", + "ResultExtractionMethod", + "MaxResultSize", + "SetSecurityContext", + "Coschedule", + "EnableCELInWhenExpression", + "EnableStepActions", + "EnableParamEnum" + ], + "properties": { + "DisableAffinityAssistant": { + "type": "boolean" + }, + "DisableCredsInit": { + "type": "boolean" + }, + "RunningInEnvWithInjectedSidecars": { + "type": "boolean" + }, + "RequireGitSSHSecretKnownHosts": { + "type": "boolean" + }, + "EnableTektonOCIBundles": { + "type": "boolean" + }, + "ScopeWhenExpressionsToTask": { + "type": "boolean" + }, + "EnableAPIFields": { + "type": "string" + }, + "SendCloudEventsForRuns": { + "type": "boolean" + }, + "AwaitSidecarReadiness": { + "type": "boolean" + }, + "EnforceNonfalsifiability": { + "type": "string" + }, + "EnableKeepPodOnCancel": { + "type": "boolean" + }, + "VerificationNoMatchPolicy": { + "type": "string" + }, + "EnableProvenanceInStatus": { + "type": "boolean" + }, + "ResultExtractionMethod": { + "type": "string" + }, + "MaxResultSize": { + "type": "integer" + }, + "SetSecurityContext": { + "type": "boolean" + }, + "Coschedule": { + "type": "string" + }, + "EnableCELInWhenExpression": { + "type": "boolean" + }, + "EnableStepActions": { + "type": "boolean" + }, + "EnableParamEnum": { + "type": "boolean" + } + }, + "additionalProperties": false, + "type": "object" + }, "FlexVolumeSource": { "required": [ "driver" @@ -848,6 +946,21 @@ "additionalProperties": false, "type": "object" }, + "IncludeParams": { + "properties": { + "name": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "IntOrString": { "required": [ "Type", @@ -1004,6 +1117,13 @@ "$ref": "#/definitions/Param" }, "type": "array" + }, + "include": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/IncludeParams" + }, + "type": "array" } }, "additionalProperties": false, @@ -1282,6 +1402,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1368,7 +1494,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1388,7 +1515,14 @@ "capacity": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1403,7 +1537,14 @@ "allocatedResources": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1670,6 +1811,14 @@ "provenance": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -1677,6 +1826,9 @@ }, "PipelineSpec": { "properties": { + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -1722,6 +1874,12 @@ "name": { "type": "string" }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, "taskRef": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRef" @@ -1732,27 +1890,47 @@ }, "when": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" }, @@ -1785,6 +1963,15 @@ "timeout": { "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?(ns|us|µs|μs|ms|s|m|h))+$", "type": "string" + }, + "pipelineRef": { + "$ref": "#/definitions/PipelineRef" + }, + "pipelineSpec": { + "$ref": "#/definitions/PipelineSpec" + }, + "onError": { + "type": "string" } }, "additionalProperties": false, @@ -2124,19 +2311,18 @@ }, "Provenance": { "properties": { - "configSource": { + "refSource": { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/ConfigSource" + "$ref": "#/definitions/RefSource" + }, + "featureFlags": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/FeatureFlags" } }, "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -2202,6 +2388,56 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RefSource": { + "properties": { + "uri": { + "type": "string" + }, + "digest": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" + }, + "entryPoint": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -2214,8 +2450,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -2226,7 +2468,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2234,10 +2483,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2570,27 +2833,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -2686,6 +2969,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2700,6 +3000,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "properties": { "image": { @@ -2854,6 +3180,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -3074,6 +3413,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1_PipelineRunList.json b/scheme/tekton.dev/v1_PipelineRunList.json index fb8362f5..665d1870 100644 --- a/scheme/tekton.dev/v1_PipelineRunList.json +++ b/scheme/tekton.dev/v1_PipelineRunList.json @@ -181,27 +181,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -328,26 +348,6 @@ "additionalProperties": false, "type": "object" }, - "ConfigSource": { - "properties": { - "uri": { - "type": "string" - }, - "digest": { - "patternProperties": { - ".*": { - "type": "string" - } - }, - "type": "object" - }, - "entryPoint": { - "type": "string" - } - }, - "additionalProperties": false, - "type": "object" - }, "ContainerPort": { "required": [ "containerPort" @@ -445,6 +445,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -497,7 +500,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -610,6 +620,94 @@ "additionalProperties": false, "type": "object" }, + "FeatureFlags": { + "required": [ + "DisableAffinityAssistant", + "DisableCredsInit", + "RunningInEnvWithInjectedSidecars", + "RequireGitSSHSecretKnownHosts", + "EnableTektonOCIBundles", + "ScopeWhenExpressionsToTask", + "EnableAPIFields", + "SendCloudEventsForRuns", + "AwaitSidecarReadiness", + "EnforceNonfalsifiability", + "EnableKeepPodOnCancel", + "VerificationNoMatchPolicy", + "EnableProvenanceInStatus", + "ResultExtractionMethod", + "MaxResultSize", + "SetSecurityContext", + "Coschedule", + "EnableCELInWhenExpression", + "EnableStepActions", + "EnableParamEnum" + ], + "properties": { + "DisableAffinityAssistant": { + "type": "boolean" + }, + "DisableCredsInit": { + "type": "boolean" + }, + "RunningInEnvWithInjectedSidecars": { + "type": "boolean" + }, + "RequireGitSSHSecretKnownHosts": { + "type": "boolean" + }, + "EnableTektonOCIBundles": { + "type": "boolean" + }, + "ScopeWhenExpressionsToTask": { + "type": "boolean" + }, + "EnableAPIFields": { + "type": "string" + }, + "SendCloudEventsForRuns": { + "type": "boolean" + }, + "AwaitSidecarReadiness": { + "type": "boolean" + }, + "EnforceNonfalsifiability": { + "type": "string" + }, + "EnableKeepPodOnCancel": { + "type": "boolean" + }, + "VerificationNoMatchPolicy": { + "type": "string" + }, + "EnableProvenanceInStatus": { + "type": "boolean" + }, + "ResultExtractionMethod": { + "type": "string" + }, + "MaxResultSize": { + "type": "integer" + }, + "SetSecurityContext": { + "type": "boolean" + }, + "Coschedule": { + "type": "string" + }, + "EnableCELInWhenExpression": { + "type": "boolean" + }, + "EnableStepActions": { + "type": "boolean" + }, + "EnableParamEnum": { + "type": "boolean" + } + }, + "additionalProperties": false, + "type": "object" + }, "FlexVolumeSource": { "required": [ "driver" @@ -848,6 +946,21 @@ "additionalProperties": false, "type": "object" }, + "IncludeParams": { + "properties": { + "name": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "IntOrString": { "required": [ "Type", @@ -1022,6 +1135,13 @@ "$ref": "#/definitions/Param" }, "type": "array" + }, + "include": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/IncludeParams" + }, + "type": "array" } }, "additionalProperties": false, @@ -1300,6 +1420,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1386,7 +1512,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1406,7 +1533,14 @@ "capacity": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1421,7 +1555,14 @@ "allocatedResources": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1711,6 +1852,14 @@ "provenance": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -1718,6 +1867,9 @@ }, "PipelineSpec": { "properties": { + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -1763,6 +1915,12 @@ "name": { "type": "string" }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, "taskRef": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRef" @@ -1773,27 +1931,47 @@ }, "when": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" }, @@ -1826,6 +2004,15 @@ "timeout": { "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?(ns|us|µs|μs|ms|s|m|h))+$", "type": "string" + }, + "pipelineRef": { + "$ref": "#/definitions/PipelineRef" + }, + "pipelineSpec": { + "$ref": "#/definitions/PipelineSpec" + }, + "onError": { + "type": "string" } }, "additionalProperties": false, @@ -2165,19 +2352,18 @@ }, "Provenance": { "properties": { - "configSource": { + "refSource": { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/ConfigSource" + "$ref": "#/definitions/RefSource" + }, + "featureFlags": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/FeatureFlags" } }, "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -2243,6 +2429,56 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RefSource": { + "properties": { + "uri": { + "type": "string" + }, + "digest": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" + }, + "entryPoint": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -2255,8 +2491,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -2267,7 +2509,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2275,10 +2524,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2611,27 +2874,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -2727,6 +3010,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2741,6 +3041,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "properties": { "image": { @@ -2895,6 +3221,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -3115,6 +3454,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1_Task.json b/scheme/tekton.dev/v1_Task.json index 47bee4f5..86d8e9a1 100644 --- a/scheme/tekton.dev/v1_Task.json +++ b/scheme/tekton.dev/v1_Task.json @@ -316,7 +316,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -939,6 +946,32 @@ "additionalProperties": false, "type": "object" }, + "Param": { + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] + } + }, + "additionalProperties": false, + "type": "object" + }, "ParamSpec": { "required": [ "name" @@ -974,6 +1007,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1008,7 +1047,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1146,11 +1186,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1216,6 +1251,37 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1228,8 +1294,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1240,7 +1312,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1248,10 +1327,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -1658,6 +1751,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -1672,6 +1782,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "properties": { "image": { @@ -1810,6 +1946,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -1824,6 +1973,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -1890,6 +2042,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1_TaskList.json b/scheme/tekton.dev/v1_TaskList.json index 804c9b4b..1dbe9325 100644 --- a/scheme/tekton.dev/v1_TaskList.json +++ b/scheme/tekton.dev/v1_TaskList.json @@ -316,7 +316,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -957,6 +964,32 @@ "additionalProperties": false, "type": "object" }, + "Param": { + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] + } + }, + "additionalProperties": false, + "type": "object" + }, "ParamSpec": { "required": [ "name" @@ -992,6 +1025,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1026,7 +1065,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1164,11 +1204,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1234,6 +1269,37 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1246,8 +1312,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1258,7 +1330,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1266,10 +1345,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -1676,6 +1769,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -1690,6 +1800,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "properties": { "image": { @@ -1854,6 +1990,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -1868,6 +2017,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -1934,6 +2086,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1_TaskRun.json b/scheme/tekton.dev/v1_TaskRun.json index 32faa68b..ac479269 100644 --- a/scheme/tekton.dev/v1_TaskRun.json +++ b/scheme/tekton.dev/v1_TaskRun.json @@ -284,26 +284,6 @@ "additionalProperties": false, "type": "object" }, - "ConfigSource": { - "properties": { - "uri": { - "type": "string" - }, - "digest": { - "patternProperties": { - ".*": { - "type": "string" - } - }, - "type": "object" - }, - "entryPoint": { - "type": "string" - } - }, - "additionalProperties": false, - "type": "object" - }, "ContainerPort": { "required": [ "containerPort" @@ -437,7 +417,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -550,6 +537,94 @@ "additionalProperties": false, "type": "object" }, + "FeatureFlags": { + "required": [ + "DisableAffinityAssistant", + "DisableCredsInit", + "RunningInEnvWithInjectedSidecars", + "RequireGitSSHSecretKnownHosts", + "EnableTektonOCIBundles", + "ScopeWhenExpressionsToTask", + "EnableAPIFields", + "SendCloudEventsForRuns", + "AwaitSidecarReadiness", + "EnforceNonfalsifiability", + "EnableKeepPodOnCancel", + "VerificationNoMatchPolicy", + "EnableProvenanceInStatus", + "ResultExtractionMethod", + "MaxResultSize", + "SetSecurityContext", + "Coschedule", + "EnableCELInWhenExpression", + "EnableStepActions", + "EnableParamEnum" + ], + "properties": { + "DisableAffinityAssistant": { + "type": "boolean" + }, + "DisableCredsInit": { + "type": "boolean" + }, + "RunningInEnvWithInjectedSidecars": { + "type": "boolean" + }, + "RequireGitSSHSecretKnownHosts": { + "type": "boolean" + }, + "EnableTektonOCIBundles": { + "type": "boolean" + }, + "ScopeWhenExpressionsToTask": { + "type": "boolean" + }, + "EnableAPIFields": { + "type": "string" + }, + "SendCloudEventsForRuns": { + "type": "boolean" + }, + "AwaitSidecarReadiness": { + "type": "boolean" + }, + "EnforceNonfalsifiability": { + "type": "string" + }, + "EnableKeepPodOnCancel": { + "type": "boolean" + }, + "VerificationNoMatchPolicy": { + "type": "string" + }, + "EnableProvenanceInStatus": { + "type": "boolean" + }, + "ResultExtractionMethod": { + "type": "string" + }, + "MaxResultSize": { + "type": "integer" + }, + "SetSecurityContext": { + "type": "boolean" + }, + "Coschedule": { + "type": "string" + }, + "EnableCELInWhenExpression": { + "type": "boolean" + }, + "EnableStepActions": { + "type": "boolean" + }, + "EnableParamEnum": { + "type": "boolean" + } + }, + "additionalProperties": false, + "type": "object" + }, "FlexVolumeSource": { "required": [ "driver" @@ -1210,6 +1285,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1296,7 +1377,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1316,7 +1398,14 @@ "capacity": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1331,7 +1420,14 @@ "allocatedResources": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1635,19 +1731,18 @@ }, "Provenance": { "properties": { - "configSource": { + "refSource": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/RefSource" + }, + "featureFlags": { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/ConfigSource" + "$ref": "#/definitions/FeatureFlags" } }, "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1713,6 +1808,56 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RefSource": { + "properties": { + "uri": { + "type": "string" + }, + "digest": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" + }, + "entryPoint": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1725,8 +1870,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1737,7 +1888,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1745,10 +1903,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2179,6 +2351,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2193,6 +2382,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepState": { "properties": { "waiting": { @@ -2215,6 +2430,13 @@ }, "imageID": { "type": "string" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskRunResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2329,6 +2551,15 @@ "additionalProperties": false, "type": "object" }, + "TaskBreakpoints": { + "properties": { + "onFailure": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "TaskRef": { "properties": { "name": { @@ -2374,6 +2605,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -2405,11 +2649,9 @@ }, "TaskRunDebug": { "properties": { - "breakpoint": { - "items": { - "type": "string" - }, - "type": "array" + "breakpoints": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskBreakpoints" } }, "additionalProperties": false, @@ -2581,7 +2823,6 @@ }, "results": { "items": { - "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRunResult" }, "type": "array" @@ -2599,6 +2840,14 @@ "provenance": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -2629,6 +2878,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -2840,6 +3092,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1_TaskRunList.json b/scheme/tekton.dev/v1_TaskRunList.json index 1a111386..42660d96 100644 --- a/scheme/tekton.dev/v1_TaskRunList.json +++ b/scheme/tekton.dev/v1_TaskRunList.json @@ -284,26 +284,6 @@ "additionalProperties": false, "type": "object" }, - "ConfigSource": { - "properties": { - "uri": { - "type": "string" - }, - "digest": { - "patternProperties": { - ".*": { - "type": "string" - } - }, - "type": "object" - }, - "entryPoint": { - "type": "string" - } - }, - "additionalProperties": false, - "type": "object" - }, "ContainerPort": { "required": [ "containerPort" @@ -437,7 +417,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -550,6 +537,94 @@ "additionalProperties": false, "type": "object" }, + "FeatureFlags": { + "required": [ + "DisableAffinityAssistant", + "DisableCredsInit", + "RunningInEnvWithInjectedSidecars", + "RequireGitSSHSecretKnownHosts", + "EnableTektonOCIBundles", + "ScopeWhenExpressionsToTask", + "EnableAPIFields", + "SendCloudEventsForRuns", + "AwaitSidecarReadiness", + "EnforceNonfalsifiability", + "EnableKeepPodOnCancel", + "VerificationNoMatchPolicy", + "EnableProvenanceInStatus", + "ResultExtractionMethod", + "MaxResultSize", + "SetSecurityContext", + "Coschedule", + "EnableCELInWhenExpression", + "EnableStepActions", + "EnableParamEnum" + ], + "properties": { + "DisableAffinityAssistant": { + "type": "boolean" + }, + "DisableCredsInit": { + "type": "boolean" + }, + "RunningInEnvWithInjectedSidecars": { + "type": "boolean" + }, + "RequireGitSSHSecretKnownHosts": { + "type": "boolean" + }, + "EnableTektonOCIBundles": { + "type": "boolean" + }, + "ScopeWhenExpressionsToTask": { + "type": "boolean" + }, + "EnableAPIFields": { + "type": "string" + }, + "SendCloudEventsForRuns": { + "type": "boolean" + }, + "AwaitSidecarReadiness": { + "type": "boolean" + }, + "EnforceNonfalsifiability": { + "type": "string" + }, + "EnableKeepPodOnCancel": { + "type": "boolean" + }, + "VerificationNoMatchPolicy": { + "type": "string" + }, + "EnableProvenanceInStatus": { + "type": "boolean" + }, + "ResultExtractionMethod": { + "type": "string" + }, + "MaxResultSize": { + "type": "integer" + }, + "SetSecurityContext": { + "type": "boolean" + }, + "Coschedule": { + "type": "string" + }, + "EnableCELInWhenExpression": { + "type": "boolean" + }, + "EnableStepActions": { + "type": "boolean" + }, + "EnableParamEnum": { + "type": "boolean" + } + }, + "additionalProperties": false, + "type": "object" + }, "FlexVolumeSource": { "required": [ "driver" @@ -1228,6 +1303,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1314,7 +1395,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1334,7 +1416,14 @@ "capacity": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1349,7 +1438,14 @@ "allocatedResources": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1653,19 +1749,18 @@ }, "Provenance": { "properties": { - "configSource": { + "refSource": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/RefSource" + }, + "featureFlags": { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/ConfigSource" + "$ref": "#/definitions/FeatureFlags" } }, "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1731,6 +1826,56 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RefSource": { + "properties": { + "uri": { + "type": "string" + }, + "digest": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" + }, + "entryPoint": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1743,8 +1888,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1755,7 +1906,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1763,10 +1921,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2197,6 +2369,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2211,6 +2400,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepState": { "properties": { "waiting": { @@ -2233,6 +2448,13 @@ }, "imageID": { "type": "string" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskRunResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2347,6 +2569,15 @@ "additionalProperties": false, "type": "object" }, + "TaskBreakpoints": { + "properties": { + "onFailure": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "TaskRef": { "properties": { "name": { @@ -2392,6 +2623,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -2423,11 +2667,9 @@ }, "TaskRunDebug": { "properties": { - "breakpoint": { - "items": { - "type": "string" - }, - "type": "array" + "breakpoints": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskBreakpoints" } }, "additionalProperties": false, @@ -2625,7 +2867,6 @@ }, "results": { "items": { - "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRunResult" }, "type": "array" @@ -2643,6 +2884,14 @@ "provenance": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -2673,6 +2922,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -2884,6 +3136,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_ClusterTask.json b/scheme/tekton.dev/v1beta1_ClusterTask.json index 160c0419..6df91132 100644 --- a/scheme/tekton.dev/v1beta1_ClusterTask.json +++ b/scheme/tekton.dev/v1beta1_ClusterTask.json @@ -336,7 +336,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -959,6 +966,32 @@ "additionalProperties": false, "type": "object" }, + "Param": { + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] + } + }, + "additionalProperties": false, + "type": "object" + }, "ParamSpec": { "required": [ "name" @@ -994,6 +1027,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1028,7 +1067,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1166,11 +1206,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1236,6 +1271,37 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1248,8 +1314,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1260,7 +1332,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1268,10 +1347,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -1711,6 +1804,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -1725,6 +1835,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "required": [ "name" @@ -1922,6 +2058,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -1940,6 +2089,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -2006,6 +2158,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_ClusterTaskList.json b/scheme/tekton.dev/v1beta1_ClusterTaskList.json index 619730d9..e8935199 100644 --- a/scheme/tekton.dev/v1beta1_ClusterTaskList.json +++ b/scheme/tekton.dev/v1beta1_ClusterTaskList.json @@ -362,7 +362,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1003,6 +1010,32 @@ "additionalProperties": false, "type": "object" }, + "Param": { + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] + } + }, + "additionalProperties": false, + "type": "object" + }, "ParamSpec": { "required": [ "name" @@ -1038,6 +1071,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1072,7 +1111,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1210,11 +1250,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1280,6 +1315,37 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1292,8 +1358,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1304,7 +1376,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1312,10 +1391,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -1755,6 +1848,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -1769,6 +1879,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "required": [ "name" @@ -1966,6 +2102,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -1984,6 +2133,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -2050,6 +2202,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_Pipeline.json b/scheme/tekton.dev/v1beta1_Pipeline.json index 05e7912d..a1748549 100644 --- a/scheme/tekton.dev/v1beta1_Pipeline.json +++ b/scheme/tekton.dev/v1beta1_Pipeline.json @@ -338,6 +338,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -390,7 +393,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -726,6 +736,21 @@ "additionalProperties": false, "type": "object" }, + "IncludeParams": { + "properties": { + "name": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "IntOrString": { "required": [ "Type", @@ -882,6 +907,13 @@ "$ref": "#/definitions/Param" }, "type": "array" + }, + "include": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/IncludeParams" + }, + "type": "array" } }, "additionalProperties": false, @@ -1086,6 +1118,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1120,7 +1158,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1214,6 +1253,30 @@ "additionalProperties": false, "type": "object" }, + "PipelineRef": { + "properties": { + "name": { + "type": "string" + }, + "apiVersion": { + "type": "string" + }, + "bundle": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "PipelineResult": { "required": [ "name", @@ -1249,6 +1312,9 @@ }, "PipelineSpec": { "properties": { + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -1301,6 +1367,12 @@ "name": { "type": "string" }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, "taskRef": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRef" @@ -1311,27 +1383,47 @@ }, "when": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" }, @@ -1368,6 +1460,16 @@ "timeout": { "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?(ns|us|µs|μs|ms|s|m|h))+$", "type": "string" + }, + "pipelineRef": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PipelineRef" + }, + "pipelineSpec": { + "$ref": "#/definitions/PipelineSpec" + }, + "onError": { + "type": "string" } }, "additionalProperties": false, @@ -1557,11 +1659,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1627,6 +1724,36 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1639,8 +1766,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1651,7 +1784,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1659,10 +1799,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2102,6 +2256,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2116,6 +2287,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "required": [ "name" @@ -2341,6 +2538,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -2366,6 +2576,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_PipelineList.json b/scheme/tekton.dev/v1beta1_PipelineList.json index bff72f99..5847b508 100644 --- a/scheme/tekton.dev/v1beta1_PipelineList.json +++ b/scheme/tekton.dev/v1beta1_PipelineList.json @@ -338,6 +338,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -390,7 +393,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -726,6 +736,21 @@ "additionalProperties": false, "type": "object" }, + "IncludeParams": { + "properties": { + "name": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "IntOrString": { "required": [ "Type", @@ -900,6 +925,13 @@ "$ref": "#/definitions/Param" }, "type": "array" + }, + "include": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/IncludeParams" + }, + "type": "array" } }, "additionalProperties": false, @@ -1104,6 +1136,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1138,7 +1176,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1258,6 +1297,30 @@ "additionalProperties": false, "type": "object" }, + "PipelineRef": { + "properties": { + "name": { + "type": "string" + }, + "apiVersion": { + "type": "string" + }, + "bundle": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "PipelineResult": { "required": [ "name", @@ -1293,6 +1356,9 @@ }, "PipelineSpec": { "properties": { + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -1345,6 +1411,12 @@ "name": { "type": "string" }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, "taskRef": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRef" @@ -1355,27 +1427,47 @@ }, "when": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" }, @@ -1412,6 +1504,16 @@ "timeout": { "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?(ns|us|µs|μs|ms|s|m|h))+$", "type": "string" + }, + "pipelineRef": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PipelineRef" + }, + "pipelineSpec": { + "$ref": "#/definitions/PipelineSpec" + }, + "onError": { + "type": "string" } }, "additionalProperties": false, @@ -1601,11 +1703,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1671,6 +1768,36 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1683,8 +1810,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1695,7 +1828,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1703,10 +1843,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2146,6 +2300,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2160,6 +2331,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "required": [ "name" @@ -2385,6 +2582,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -2410,6 +2620,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_PipelineRun.json b/scheme/tekton.dev/v1beta1_PipelineRun.json index e447cb01..d1a88553 100644 --- a/scheme/tekton.dev/v1beta1_PipelineRun.json +++ b/scheme/tekton.dev/v1beta1_PipelineRun.json @@ -181,27 +181,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -604,6 +624,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -656,7 +679,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -769,6 +799,94 @@ "additionalProperties": false, "type": "object" }, + "FeatureFlags": { + "required": [ + "DisableAffinityAssistant", + "DisableCredsInit", + "RunningInEnvWithInjectedSidecars", + "RequireGitSSHSecretKnownHosts", + "EnableTektonOCIBundles", + "ScopeWhenExpressionsToTask", + "EnableAPIFields", + "SendCloudEventsForRuns", + "AwaitSidecarReadiness", + "EnforceNonfalsifiability", + "EnableKeepPodOnCancel", + "VerificationNoMatchPolicy", + "EnableProvenanceInStatus", + "ResultExtractionMethod", + "MaxResultSize", + "SetSecurityContext", + "Coschedule", + "EnableCELInWhenExpression", + "EnableStepActions", + "EnableParamEnum" + ], + "properties": { + "DisableAffinityAssistant": { + "type": "boolean" + }, + "DisableCredsInit": { + "type": "boolean" + }, + "RunningInEnvWithInjectedSidecars": { + "type": "boolean" + }, + "RequireGitSSHSecretKnownHosts": { + "type": "boolean" + }, + "EnableTektonOCIBundles": { + "type": "boolean" + }, + "ScopeWhenExpressionsToTask": { + "type": "boolean" + }, + "EnableAPIFields": { + "type": "string" + }, + "SendCloudEventsForRuns": { + "type": "boolean" + }, + "AwaitSidecarReadiness": { + "type": "boolean" + }, + "EnforceNonfalsifiability": { + "type": "string" + }, + "EnableKeepPodOnCancel": { + "type": "boolean" + }, + "VerificationNoMatchPolicy": { + "type": "string" + }, + "EnableProvenanceInStatus": { + "type": "boolean" + }, + "ResultExtractionMethod": { + "type": "string" + }, + "MaxResultSize": { + "type": "integer" + }, + "SetSecurityContext": { + "type": "boolean" + }, + "Coschedule": { + "type": "string" + }, + "EnableCELInWhenExpression": { + "type": "boolean" + }, + "EnableStepActions": { + "type": "boolean" + }, + "EnableParamEnum": { + "type": "boolean" + } + }, + "additionalProperties": false, + "type": "object" + }, "FlexVolumeSource": { "required": [ "driver" @@ -1007,6 +1125,21 @@ "additionalProperties": false, "type": "object" }, + "IncludeParams": { + "properties": { + "name": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "IntOrString": { "required": [ "Type", @@ -1163,6 +1296,13 @@ "$ref": "#/definitions/Param" }, "type": "array" + }, + "include": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/IncludeParams" + }, + "type": "array" } }, "additionalProperties": false, @@ -1441,6 +1581,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1527,7 +1673,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1547,7 +1694,14 @@ "capacity": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1562,7 +1716,14 @@ "allocatedResources": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1693,28 +1854,6 @@ "additionalProperties": false, "type": "object" }, - "PipelineResourceResult": { - "required": [ - "key", - "value" - ], - "properties": { - "key": { - "type": "string" - }, - "value": { - "type": "string" - }, - "resourceName": { - "type": "string" - }, - "type": { - "type": "integer" - } - }, - "additionalProperties": false, - "type": "object" - }, "PipelineResourceSpec": { "required": [ "type", @@ -1839,27 +1978,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -2002,6 +2161,14 @@ }, "provenance": { "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -2018,27 +2185,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -2048,6 +2235,9 @@ }, "PipelineSpec": { "properties": { + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -2100,6 +2290,12 @@ "name": { "type": "string" }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, "taskRef": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRef" @@ -2110,27 +2306,47 @@ }, "when": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" }, @@ -2167,6 +2383,15 @@ "timeout": { "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?(ns|us|µs|μs|ms|s|m|h))+$", "type": "string" + }, + "pipelineRef": { + "$ref": "#/definitions/PipelineRef" + }, + "pipelineSpec": { + "$ref": "#/definitions/PipelineSpec" + }, + "onError": { + "type": "string" } }, "additionalProperties": false, @@ -2554,16 +2779,19 @@ "configSource": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/ConfigSource" + }, + "refSource": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/RefSource" + }, + "featureFlags": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/FeatureFlags" } }, "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -2629,6 +2857,56 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RefSource": { + "properties": { + "uri": { + "type": "string" + }, + "digest": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" + }, + "entryPoint": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -2641,8 +2919,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -2669,7 +2953,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2677,10 +2968,46 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RunResult": { + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + }, + "resourceName": { + "type": "string" + }, + "type": { + "type": "integer" } }, "additionalProperties": false, @@ -3054,27 +3381,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -3206,6 +3553,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -3220,6 +3584,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepState": { "properties": { "waiting": { @@ -3242,6 +3632,13 @@ }, "imageID": { "type": "string" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskRunResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -3487,6 +3884,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -3593,13 +4003,12 @@ "resourcesResult": { "items": { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/PipelineResourceResult" + "$ref": "#/definitions/RunResult" }, "type": "array" }, "taskResults": { "items": { - "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRunResult" }, "type": "array" @@ -3618,6 +4027,14 @@ "provenance": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -3650,6 +4067,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -3873,6 +4293,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_PipelineRunList.json b/scheme/tekton.dev/v1beta1_PipelineRunList.json index d8b58b63..f5baab84 100644 --- a/scheme/tekton.dev/v1beta1_PipelineRunList.json +++ b/scheme/tekton.dev/v1beta1_PipelineRunList.json @@ -181,27 +181,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -604,6 +624,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -656,7 +679,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -769,6 +799,94 @@ "additionalProperties": false, "type": "object" }, + "FeatureFlags": { + "required": [ + "DisableAffinityAssistant", + "DisableCredsInit", + "RunningInEnvWithInjectedSidecars", + "RequireGitSSHSecretKnownHosts", + "EnableTektonOCIBundles", + "ScopeWhenExpressionsToTask", + "EnableAPIFields", + "SendCloudEventsForRuns", + "AwaitSidecarReadiness", + "EnforceNonfalsifiability", + "EnableKeepPodOnCancel", + "VerificationNoMatchPolicy", + "EnableProvenanceInStatus", + "ResultExtractionMethod", + "MaxResultSize", + "SetSecurityContext", + "Coschedule", + "EnableCELInWhenExpression", + "EnableStepActions", + "EnableParamEnum" + ], + "properties": { + "DisableAffinityAssistant": { + "type": "boolean" + }, + "DisableCredsInit": { + "type": "boolean" + }, + "RunningInEnvWithInjectedSidecars": { + "type": "boolean" + }, + "RequireGitSSHSecretKnownHosts": { + "type": "boolean" + }, + "EnableTektonOCIBundles": { + "type": "boolean" + }, + "ScopeWhenExpressionsToTask": { + "type": "boolean" + }, + "EnableAPIFields": { + "type": "string" + }, + "SendCloudEventsForRuns": { + "type": "boolean" + }, + "AwaitSidecarReadiness": { + "type": "boolean" + }, + "EnforceNonfalsifiability": { + "type": "string" + }, + "EnableKeepPodOnCancel": { + "type": "boolean" + }, + "VerificationNoMatchPolicy": { + "type": "string" + }, + "EnableProvenanceInStatus": { + "type": "boolean" + }, + "ResultExtractionMethod": { + "type": "string" + }, + "MaxResultSize": { + "type": "integer" + }, + "SetSecurityContext": { + "type": "boolean" + }, + "Coschedule": { + "type": "string" + }, + "EnableCELInWhenExpression": { + "type": "boolean" + }, + "EnableStepActions": { + "type": "boolean" + }, + "EnableParamEnum": { + "type": "boolean" + } + }, + "additionalProperties": false, + "type": "object" + }, "FlexVolumeSource": { "required": [ "driver" @@ -1007,6 +1125,21 @@ "additionalProperties": false, "type": "object" }, + "IncludeParams": { + "properties": { + "name": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, "IntOrString": { "required": [ "Type", @@ -1181,6 +1314,13 @@ "$ref": "#/definitions/Param" }, "type": "array" + }, + "include": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/IncludeParams" + }, + "type": "array" } }, "additionalProperties": false, @@ -1459,6 +1599,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1545,7 +1691,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1565,7 +1712,14 @@ "capacity": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1580,7 +1734,14 @@ "allocatedResources": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1711,28 +1872,6 @@ "additionalProperties": false, "type": "object" }, - "PipelineResourceResult": { - "required": [ - "key", - "value" - ], - "properties": { - "key": { - "type": "string" - }, - "value": { - "type": "string" - }, - "resourceName": { - "type": "string" - }, - "type": { - "type": "integer" - } - }, - "additionalProperties": false, - "type": "object" - }, "PipelineResourceSpec": { "required": [ "type", @@ -1880,27 +2019,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -2043,6 +2202,14 @@ }, "provenance": { "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -2059,27 +2226,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -2089,6 +2276,9 @@ }, "PipelineSpec": { "properties": { + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -2141,6 +2331,12 @@ "name": { "type": "string" }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, "taskRef": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRef" @@ -2151,27 +2347,47 @@ }, "when": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" }, @@ -2208,6 +2424,15 @@ "timeout": { "pattern": "^[-+]?([0-9]*(\\.[0-9]*)?(ns|us|µs|μs|ms|s|m|h))+$", "type": "string" + }, + "pipelineRef": { + "$ref": "#/definitions/PipelineRef" + }, + "pipelineSpec": { + "$ref": "#/definitions/PipelineSpec" + }, + "onError": { + "type": "string" } }, "additionalProperties": false, @@ -2595,16 +2820,19 @@ "configSource": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/ConfigSource" + }, + "refSource": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/RefSource" + }, + "featureFlags": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/FeatureFlags" } }, "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -2670,6 +2898,56 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RefSource": { + "properties": { + "uri": { + "type": "string" + }, + "digest": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" + }, + "entryPoint": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -2682,8 +2960,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -2710,7 +2994,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2718,10 +3009,46 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RunResult": { + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + }, + "resourceName": { + "type": "string" + }, + "type": { + "type": "integer" } }, "additionalProperties": false, @@ -3095,27 +3422,47 @@ }, "whenExpressions": { "items": { - "required": [ - "input", - "operator", - "values" - ], - "properties": { - "input": { - "type": "string" - }, - "operator": { - "type": "string" + "oneOf": [ + { + "required": [ + "input", + "operator", + "values" + ], + "properties": { + "input": { + "type": "string" + }, + "operator": { + "enum": [ + "in", + "notin" + ], + "type": "string" + }, + "values": { + "items": { + "type": "string" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" }, - "values": { - "items": { - "type": "string" + { + "required": [ + "cel" + ], + "properties": { + "cel": { + "type": "string" + } }, - "type": "array" + "additionalProperties": false, + "type": "object" } - }, - "additionalProperties": false, - "type": "object" + ] }, "type": "array" } @@ -3247,6 +3594,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -3261,6 +3625,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepState": { "properties": { "waiting": { @@ -3283,6 +3673,13 @@ }, "imageID": { "type": "string" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskRunResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -3528,6 +3925,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -3634,13 +4044,12 @@ "resourcesResult": { "items": { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/PipelineResourceResult" + "$ref": "#/definitions/RunResult" }, "type": "array" }, "taskResults": { "items": { - "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRunResult" }, "type": "array" @@ -3659,6 +4068,14 @@ "provenance": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -3691,6 +4108,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -3914,6 +4334,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_Task.json b/scheme/tekton.dev/v1beta1_Task.json index de20ad2b..cd99f5ce 100644 --- a/scheme/tekton.dev/v1beta1_Task.json +++ b/scheme/tekton.dev/v1beta1_Task.json @@ -316,7 +316,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -939,6 +946,32 @@ "additionalProperties": false, "type": "object" }, + "Param": { + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] + } + }, + "additionalProperties": false, + "type": "object" + }, "ParamSpec": { "required": [ "name" @@ -974,6 +1007,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1008,7 +1047,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1146,11 +1186,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1216,6 +1251,37 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1228,8 +1294,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1240,7 +1312,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1248,10 +1327,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -1691,6 +1784,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -1705,6 +1815,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "required": [ "name" @@ -1926,6 +2062,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -1944,6 +2093,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -2010,6 +2162,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_TaskList.json b/scheme/tekton.dev/v1beta1_TaskList.json index ab0615bf..7c37416a 100644 --- a/scheme/tekton.dev/v1beta1_TaskList.json +++ b/scheme/tekton.dev/v1beta1_TaskList.json @@ -316,7 +316,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -957,6 +964,32 @@ "additionalProperties": false, "type": "object" }, + "Param": { + "required": [ + "name", + "value" + ], + "properties": { + "name": { + "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] + } + }, + "additionalProperties": false, + "type": "object" + }, "ParamSpec": { "required": [ "name" @@ -992,6 +1025,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1026,7 +1065,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1164,11 +1204,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1234,6 +1269,37 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1246,8 +1312,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1258,7 +1330,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1266,10 +1345,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -1709,6 +1802,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -1723,6 +1833,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepTemplate": { "required": [ "name" @@ -1970,6 +2106,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -1988,6 +2137,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -2054,6 +2206,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_TaskRun.json b/scheme/tekton.dev/v1beta1_TaskRun.json index 637df359..c8a7e24a 100644 --- a/scheme/tekton.dev/v1beta1_TaskRun.json +++ b/scheme/tekton.dev/v1beta1_TaskRun.json @@ -473,7 +473,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -586,6 +593,94 @@ "additionalProperties": false, "type": "object" }, + "FeatureFlags": { + "required": [ + "DisableAffinityAssistant", + "DisableCredsInit", + "RunningInEnvWithInjectedSidecars", + "RequireGitSSHSecretKnownHosts", + "EnableTektonOCIBundles", + "ScopeWhenExpressionsToTask", + "EnableAPIFields", + "SendCloudEventsForRuns", + "AwaitSidecarReadiness", + "EnforceNonfalsifiability", + "EnableKeepPodOnCancel", + "VerificationNoMatchPolicy", + "EnableProvenanceInStatus", + "ResultExtractionMethod", + "MaxResultSize", + "SetSecurityContext", + "Coschedule", + "EnableCELInWhenExpression", + "EnableStepActions", + "EnableParamEnum" + ], + "properties": { + "DisableAffinityAssistant": { + "type": "boolean" + }, + "DisableCredsInit": { + "type": "boolean" + }, + "RunningInEnvWithInjectedSidecars": { + "type": "boolean" + }, + "RequireGitSSHSecretKnownHosts": { + "type": "boolean" + }, + "EnableTektonOCIBundles": { + "type": "boolean" + }, + "ScopeWhenExpressionsToTask": { + "type": "boolean" + }, + "EnableAPIFields": { + "type": "string" + }, + "SendCloudEventsForRuns": { + "type": "boolean" + }, + "AwaitSidecarReadiness": { + "type": "boolean" + }, + "EnforceNonfalsifiability": { + "type": "string" + }, + "EnableKeepPodOnCancel": { + "type": "boolean" + }, + "VerificationNoMatchPolicy": { + "type": "string" + }, + "EnableProvenanceInStatus": { + "type": "boolean" + }, + "ResultExtractionMethod": { + "type": "string" + }, + "MaxResultSize": { + "type": "integer" + }, + "SetSecurityContext": { + "type": "boolean" + }, + "Coschedule": { + "type": "string" + }, + "EnableCELInWhenExpression": { + "type": "boolean" + }, + "EnableStepActions": { + "type": "boolean" + }, + "EnableParamEnum": { + "type": "boolean" + } + }, + "additionalProperties": false, + "type": "object" + }, "FlexVolumeSource": { "required": [ "driver" @@ -1246,6 +1341,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1332,7 +1433,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1352,7 +1454,14 @@ "capacity": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1367,7 +1476,14 @@ "allocatedResources": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1437,28 +1553,6 @@ "additionalProperties": false, "type": "object" }, - "PipelineResourceResult": { - "required": [ - "key", - "value" - ], - "properties": { - "key": { - "type": "string" - }, - "value": { - "type": "string" - }, - "resourceName": { - "type": "string" - }, - "type": { - "type": "integer" - } - }, - "additionalProperties": false, - "type": "object" - }, "PipelineResourceSpec": { "required": [ "type", @@ -1738,16 +1832,19 @@ "configSource": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/ConfigSource" + }, + "refSource": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/RefSource" + }, + "featureFlags": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/FeatureFlags" } }, "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1813,6 +1910,56 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RefSource": { + "properties": { + "uri": { + "type": "string" + }, + "digest": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" + }, + "entryPoint": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1825,8 +1972,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1853,7 +2006,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1861,10 +2021,46 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RunResult": { + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + }, + "resourceName": { + "type": "string" + }, + "type": { + "type": "integer" } }, "additionalProperties": false, @@ -2348,6 +2544,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2362,6 +2575,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepState": { "properties": { "waiting": { @@ -2384,6 +2623,13 @@ }, "imageID": { "type": "string" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskRunResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2537,6 +2783,15 @@ "additionalProperties": false, "type": "object" }, + "TaskBreakpoints": { + "properties": { + "onFailure": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "TaskRef": { "properties": { "name": { @@ -2652,6 +2907,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -2683,11 +2951,9 @@ }, "TaskRunDebug": { "properties": { - "breakpoint": { - "items": { - "type": "string" - }, - "type": "array" + "breakpoints": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskBreakpoints" } }, "additionalProperties": false, @@ -2890,13 +3156,12 @@ "resourcesResult": { "items": { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/PipelineResourceResult" + "$ref": "#/definitions/RunResult" }, "type": "array" }, "taskResults": { "items": { - "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRunResult" }, "type": "array" @@ -2914,6 +3179,14 @@ "provenance": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -2948,6 +3221,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -3159,6 +3435,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/tekton.dev/v1beta1_TaskRunList.json b/scheme/tekton.dev/v1beta1_TaskRunList.json index a9c1aef4..a6c5dbed 100644 --- a/scheme/tekton.dev/v1beta1_TaskRunList.json +++ b/scheme/tekton.dev/v1beta1_TaskRunList.json @@ -473,7 +473,14 @@ "type": "string" }, "sizeLimit": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -586,6 +593,94 @@ "additionalProperties": false, "type": "object" }, + "FeatureFlags": { + "required": [ + "DisableAffinityAssistant", + "DisableCredsInit", + "RunningInEnvWithInjectedSidecars", + "RequireGitSSHSecretKnownHosts", + "EnableTektonOCIBundles", + "ScopeWhenExpressionsToTask", + "EnableAPIFields", + "SendCloudEventsForRuns", + "AwaitSidecarReadiness", + "EnforceNonfalsifiability", + "EnableKeepPodOnCancel", + "VerificationNoMatchPolicy", + "EnableProvenanceInStatus", + "ResultExtractionMethod", + "MaxResultSize", + "SetSecurityContext", + "Coschedule", + "EnableCELInWhenExpression", + "EnableStepActions", + "EnableParamEnum" + ], + "properties": { + "DisableAffinityAssistant": { + "type": "boolean" + }, + "DisableCredsInit": { + "type": "boolean" + }, + "RunningInEnvWithInjectedSidecars": { + "type": "boolean" + }, + "RequireGitSSHSecretKnownHosts": { + "type": "boolean" + }, + "EnableTektonOCIBundles": { + "type": "boolean" + }, + "ScopeWhenExpressionsToTask": { + "type": "boolean" + }, + "EnableAPIFields": { + "type": "string" + }, + "SendCloudEventsForRuns": { + "type": "boolean" + }, + "AwaitSidecarReadiness": { + "type": "boolean" + }, + "EnforceNonfalsifiability": { + "type": "string" + }, + "EnableKeepPodOnCancel": { + "type": "boolean" + }, + "VerificationNoMatchPolicy": { + "type": "string" + }, + "EnableProvenanceInStatus": { + "type": "boolean" + }, + "ResultExtractionMethod": { + "type": "string" + }, + "MaxResultSize": { + "type": "integer" + }, + "SetSecurityContext": { + "type": "boolean" + }, + "Coschedule": { + "type": "string" + }, + "EnableCELInWhenExpression": { + "type": "boolean" + }, + "EnableStepActions": { + "type": "boolean" + }, + "EnableParamEnum": { + "type": "boolean" + } + }, + "additionalProperties": false, + "type": "object" + }, "FlexVolumeSource": { "required": [ "driver" @@ -1264,6 +1359,12 @@ "type": "array" } ] + }, + "enum": { + "items": { + "type": "string" + }, + "type": "array" } }, "additionalProperties": false, @@ -1350,7 +1451,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1370,7 +1472,14 @@ "capacity": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1385,7 +1494,14 @@ "allocatedResources": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1455,28 +1571,6 @@ "additionalProperties": false, "type": "object" }, - "PipelineResourceResult": { - "required": [ - "key", - "value" - ], - "properties": { - "key": { - "type": "string" - }, - "value": { - "type": "string" - }, - "resourceName": { - "type": "string" - }, - "type": { - "type": "integer" - } - }, - "additionalProperties": false, - "type": "object" - }, "PipelineResourceSpec": { "required": [ "type", @@ -1756,16 +1850,19 @@ "configSource": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/ConfigSource" + }, + "refSource": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/RefSource" + }, + "featureFlags": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/FeatureFlags" } }, "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -1831,6 +1928,56 @@ "additionalProperties": false, "type": "object" }, + "Ref": { + "properties": { + "name": { + "type": "string" + }, + "resolver": { + "type": "string" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RefSource": { + "properties": { + "uri": { + "type": "string" + }, + "digest": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" + }, + "entryPoint": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -1843,8 +1990,14 @@ "type": "string" }, "divisor": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -1871,7 +2024,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -1879,10 +2039,46 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" + } + }, + "additionalProperties": false, + "type": "object" + }, + "RunResult": { + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + }, + "resourceName": { + "type": "string" + }, + "type": { + "type": "integer" } }, "additionalProperties": false, @@ -2366,6 +2562,23 @@ }, "stderrConfig": { "$ref": "#/definitions/StepOutputConfig" + }, + "ref": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/Ref" + }, + "params": { + "items": { + "$ref": "#/definitions/Param" + }, + "type": "array" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/StepResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2380,6 +2593,32 @@ "additionalProperties": false, "type": "object" }, + "StepResult": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "properties": { + "patternProperties": { + ".*": { + "$ref": "#/definitions/PropertySpec" + } + }, + "type": "object" + }, + "description": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "StepState": { "properties": { "waiting": { @@ -2402,6 +2641,13 @@ }, "imageID": { "type": "string" + }, + "results": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskRunResult" + }, + "type": "array" } }, "additionalProperties": false, @@ -2555,6 +2801,15 @@ "additionalProperties": false, "type": "object" }, + "TaskBreakpoints": { + "properties": { + "onFailure": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "TaskRef": { "properties": { "name": { @@ -2670,6 +2925,19 @@ }, "description": { "type": "string" + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ] } }, "additionalProperties": false, @@ -2701,11 +2969,9 @@ }, "TaskRunDebug": { "properties": { - "breakpoint": { - "items": { - "type": "string" - }, - "type": "array" + "breakpoints": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TaskBreakpoints" } }, "additionalProperties": false, @@ -2934,13 +3200,12 @@ "resourcesResult": { "items": { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/PipelineResourceResult" + "$ref": "#/definitions/RunResult" }, "type": "array" }, "taskResults": { "items": { - "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/TaskRunResult" }, "type": "array" @@ -2958,6 +3223,14 @@ "provenance": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Provenance" + }, + "spanContext": { + "patternProperties": { + ".*": { + "type": "string" + } + }, + "type": "object" } }, "additionalProperties": false, @@ -2992,6 +3265,9 @@ }, "type": "array" }, + "displayName": { + "type": "string" + }, "description": { "type": "string" }, @@ -3203,6 +3479,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Volume": { "required": [ "name" diff --git a/scheme/triggers.tekton.dev/v1alpha1_ClusterInterceptor.json b/scheme/triggers.tekton.dev/v1alpha1_ClusterInterceptor.json index 573004b0..a3632821 100644 --- a/scheme/triggers.tekton.dev/v1alpha1_ClusterInterceptor.json +++ b/scheme/triggers.tekton.dev/v1alpha1_ClusterInterceptor.json @@ -4,8 +4,17 @@ "definitions": { "Addressable": { "properties": { + "name": { + "type": "string" + }, "url": { "$ref": "#/definitions/URL" + }, + "CACerts": { + "type": "string" + }, + "audience": { + "type": "string" } }, "additionalProperties": false, @@ -95,6 +104,12 @@ "address": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Addressable" + }, + "addresses": { + "items": { + "$ref": "#/definitions/Addressable" + }, + "type": "array" } }, "additionalProperties": false, @@ -293,6 +308,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -318,6 +334,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1alpha1_ClusterInterceptorList.json b/scheme/triggers.tekton.dev/v1alpha1_ClusterInterceptorList.json index 8ea579dd..0f16c229 100644 --- a/scheme/triggers.tekton.dev/v1alpha1_ClusterInterceptorList.json +++ b/scheme/triggers.tekton.dev/v1alpha1_ClusterInterceptorList.json @@ -4,8 +4,17 @@ "definitions": { "Addressable": { "properties": { + "name": { + "type": "string" + }, "url": { "$ref": "#/definitions/URL" + }, + "CACerts": { + "type": "string" + }, + "audience": { + "type": "string" } }, "additionalProperties": false, @@ -121,6 +130,12 @@ "address": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Addressable" + }, + "addresses": { + "items": { + "$ref": "#/definitions/Addressable" + }, + "type": "array" } }, "additionalProperties": false, @@ -337,6 +352,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -362,6 +378,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1alpha1_EventListener.json b/scheme/triggers.tekton.dev/v1alpha1_EventListener.json index cc21622a..50dfae2e 100644 --- a/scheme/triggers.tekton.dev/v1alpha1_EventListener.json +++ b/scheme/triggers.tekton.dev/v1alpha1_EventListener.json @@ -25,9 +25,15 @@ }, "Addressable": { "properties": { + "name": { + "type": "string" + }, "url": { "$ref": "#/definitions/URL" }, + "CACerts": { + "type": "string" + }, "hostname": { "type": "string" } @@ -241,6 +247,18 @@ "additionalProperties": false, "type": "object" }, + "ClaimSource": { + "properties": { + "resourceClaimName": { + "type": "string" + }, + "resourceClaimTemplateName": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Condition": { "required": [ "type", @@ -389,6 +407,13 @@ "resources": { "$ref": "#/definitions/ResourceRequirements" }, + "resizePolicy": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ContainerResizePolicy" + }, + "type": "array" + }, "volumeMounts": { "items": { "$schema": "http://json-schema.org/draft-04/schema#", @@ -467,6 +492,22 @@ "additionalProperties": false, "type": "object" }, + "ContainerResizePolicy": { + "required": [ + "resourceName", + "restartPolicy" + ], + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "CustomResource": { "properties": {}, "additionalProperties": false, @@ -529,8 +570,14 @@ "type": "string" }, "sizeLimit": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -639,6 +686,12 @@ "resources": { "$ref": "#/definitions/ResourceRequirements" }, + "resizePolicy": { + "items": { + "$ref": "#/definitions/ContainerResizePolicy" + }, + "type": "array" + }, "volumeMounts": { "items": { "$ref": "#/definitions/VolumeMount" @@ -798,6 +851,12 @@ "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Addressable" }, + "addresses": { + "items": { + "$ref": "#/definitions/Addressable" + }, + "type": "array" + }, "configuration": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/EventListenerConfig" @@ -1703,7 +1762,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1878,6 +1938,34 @@ "additionalProperties": false, "type": "object" }, + "PodResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "source": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ClaimSource" + } + }, + "additionalProperties": false, + "type": "object" + }, + "PodSchedulingGate": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "PodSecurityContext": { "properties": { "seLinuxOptions": { @@ -2063,7 +2151,14 @@ "overhead": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2084,6 +2179,20 @@ }, "hostUsers": { "type": "boolean" + }, + "schedulingGates": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PodSchedulingGate" + }, + "type": "array" + }, + "resourceClaims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PodResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2195,11 +2304,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -2265,6 +2369,18 @@ "additionalProperties": false, "type": "object" }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -2277,7 +2393,14 @@ "type": "string" }, "divisor": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -2288,7 +2411,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2296,10 +2426,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2736,7 +2880,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, @@ -2768,6 +2912,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "URL": { "required": [ "Scheme", @@ -2776,6 +2943,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -2801,6 +2969,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1alpha1_EventListenerList.json b/scheme/triggers.tekton.dev/v1alpha1_EventListenerList.json index 6353bdfa..28a9113a 100644 --- a/scheme/triggers.tekton.dev/v1alpha1_EventListenerList.json +++ b/scheme/triggers.tekton.dev/v1alpha1_EventListenerList.json @@ -25,9 +25,15 @@ }, "Addressable": { "properties": { + "name": { + "type": "string" + }, "url": { "$ref": "#/definitions/URL" }, + "CACerts": { + "type": "string" + }, "hostname": { "type": "string" } @@ -241,6 +247,18 @@ "additionalProperties": false, "type": "object" }, + "ClaimSource": { + "properties": { + "resourceClaimName": { + "type": "string" + }, + "resourceClaimTemplateName": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Condition": { "required": [ "type", @@ -389,6 +407,13 @@ "resources": { "$ref": "#/definitions/ResourceRequirements" }, + "resizePolicy": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ContainerResizePolicy" + }, + "type": "array" + }, "volumeMounts": { "items": { "$schema": "http://json-schema.org/draft-04/schema#", @@ -467,6 +492,22 @@ "additionalProperties": false, "type": "object" }, + "ContainerResizePolicy": { + "required": [ + "resourceName", + "restartPolicy" + ], + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "CustomResource": { "properties": {}, "additionalProperties": false, @@ -529,8 +570,14 @@ "type": "string" }, "sizeLimit": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -639,6 +686,12 @@ "resources": { "$ref": "#/definitions/ResourceRequirements" }, + "resizePolicy": { + "items": { + "$ref": "#/definitions/ContainerResizePolicy" + }, + "type": "array" + }, "volumeMounts": { "items": { "$ref": "#/definitions/VolumeMount" @@ -824,6 +877,12 @@ "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Addressable" }, + "addresses": { + "items": { + "$ref": "#/definitions/Addressable" + }, + "type": "array" + }, "configuration": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/EventListenerConfig" @@ -1747,7 +1806,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1922,6 +1982,34 @@ "additionalProperties": false, "type": "object" }, + "PodResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "source": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ClaimSource" + } + }, + "additionalProperties": false, + "type": "object" + }, + "PodSchedulingGate": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "PodSecurityContext": { "properties": { "seLinuxOptions": { @@ -2107,7 +2195,14 @@ "overhead": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2128,6 +2223,20 @@ }, "hostUsers": { "type": "boolean" + }, + "schedulingGates": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PodSchedulingGate" + }, + "type": "array" + }, + "resourceClaims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PodResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2239,11 +2348,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -2309,6 +2413,18 @@ "additionalProperties": false, "type": "object" }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -2321,7 +2437,14 @@ "type": "string" }, "divisor": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -2332,7 +2455,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2340,10 +2470,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2780,7 +2924,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, @@ -2812,6 +2956,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "URL": { "required": [ "Scheme", @@ -2820,6 +2987,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -2845,6 +3013,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1alpha1_Trigger.json b/scheme/triggers.tekton.dev/v1alpha1_Trigger.json index 5eb24f09..39fa131d 100644 --- a/scheme/triggers.tekton.dev/v1alpha1_Trigger.json +++ b/scheme/triggers.tekton.dev/v1alpha1_Trigger.json @@ -506,7 +506,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, @@ -526,6 +526,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -551,6 +552,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1alpha1_TriggerList.json b/scheme/triggers.tekton.dev/v1alpha1_TriggerList.json index 5eb24f09..39fa131d 100644 --- a/scheme/triggers.tekton.dev/v1alpha1_TriggerList.json +++ b/scheme/triggers.tekton.dev/v1alpha1_TriggerList.json @@ -506,7 +506,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, @@ -526,6 +526,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -551,6 +552,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1alpha1_TriggerTemplate.json b/scheme/triggers.tekton.dev/v1alpha1_TriggerTemplate.json index 385bf935..fdbbcec2 100644 --- a/scheme/triggers.tekton.dev/v1alpha1_TriggerTemplate.json +++ b/scheme/triggers.tekton.dev/v1alpha1_TriggerTemplate.json @@ -190,7 +190,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, diff --git a/scheme/triggers.tekton.dev/v1alpha1_TriggerTemplateList.json b/scheme/triggers.tekton.dev/v1alpha1_TriggerTemplateList.json index d14995d9..47039c2e 100644 --- a/scheme/triggers.tekton.dev/v1alpha1_TriggerTemplateList.json +++ b/scheme/triggers.tekton.dev/v1alpha1_TriggerTemplateList.json @@ -234,7 +234,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, diff --git a/scheme/triggers.tekton.dev/v1beta1_EventListener.json b/scheme/triggers.tekton.dev/v1beta1_EventListener.json index 4c88c42d..12e5a013 100644 --- a/scheme/triggers.tekton.dev/v1beta1_EventListener.json +++ b/scheme/triggers.tekton.dev/v1beta1_EventListener.json @@ -25,8 +25,14 @@ }, "Addressable": { "properties": { + "name": { + "type": "string" + }, "url": { "$ref": "#/definitions/URL" + }, + "CACerts": { + "type": "string" } }, "additionalProperties": false, @@ -195,6 +201,18 @@ "additionalProperties": false, "type": "object" }, + "ClaimSource": { + "properties": { + "resourceClaimName": { + "type": "string" + }, + "resourceClaimTemplateName": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Condition": { "required": [ "type", @@ -343,6 +361,13 @@ "resources": { "$ref": "#/definitions/ResourceRequirements" }, + "resizePolicy": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ContainerResizePolicy" + }, + "type": "array" + }, "volumeMounts": { "items": { "$schema": "http://json-schema.org/draft-04/schema#", @@ -421,6 +446,22 @@ "additionalProperties": false, "type": "object" }, + "ContainerResizePolicy": { + "required": [ + "resourceName", + "restartPolicy" + ], + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "CustomResource": { "properties": {}, "additionalProperties": false, @@ -483,8 +524,14 @@ "type": "string" }, "sizeLimit": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -593,6 +640,12 @@ "resources": { "$ref": "#/definitions/ResourceRequirements" }, + "resizePolicy": { + "items": { + "$ref": "#/definitions/ContainerResizePolicy" + }, + "type": "array" + }, "volumeMounts": { "items": { "$ref": "#/definitions/VolumeMount" @@ -757,6 +810,12 @@ "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Addressable" }, + "addresses": { + "items": { + "$ref": "#/definitions/Addressable" + }, + "type": "array" + }, "configuration": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/EventListenerConfig" @@ -1672,7 +1731,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1847,6 +1907,34 @@ "additionalProperties": false, "type": "object" }, + "PodResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "source": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ClaimSource" + } + }, + "additionalProperties": false, + "type": "object" + }, + "PodSchedulingGate": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "PodSecurityContext": { "properties": { "seLinuxOptions": { @@ -2032,7 +2120,14 @@ "overhead": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2053,6 +2148,20 @@ }, "hostUsers": { "type": "boolean" + }, + "schedulingGates": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PodSchedulingGate" + }, + "type": "array" + }, + "resourceClaims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PodResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2164,11 +2273,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -2234,6 +2338,18 @@ "additionalProperties": false, "type": "object" }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -2246,7 +2362,14 @@ "type": "string" }, "divisor": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -2257,7 +2380,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2265,10 +2395,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2677,7 +2821,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, @@ -2709,6 +2853,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "URL": { "required": [ "Scheme", @@ -2717,6 +2884,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -2742,6 +2910,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1beta1_EventListenerList.json b/scheme/triggers.tekton.dev/v1beta1_EventListenerList.json index d437011b..96beda3e 100644 --- a/scheme/triggers.tekton.dev/v1beta1_EventListenerList.json +++ b/scheme/triggers.tekton.dev/v1beta1_EventListenerList.json @@ -25,8 +25,14 @@ }, "Addressable": { "properties": { + "name": { + "type": "string" + }, "url": { "$ref": "#/definitions/URL" + }, + "CACerts": { + "type": "string" } }, "additionalProperties": false, @@ -195,6 +201,18 @@ "additionalProperties": false, "type": "object" }, + "ClaimSource": { + "properties": { + "resourceClaimName": { + "type": "string" + }, + "resourceClaimTemplateName": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "Condition": { "required": [ "type", @@ -343,6 +361,13 @@ "resources": { "$ref": "#/definitions/ResourceRequirements" }, + "resizePolicy": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ContainerResizePolicy" + }, + "type": "array" + }, "volumeMounts": { "items": { "$schema": "http://json-schema.org/draft-04/schema#", @@ -421,6 +446,22 @@ "additionalProperties": false, "type": "object" }, + "ContainerResizePolicy": { + "required": [ + "resourceName", + "restartPolicy" + ], + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "CustomResource": { "properties": {}, "additionalProperties": false, @@ -483,8 +524,14 @@ "type": "string" }, "sizeLimit": { - "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -593,6 +640,12 @@ "resources": { "$ref": "#/definitions/ResourceRequirements" }, + "resizePolicy": { + "items": { + "$ref": "#/definitions/ContainerResizePolicy" + }, + "type": "array" + }, "volumeMounts": { "items": { "$ref": "#/definitions/VolumeMount" @@ -783,6 +836,12 @@ "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/Addressable" }, + "addresses": { + "items": { + "$ref": "#/definitions/Addressable" + }, + "type": "array" + }, "configuration": { "$schema": "http://json-schema.org/draft-04/schema#", "$ref": "#/definitions/EventListenerConfig" @@ -1716,7 +1775,8 @@ "$ref": "#/definitions/TypedLocalObjectReference" }, "dataSourceRef": { - "$ref": "#/definitions/TypedLocalObjectReference" + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/TypedObjectReference" } }, "additionalProperties": false, @@ -1891,6 +1951,34 @@ "additionalProperties": false, "type": "object" }, + "PodResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "source": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ClaimSource" + } + }, + "additionalProperties": false, + "type": "object" + }, + "PodSchedulingGate": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "PodSecurityContext": { "properties": { "seLinuxOptions": { @@ -2076,7 +2164,14 @@ "overhead": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2097,6 +2192,20 @@ }, "hostUsers": { "type": "boolean" + }, + "schedulingGates": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PodSchedulingGate" + }, + "type": "array" + }, + "resourceClaims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/PodResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2208,11 +2317,6 @@ "additionalProperties": false, "type": "object" }, - "Quantity": { - "properties": {}, - "additionalProperties": false, - "type": "object" - }, "QuobyteVolumeSource": { "required": [ "registry", @@ -2278,6 +2382,18 @@ "additionalProperties": false, "type": "object" }, + "ResourceClaim": { + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "ResourceFieldSelector": { "required": [ "resource" @@ -2290,7 +2406,14 @@ "type": "string" }, "divisor": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "additionalProperties": false, @@ -2301,7 +2424,14 @@ "limits": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" @@ -2309,10 +2439,24 @@ "requests": { "patternProperties": { ".*": { - "$ref": "#/definitions/Quantity" + "oneOf": [ + { + "type": "string" + }, + { + "type": "number" + } + ] } }, "type": "object" + }, + "claims": { + "items": { + "$schema": "http://json-schema.org/draft-04/schema#", + "$ref": "#/definitions/ResourceClaim" + }, + "type": "array" } }, "additionalProperties": false, @@ -2721,7 +2865,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, @@ -2753,6 +2897,29 @@ "additionalProperties": false, "type": "object" }, + "TypedObjectReference": { + "required": [ + "apiGroup", + "kind", + "name" + ], + "properties": { + "apiGroup": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "type": "object" + }, "URL": { "required": [ "Scheme", @@ -2761,6 +2928,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -2786,6 +2954,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1beta1_Trigger.json b/scheme/triggers.tekton.dev/v1beta1_Trigger.json index 61efb3d2..6d7a1ef9 100644 --- a/scheme/triggers.tekton.dev/v1beta1_Trigger.json +++ b/scheme/triggers.tekton.dev/v1beta1_Trigger.json @@ -404,7 +404,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, @@ -424,6 +424,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -449,6 +450,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1beta1_TriggerList.json b/scheme/triggers.tekton.dev/v1beta1_TriggerList.json index 61efb3d2..6d7a1ef9 100644 --- a/scheme/triggers.tekton.dev/v1beta1_TriggerList.json +++ b/scheme/triggers.tekton.dev/v1beta1_TriggerList.json @@ -404,7 +404,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, @@ -424,6 +424,7 @@ "Host", "Path", "RawPath", + "OmitHost", "ForceQuery", "RawQuery", "Fragment", @@ -449,6 +450,9 @@ "RawPath": { "type": "string" }, + "OmitHost": { + "type": "boolean" + }, "ForceQuery": { "type": "boolean" }, diff --git a/scheme/triggers.tekton.dev/v1beta1_TriggerTemplate.json b/scheme/triggers.tekton.dev/v1beta1_TriggerTemplate.json index 385bf935..fdbbcec2 100644 --- a/scheme/triggers.tekton.dev/v1beta1_TriggerTemplate.json +++ b/scheme/triggers.tekton.dev/v1beta1_TriggerTemplate.json @@ -190,7 +190,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true, diff --git a/scheme/triggers.tekton.dev/v1beta1_TriggerTemplateList.json b/scheme/triggers.tekton.dev/v1beta1_TriggerTemplateList.json index d14995d9..47039c2e 100644 --- a/scheme/triggers.tekton.dev/v1beta1_TriggerTemplateList.json +++ b/scheme/triggers.tekton.dev/v1beta1_TriggerTemplateList.json @@ -234,7 +234,7 @@ }, "type": "array" }, - "resourcetemplates": { + "resourceTemplates": { "items": { "properties": {}, "additionalProperties": true,