You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2020/07/01 07:08:15 UTC
[camel-k] 08/24: chore(api): Upgrade CamelCatalog CRD to
apiextensions.k8s.io/v1
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e85ac05f1dc270cb6534e85aa2cf4e8215a26989
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Thu Jun 11 10:58:06 2020 +0200
chore(api): Upgrade CamelCatalog CRD to apiextensions.k8s.io/v1
---
deploy/crd-camel-catalog.yaml | 224 +++++++++++++++++++++++++++++---
deploy/resources.go | 4 +-
pkg/apis/camel/v1/camelcatalog_types.go | 8 +-
3 files changed, 211 insertions(+), 25 deletions(-)
diff --git a/deploy/crd-camel-catalog.yaml b/deploy/crd-camel-catalog.yaml
index 6b27319..e7a829d 100644
--- a/deploy/crd-camel-catalog.yaml
+++ b/deploy/crd-camel-catalog.yaml
@@ -1,3 +1,4 @@
+
# ---------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +16,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: camelcatalogs.camel.apache.org
@@ -27,27 +28,208 @@ spec:
kind: CamelCatalog
listKind: CamelCatalogList
plural: camelcatalogs
- singular: camelcatalog
shortNames:
- cc
+ singular: camelcatalog
scope: Namespaced
- version: v1
versions:
- - name: v1
- served: true
- storage: true
- - name: v1alpha1
- served: true
- storage: false
- subresources:
- status: {}
- additionalPrinterColumns:
- - name: Runtime Version
- type: string
- description: The Camel K Runtime version
- JSONPath: .spec.runtime.version
- - name: Runtime Provider
- type: string
- description: The Camel K Runtime provider
- JSONPath: .spec.runtime.provider
-
+ - additionalPrinterColumns:
+ - description: The Camel K Runtime version
+ jsonPath: .spec.runtime.version
+ name: Runtime Version
+ type: string
+ - description: The Camel K Runtime provider
+ jsonPath: .spec.runtime.provider
+ name: Runtime Provider
+ type: string
+ name: v1
+ schema:
+ openAPIV3Schema:
+ description: CamelCatalog is the Schema for the camelcatalogs API
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: CamelCatalogSpec defines the desired state of CamelCatalog
+ properties:
+ artifacts:
+ additionalProperties:
+ description: CamelArtifact --
+ properties:
+ artifactId:
+ type: string
+ dataformats:
+ items:
+ type: string
+ type: array
+ dependencies:
+ items: {}
+ type: array
+ exclusions:
+ items:
+ description: CamelArtifactExclusion --
+ properties:
+ artifactId:
+ type: string
+ groupId:
+ type: string
+ required:
+ - artifactId
+ - groupId
+ type: object
+ type: array
+ groupId:
+ type: string
+ javaTypes:
+ items:
+ type: string
+ type: array
+ languages:
+ items:
+ type: string
+ type: array
+ schemes:
+ items:
+ description: CamelScheme --
+ properties:
+ http:
+ type: boolean
+ id:
+ type: string
+ passive:
+ type: boolean
+ required:
+ - http
+ - id
+ - passive
+ type: object
+ type: array
+ version:
+ type: string
+ required:
+ - artifactId
+ - groupId
+ type: object
+ type: object
+ loaders:
+ additionalProperties:
+ description: CamelLoader --
+ properties:
+ artifactId:
+ type: string
+ dependencies:
+ items:
+ description: MavenArtifact --
+ properties:
+ artifactId:
+ type: string
+ groupId:
+ type: string
+ version:
+ type: string
+ required:
+ - artifactId
+ - groupId
+ type: object
+ type: array
+ groupId:
+ type: string
+ languages:
+ items:
+ type: string
+ type: array
+ version:
+ type: string
+ required:
+ - artifactId
+ - groupId
+ type: object
+ type: object
+ runtime:
+ description: RuntimeSpec --
+ properties:
+ applicationClass:
+ type: string
+ capabilities:
+ additionalProperties:
+ description: Capability --
+ properties:
+ dependencies:
+ items:
+ description: MavenArtifact --
+ properties:
+ artifactId:
+ type: string
+ groupId:
+ type: string
+ version:
+ type: string
+ required:
+ - artifactId
+ - groupId
+ type: object
+ type: array
+ metadata:
+ additionalProperties:
+ type: string
+ type: object
+ required:
+ - dependencies
+ type: object
+ type: object
+ dependencies:
+ items:
+ description: MavenArtifact --
+ properties:
+ artifactId:
+ type: string
+ groupId:
+ type: string
+ version:
+ type: string
+ required:
+ - artifactId
+ - groupId
+ type: object
+ type: array
+ metadata:
+ additionalProperties:
+ type: string
+ type: object
+ provider:
+ description: RuntimeProvider --
+ type: string
+ version:
+ type: string
+ required:
+ - applicationClass
+ - dependencies
+ - provider
+ - version
+ type: object
+ required:
+ - artifacts
+ - loaders
+ - runtime
+ type: object
+ status:
+ description: CamelCatalogStatus defines the observed state of CamelCatalog
+ type: object
+ type: object
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ - name: v1alpha1
+ served: true
+ storage: false
diff --git a/deploy/resources.go b/deploy/resources.go
index 60325e1..5d9898b 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -119,9 +119,9 @@ var assets = func() http.FileSystem {
"/crd-camel-catalog.yaml": &vfsgen۰CompressedFileInfo{
name: "crd-camel-catalog.yaml",
modTime: time.Time{},
- uncompressedSize: 1740,
+ uncompressedSize: 8989,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\xc1\x6e\xe3\x36\x10\xbd\xf3\x2b\x1e\xac\xcb\x2e\x90\x28\x4d\x4f\x85\x7b\x72\x9d\x04\x75\x13\xd8\x41\xe4\xed\x62\x8f\x63\x69\x2c\x0d\x42\x91\x2c\x49\xd9\x09\x8a\xfe\x7b\x41\x5a\x4e\xec\x5d\x14\x3d\xec\xea\x46\xce\x9b\x99\xf7\xe6\x8d\x58\xe0\xf2\xc7\x7d\xaa\xc0\x83\xd4\x6c\x02\x37\x88\x16\xb1\x63\xcc\x1c\xd5\x1d\xa3\xb2\xdb\xb8\x27\xcf\xb8\xb3\x83\x69\x28\x8a\x35\xf8\x30\xab\xee\x3e\x62\x30\x0d\x7b\x58\xc3\xb0\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xe4\x59\x4f\x93\xda\xb8\x12\xbf\xfb\x53\x74\x0d\x87\x24\x55\x63\xf3\xf2\xde\xe5\x15\xef\xc4\x23\x33\xb5\x54\x26\xcc\xd4\x40\x92\xca\xb1\xb1\x1b\xa3\x8c\x2d\x79\x25\x19\x86\xdd\xda\xef\xbe\x25\xd9\x06\x1b\x63\x2c\x36\x93\x4a\x6a\x57\x37\xac\x56\xf7\xaf\xff\xfd\x5a\xd8\xde\x00\xfc\x97\x5b\xde\x00\xee\x58\x48\x5c\x51\x04\x5a\x80\x5e\x13\x8c\x33\x0c\xd7\x04\x73\xb1\xd2\x5b\x94\x04\xb7\x22\xe7\x11\x6a\x26\x38\xbc\x1e\xcf\x [...]
},
"/crd-integration-kit.yaml": &vfsgen۰CompressedFileInfo{
name: "crd-integration-kit.yaml",
diff --git a/pkg/apis/camel/v1/camelcatalog_types.go b/pkg/apis/camel/v1/camelcatalog_types.go
index 6bad16a..35aa3c8 100644
--- a/pkg/apis/camel/v1/camelcatalog_types.go
+++ b/pkg/apis/camel/v1/camelcatalog_types.go
@@ -69,10 +69,14 @@ type CamelCatalogStatus struct {
}
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// CamelCatalog is the Schema for the camelcatalogs API
// +k8s:openapi-gen=true
// +genclient
+// +kubebuilder:resource:path=camelcatalogs,scope=Namespaced,shortName=cc
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Runtime Version",type=string,JSONPath=`.spec.runtime.version`,description="The Camel K Runtime version"
+// +kubebuilder:printcolumn:name="Runtime Provider",type=string,JSONPath=`.spec.runtime.provider`,description="The Camel K Runtime provider"
+
+// CamelCatalog is the Schema for the camelcatalogs API
type CamelCatalog struct {
metav1.TypeMeta `json:",inline" yaml:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`