Skip to content

Commit

Permalink
Fix #1710: auto-generate CRD specification on "generate" task (#1714)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolaferraro
nicolaferraro authored Sep 25, 2020
1 parent 25b4227 commit ea24821
Show file tree
Hide file tree
Showing 26 changed files with 3,913 additions and 1,198 deletions.
449 changes: 231 additions & 218 deletions deploy/crd-build.yaml
View file

Large diffs are not rendered by default.

90 changes: 46 additions & 44 deletions deploy/crd-camel-catalog.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# ---------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
Expand All @@ -19,30 +18,33 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: camelcatalogs.camel.apache.org
labels:
app: "camel-k"
annotations:
controller-gen.kubebuilder.io/version: v0.0.0-20200528125929-5c0c6ae3b64b
creationTimestamp: null
name: camelcatalogs.camel.apache.org
spec:
additionalPrinterColumns:
- JSONPath: .spec.runtime.version
description: The Camel K Runtime version
name: Runtime Version
type: string
- JSONPath: .spec.runtime.provider
description: The Camel K Runtime provider
name: Runtime Provider
type: string
- JSONPath: .spec.runtime.version
description: The Camel K Runtime version
name: Runtime Version
type: string
- JSONPath: .spec.runtime.provider
description: The Camel K Runtime provider
name: Runtime Provider
type: string
group: camel.apache.org
names:
categories:
- kamel
- camel
kind: CamelCatalog
listKind: CamelCatalogList
plural: camelcatalogs
shortNames:
- cc
- cc
singular: camelcatalog
categories:
- kamel
- camel
scope: Namespaced
subresources:
status: {}
Expand Down Expand Up @@ -90,17 +92,17 @@ spec:
groupId:
type: string
required:
- artifactId
- groupId
- artifactId
- groupId
type: object
type: array
groupId:
type: string
version:
type: string
required:
- artifactId
- groupId
- artifactId
- groupId
type: object
type: array
exclusions:
Expand All @@ -112,8 +114,8 @@ spec:
groupId:
type: string
required:
- artifactId
- groupId
- artifactId
- groupId
type: object
type: array
groupId:
Expand All @@ -137,16 +139,16 @@ spec:
passive:
type: boolean
required:
- http
- id
- passive
- http
- id
- passive
type: object
type: array
version:
type: string
required:
- artifactId
- groupId
- artifactId
- groupId
type: object
type: object
loaders:
Expand All @@ -166,8 +168,8 @@ spec:
version:
type: string
required:
- artifactId
- groupId
- artifactId
- groupId
type: object
type: array
groupId:
Expand All @@ -179,8 +181,8 @@ spec:
version:
type: string
required:
- artifactId
- groupId
- artifactId
- groupId
type: object
type: object
runtime:
Expand All @@ -203,16 +205,16 @@ spec:
version:
type: string
required:
- artifactId
- groupId
- artifactId
- groupId
type: object
type: array
metadata:
additionalProperties:
type: string
type: object
required:
- dependencies
- dependencies
type: object
type: object
dependencies:
Expand All @@ -226,8 +228,8 @@ spec:
version:
type: string
required:
- artifactId
- groupId
- artifactId
- groupId
type: object
type: array
metadata:
Expand All @@ -240,22 +242,22 @@ spec:
version:
type: string
required:
- applicationClass
- dependencies
- provider
- version
- applicationClass
- dependencies
- provider
- version
type: object
required:
- artifacts
- loaders
- runtime
- artifacts
- loaders
- runtime
type: object
status:
description: CamelCatalogStatus defines the observed state of CamelCatalog
type: object
type: object
version: v1
versions:
- name: v1
served: true
storage: true
- name: v1
served: true
storage: true
69 changes: 39 additions & 30 deletions deploy/crd-integration-kit.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,37 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: integrationkits.camel.apache.org
labels:
app: "camel-k"
annotations:
controller-gen.kubebuilder.io/version: v0.0.0-20200528125929-5c0c6ae3b64b
creationTimestamp: null
name: integrationkits.camel.apache.org
spec:
additionalPrinterColumns:
- JSONPath: .status.phase
description: The integration kit phase
name: Phase
type: string
- JSONPath: .metadata.labels.camel\.apache\.org\/kit\.type
description: The integration kit type
name: Type
type: string
- JSONPath: .status.image
description: The integration kit image
name: Image
type: string
- JSONPath: .status.phase
description: The integration kit phase
name: Phase
type: string
- JSONPath: .metadata.labels.camel\.apache\.org\/kit\.type
description: The integration kit type
name: Type
type: string
- JSONPath: .status.image
description: The integration kit image
name: Image
type: string
group: camel.apache.org
names:
categories:
- kamel
- camel
kind: IntegrationKit
listKind: IntegrationKitList
plural: integrationkits
shortNames:
- ik
- ik
singular: integrationkit
categories:
- kamel
- camel
scope: Namespaced
subresources:
status: {}
Expand Down Expand Up @@ -77,8 +80,8 @@ spec:
value:
type: string
required:
- type
- value
- type
- value
type: object
type: array
dependencies:
Expand All @@ -97,6 +100,12 @@ spec:
type: array
traits:
additionalProperties:
description: A TraitSpec contains the configuration of a trait
properties:
configuration:
type: object
required:
- configuration
type: object
type: object
type: object
Expand All @@ -116,7 +125,7 @@ spec:
target:
type: string
required:
- id
- id
type: object
type: array
baseImage:
Expand Down Expand Up @@ -149,8 +158,8 @@ spec:
description: Type of integration condition.
type: string
required:
- status
- type
- status
- type
type: object
type: array
digest:
Expand All @@ -171,16 +180,16 @@ spec:
format: date-time
type: string
required:
- attempt
- attemptMax
- attempt
- attemptMax
type: object
time:
format: date-time
type: string
required:
- reason
- recovery
- time
- reason
- recovery
- time
type: object
image:
type: string
Expand All @@ -200,6 +209,6 @@ spec:
type: object
version: v1
versions:
- name: v1
served: true
storage: true
- name: v1
served: true
storage: true
Loading

0 comments on commit ea24821

Please sign in to comment.