diff --git a/config/prow-staging/cluster/prowjob_customresourcedefinition.yaml b/config/prow-staging/cluster/prowjob_customresourcedefinition.yaml index 0884e71f7961..069a4aafb002 100644 --- a/config/prow-staging/cluster/prowjob_customresourcedefinition.yaml +++ b/config/prow-staging/cluster/prowjob_customresourcedefinition.yaml @@ -12,89 +12,98 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: prowjobs.prow.k8s.io + annotations: + "api-approved.kubernetes.io": "https://github.com/kubernetes/test-infra/pull/8669" spec: group: prow.k8s.io - version: v1 names: kind: ProwJob singular: prowjob plural: prowjobs scope: Namespaced - validation: - openAPIV3Schema: - properties: - spec: - properties: - max_concurrency: - type: integer - minimum: 0 - type: - type: string - enum: - - "presubmit" - - "postsubmit" - - "periodic" - - "batch" - status: - properties: - state: - type: string - enum: - - "triggered" - - "pending" - - "success" - - "failure" - - "aborted" - - "error" - anyOf: - - not: - properties: - state: - type: string - enum: - - "success" - - "failure" - - "error" - - required: - - completionTime - additionalPrinterColumns: - - name: Job - type: string - description: The name of the job being run. - JSONPath: .spec.job - - name: BuildId - type: string - description: The ID of the job being run. - JSONPath: .status.build_id - - name: Type - type: string - description: The type of job being run. - JSONPath: .spec.type - - name: Org - type: string - description: The org for which the job is running. - JSONPath: .spec.refs.org - - name: Repo - type: string - description: The repo for which the job is running. - JSONPath: .spec.refs.repo - - name: Pulls - type: string - description: The pulls for which the job is running. - JSONPath: ".spec.refs.pulls[*].number" - - name: StartTime - type: date - description: When the job started running. - JSONPath: .status.startTime - - name: CompletionTime - type: date - description: When the job finished running. - JSONPath: .status.completionTime - - name: State - description: The state of the job. - type: string - JSONPath: .status.state + versions: + - name: v1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + max_concurrency: + type: integer + minimum: 0 + type: + type: string + enum: + - "presubmit" + - "postsubmit" + - "periodic" + - "batch" + status: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + state: + type: string + enum: + - "triggered" + - "pending" + - "success" + - "failure" + - "aborted" + - "error" + anyOf: + - not: + properties: + state: + enum: + - "success" + - "failure" + - "error" + - required: + - completionTime + additionalPrinterColumns: + - name: Job + type: string + description: The name of the job being run. + jsonPath: .spec.job + - name: BuildId + type: string + description: The ID of the job being run. + jsonPath: .status.build_id + - name: Type + type: string + description: The type of job being run. + jsonPath: .spec.type + - name: Org + type: string + description: The org for which the job is running. + jsonPath: .spec.refs.org + - name: Repo + type: string + description: The repo for which the job is running. + jsonPath: .spec.refs.repo + - name: Pulls + type: string + description: The pulls for which the job is running. + jsonPath: ".spec.refs.pulls[*].number" + - name: StartTime + type: date + description: When the job started running. + jsonPath: .status.startTime + - name: CompletionTime + type: date + description: When the job finished running. + jsonPath: .status.completionTime + - name: State + description: The state of the job. + type: string + jsonPath: .status.state diff --git a/config/prow/cluster/prowjob_customresourcedefinition.yaml b/config/prow/cluster/prowjob_customresourcedefinition.yaml index 6ba7b0fa548d..ca59bf5ea665 100644 --- a/config/prow/cluster/prowjob_customresourcedefinition.yaml +++ b/config/prow/cluster/prowjob_customresourcedefinition.yaml @@ -1,86 +1,95 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: prowjobs.prow.k8s.io + annotations: + "api-approved.kubernetes.io": "https://github.com/kubernetes/test-infra/pull/8669" spec: group: prow.k8s.io - version: v1 names: kind: ProwJob singular: prowjob plural: prowjobs scope: Namespaced - validation: - openAPIV3Schema: - properties: - spec: - properties: - max_concurrency: - type: integer - minimum: 0 - type: - type: string - enum: - - "presubmit" - - "postsubmit" - - "periodic" - - "batch" - status: - properties: - state: - type: string - enum: - - "triggered" - - "pending" - - "success" - - "failure" - - "aborted" - - "error" - anyOf: - - not: - properties: - state: - type: string - enum: - - "success" - - "failure" - - "error" - - required: - - completionTime - additionalPrinterColumns: - - name: Job - type: string - description: The name of the job being run. - JSONPath: .spec.job - - name: BuildId - type: string - description: The ID of the job being run. - JSONPath: .status.build_id - - name: Type - type: string - description: The type of job being run. - JSONPath: .spec.type - - name: Org - type: string - description: The org for which the job is running. - JSONPath: .spec.refs.org - - name: Repo - type: string - description: The repo for which the job is running. - JSONPath: .spec.refs.repo - - name: Pulls - type: string - description: The pulls for which the job is running. - JSONPath: ".spec.refs.pulls[*].number" - - name: StartTime - type: date - description: When the job started running. - JSONPath: .status.startTime - - name: CompletionTime - type: date - description: When the job finished running. - JSONPath: .status.completionTime - - name: State - description: The state of the job. - type: string - JSONPath: .status.state + versions: + - name: v1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + max_concurrency: + type: integer + minimum: 0 + type: + type: string + enum: + - "presubmit" + - "postsubmit" + - "periodic" + - "batch" + status: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + state: + type: string + enum: + - "triggered" + - "pending" + - "success" + - "failure" + - "aborted" + - "error" + anyOf: + - not: + properties: + state: + enum: + - "success" + - "failure" + - "error" + - required: + - completionTime + additionalPrinterColumns: + - name: Job + type: string + description: The name of the job being run. + jsonPath: .spec.job + - name: BuildId + type: string + description: The ID of the job being run. + jsonPath: .status.build_id + - name: Type + type: string + description: The type of job being run. + jsonPath: .spec.type + - name: Org + type: string + description: The org for which the job is running. + jsonPath: .spec.refs.org + - name: Repo + type: string + description: The repo for which the job is running. + jsonPath: .spec.refs.repo + - name: Pulls + type: string + description: The pulls for which the job is running. + jsonPath: ".spec.refs.pulls[*].number" + - name: StartTime + type: date + description: When the job started running. + jsonPath: .status.startTime + - name: CompletionTime + type: date + description: When the job finished running. + jsonPath: .status.completionTime + - name: State + description: The state of the job. + type: string + jsonPath: .status.state diff --git a/config/prow/cluster/starter-gcs.yaml b/config/prow/cluster/starter-gcs.yaml index 0d989313c276..89ee5bbc2e33 100644 --- a/config/prow/cluster/starter-gcs.yaml +++ b/config/prow/cluster/starter-gcs.yaml @@ -127,92 +127,101 @@ data: - image: alpine command: ["/bin/date"] --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: prowjobs.prow.k8s.io + annotations: + "api-approved.kubernetes.io": "https://github.com/kubernetes/test-infra/pull/8669" spec: group: prow.k8s.io - version: v1 names: kind: ProwJob singular: prowjob plural: prowjobs scope: Namespaced - validation: - openAPIV3Schema: - properties: - spec: - properties: - max_concurrency: - type: integer - minimum: 0 - type: - type: string - enum: - - "presubmit" - - "postsubmit" - - "periodic" - - "batch" - status: - properties: - state: - type: string - enum: - - "triggered" - - "pending" - - "success" - - "failure" - - "aborted" - - "error" - anyOf: - - not: - properties: - state: - type: string - enum: - - "success" - - "failure" - - "error" - - required: - - completionTime - additionalPrinterColumns: - - name: Job - type: string - description: The name of the job being run. - JSONPath: .spec.job - - name: BuildId - type: string - description: The ID of the job being run. - JSONPath: .status.build_id - - name: Type - type: string - description: The type of job being run. - JSONPath: .spec.type - - name: Org - type: string - description: The org for which the job is running. - JSONPath: .spec.refs.org - - name: Repo - type: string - description: The repo for which the job is running. - JSONPath: .spec.refs.repo - - name: Pulls - type: string - description: The pulls for which the job is running. - JSONPath: ".spec.refs.pulls[*].number" - - name: StartTime - type: date - description: When the job started running. - JSONPath: .status.startTime - - name: CompletionTime - type: date - description: When the job finished running. - JSONPath: .status.completionTime - - name: State - description: The state of the job. - type: string - JSONPath: .status.state + versions: + - name: v1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + max_concurrency: + type: integer + minimum: 0 + type: + type: string + enum: + - "presubmit" + - "postsubmit" + - "periodic" + - "batch" + status: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + state: + type: string + enum: + - "triggered" + - "pending" + - "success" + - "failure" + - "aborted" + - "error" + anyOf: + - not: + properties: + state: + enum: + - "success" + - "failure" + - "error" + - required: + - completionTime + additionalPrinterColumns: + - name: Job + type: string + description: The name of the job being run. + jsonPath: .spec.job + - name: BuildId + type: string + description: The ID of the job being run. + jsonPath: .status.build_id + - name: Type + type: string + description: The type of job being run. + jsonPath: .spec.type + - name: Org + type: string + description: The org for which the job is running. + jsonPath: .spec.refs.org + - name: Repo + type: string + description: The repo for which the job is running. + jsonPath: .spec.refs.repo + - name: Pulls + type: string + description: The pulls for which the job is running. + jsonPath: ".spec.refs.pulls[*].number" + - name: StartTime + type: date + description: When the job started running. + jsonPath: .status.startTime + - name: CompletionTime + type: date + description: When the job finished running. + jsonPath: .status.completionTime + - name: State + description: The state of the job. + type: string + jsonPath: .status.state --- apiVersion: apps/v1 kind: Deployment diff --git a/config/prow/cluster/starter-s3.yaml b/config/prow/cluster/starter-s3.yaml index 734856b563f2..173bf94bce07 100644 --- a/config/prow/cluster/starter-s3.yaml +++ b/config/prow/cluster/starter-s3.yaml @@ -127,92 +127,101 @@ data: - image: alpine command: ["/bin/date"] --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: prowjobs.prow.k8s.io + annotations: + "api-approved.kubernetes.io": "https://github.com/kubernetes/test-infra/pull/8669" spec: group: prow.k8s.io - version: v1 names: kind: ProwJob singular: prowjob plural: prowjobs scope: Namespaced - validation: - openAPIV3Schema: - properties: - spec: - properties: - max_concurrency: - type: integer - minimum: 0 - type: - type: string - enum: - - "presubmit" - - "postsubmit" - - "periodic" - - "batch" - status: - properties: - state: - type: string - enum: - - "triggered" - - "pending" - - "success" - - "failure" - - "aborted" - - "error" - anyOf: - - not: - properties: - state: - type: string - enum: - - "success" - - "failure" - - "error" - - required: - - completionTime - additionalPrinterColumns: - - name: Job - type: string - description: The name of the job being run. - JSONPath: .spec.job - - name: BuildId - type: string - description: The ID of the job being run. - JSONPath: .status.build_id - - name: Type - type: string - description: The type of job being run. - JSONPath: .spec.type - - name: Org - type: string - description: The org for which the job is running. - JSONPath: .spec.refs.org - - name: Repo - type: string - description: The repo for which the job is running. - JSONPath: .spec.refs.repo - - name: Pulls - type: string - description: The pulls for which the job is running. - JSONPath: ".spec.refs.pulls[*].number" - - name: StartTime - type: date - description: When the job started running. - JSONPath: .status.startTime - - name: CompletionTime - type: date - description: When the job finished running. - JSONPath: .status.completionTime - - name: State - description: The state of the job. - type: string - JSONPath: .status.state + versions: + - name: v1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + max_concurrency: + type: integer + minimum: 0 + type: + type: string + enum: + - "presubmit" + - "postsubmit" + - "periodic" + - "batch" + status: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + state: + type: string + enum: + - "triggered" + - "pending" + - "success" + - "failure" + - "aborted" + - "error" + anyOf: + - not: + properties: + state: + enum: + - "success" + - "failure" + - "error" + - required: + - completionTime + additionalPrinterColumns: + - name: Job + type: string + description: The name of the job being run. + jsonPath: .spec.job + - name: BuildId + type: string + description: The ID of the job being run. + jsonPath: .status.build_id + - name: Type + type: string + description: The type of job being run. + jsonPath: .spec.type + - name: Org + type: string + description: The org for which the job is running. + jsonPath: .spec.refs.org + - name: Repo + type: string + description: The repo for which the job is running. + jsonPath: .spec.refs.repo + - name: Pulls + type: string + description: The pulls for which the job is running. + jsonPath: ".spec.refs.pulls[*].number" + - name: StartTime + type: date + description: When the job started running. + jsonPath: .status.startTime + - name: CompletionTime + type: date + description: When the job finished running. + jsonPath: .status.completionTime + - name: State + description: The state of the job. + type: string + jsonPath: .status.state --- apiVersion: apps/v1 kind: Deployment diff --git a/prow/test/integration/prow/cluster/100_starter.yaml b/prow/test/integration/prow/cluster/100_starter.yaml index 6db20474d147..5a7920a5968b 100644 --- a/prow/test/integration/prow/cluster/100_starter.yaml +++ b/prow/test/integration/prow/cluster/100_starter.yaml @@ -19,89 +19,98 @@ metadata: stringData: config: "" --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: prowjobs.prow.k8s.io + annotations: + "api-approved.kubernetes.io": "https://github.com/kubernetes/test-infra/pull/8669" spec: group: prow.k8s.io - version: v1 names: kind: ProwJob singular: prowjob plural: prowjobs scope: Namespaced - validation: - openAPIV3Schema: - properties: - spec: - properties: - max_concurrency: - type: integer - minimum: 0 - type: - type: string - enum: - - "presubmit" - - "postsubmit" - - "periodic" - - "batch" - status: - properties: - state: - type: string - enum: - - "triggered" - - "pending" - - "success" - - "failure" - - "aborted" - - "error" - anyOf: - - not: - properties: - state: - type: string - enum: - - "success" - - "failure" - - "error" - - required: - - completionTime - additionalPrinterColumns: - - name: Job - type: string - description: The name of the job being run. - JSONPath: .spec.job - - name: BuildId - type: string - description: The ID of the job being run. - JSONPath: .status.build_id - - name: Type - type: string - description: The type of job being run. - JSONPath: .spec.type - - name: Org - type: string - description: The org for which the job is running. - JSONPath: .spec.refs.org - - name: Repo - type: string - description: The repo for which the job is running. - JSONPath: .spec.refs.repo - - name: Pulls - type: string - description: The pulls for which the job is running. - JSONPath: ".spec.refs.pulls[*].number" - - name: StartTime - type: date - description: When the job started running. - JSONPath: .status.startTime - - name: CompletionTime - type: date - description: When the job finished running. - JSONPath: .status.completionTime - - name: State - description: The state of the job. - type: string - JSONPath: .status.state + versions: + - name: v1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + max_concurrency: + type: integer + minimum: 0 + type: + type: string + enum: + - "presubmit" + - "postsubmit" + - "periodic" + - "batch" + status: + type: object + x-kubernetes-preserve-unknown-fields: true + properties: + state: + type: string + enum: + - "triggered" + - "pending" + - "success" + - "failure" + - "aborted" + - "error" + anyOf: + - not: + properties: + state: + enum: + - "success" + - "failure" + - "error" + - required: + - completionTime + additionalPrinterColumns: + - name: Job + type: string + description: The name of the job being run. + jsonPath: .spec.job + - name: BuildId + type: string + description: The ID of the job being run. + jsonPath: .status.build_id + - name: Type + type: string + description: The type of job being run. + jsonPath: .spec.type + - name: Org + type: string + description: The org for which the job is running. + jsonPath: .spec.refs.org + - name: Repo + type: string + description: The repo for which the job is running. + jsonPath: .spec.refs.repo + - name: Pulls + type: string + description: The pulls for which the job is running. + jsonPath: ".spec.refs.pulls[*].number" + - name: StartTime + type: date + description: When the job started running. + jsonPath: .status.startTime + - name: CompletionTime + type: date + description: When the job finished running. + jsonPath: .status.completionTime + - name: State + description: The state of the job. + type: string + jsonPath: .status.state