This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 134d8448e106772c35f26204ee4d2b6096c3ea52
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Thu Jun 6 12:26:44 2019 +0200
Fix #703: add CRDs to manifest
---
.../camel-k/0.3.4-SNAPSHOT/crd-build.yaml | 37 ++++++++++++++++++++++
.../camel-k/0.3.4-SNAPSHOT/crd-camel-catalog.yaml | 25 +++++++++++++++
.../0.3.4-SNAPSHOT/crd-integration-context.yaml | 32 +++++++++++++++++++
.../0.3.4-SNAPSHOT/crd-integration-platform.yaml | 24 ++++++++++++++
.../camel-k/0.3.4-SNAPSHOT/crd-integration.yaml | 28 ++++++++++++++++
script/Makefile | 2 +-
script/build_olm.sh | 18 +++++++++++
7 files changed, 165 insertions(+), 1 deletion(-)
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml
b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml
new file mode 100644
index 0000000..9459516
--- /dev/null
+++ b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-build.yaml
@@ -0,0 +1,37 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: builds.camel.apache.org
+ labels:
+ app: "camel-k"
+spec:
+ group: camel.apache.org
+ scope: Namespaced
+ version: v1alpha1
+ names:
+ kind: Build
+ listKind: BuildList
+ plural: builds
+ singular: build
+ subresources:
+ status: {}
+ additionalPrinterColumns:
+ - name: Phase
+ type: string
+ description: The build phase
+ JSONPath: .status.phase
+ - name: Age
+ type: date
+ description: The time at which the build was last (re-)started
+ JSONPath: .status.startedAt
+ - name: Duration
+ type: string
+ # Change when CRD uses OpenAPI spec v3
+ # https://github.com/OAI/OpenAPI-Specification/issues/845
+ # format: duration
+ description: The build last execution duration
+ JSONPath: .status.duration
+ - name: Attempts
+ type: integer
+ description: The number of execution attempts
+ JSONPath: .status.failure.recovery.attempt
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-camel-catalog.yaml
b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-camel-catalog.yaml
new file mode 100644
index 0000000..ee84510
--- /dev/null
+++ b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-camel-catalog.yaml
@@ -0,0 +1,25 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: camelcatalogs.camel.apache.org
+ labels:
+ app: "camel-k"
+spec:
+ group: camel.apache.org
+ names:
+ kind: CamelCatalog
+ listKind: CamelCatalogList
+ plural: camelcatalogs
+ singular: camelcatalog
+ shortNames:
+ - cc
+ scope: Namespaced
+ version: v1alpha1
+ subresources:
+ status: {}
+ additionalPrinterColumns:
+ - name: Version
+ type: string
+ description: The Catalog version
+ JSONPath: .spec.version
+
diff --git
a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-context.yaml
b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-context.yaml
new file mode 100644
index 0000000..a940628
--- /dev/null
+++ b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-context.yaml
@@ -0,0 +1,32 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: integrationcontexts.camel.apache.org
+ labels:
+ app: "camel-k"
+spec:
+ group: camel.apache.org
+ scope: Namespaced
+ version: v1alpha1
+ subresources:
+ status: {}
+ names:
+ kind: IntegrationContext
+ listKind: IntegrationContextList
+ plural: integrationcontexts
+ singular: integrationcontext
+ shortNames:
+ - ictx
+ additionalPrinterColumns:
+ - name: Phase
+ type: string
+ description: The IntegrationContext phase
+ JSONPath: .status.phase
+ - name: Type
+ type: string
+ description: The IntegrationContext type
+ JSONPath: .metadata.labels.camel\.apache\.org\/context\.type
+ - name: Image
+ type: string
+ description: The IntegrationContext image
+ JSONPath: .status.image
diff --git
a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-platform.yaml
b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-platform.yaml
new file mode 100644
index 0000000..868831d
--- /dev/null
+++ b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration-platform.yaml
@@ -0,0 +1,24 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: integrationplatforms.camel.apache.org
+ labels:
+ app: "camel-k"
+spec:
+ group: camel.apache.org
+ scope: Namespaced
+ version: v1alpha1
+ subresources:
+ status: {}
+ names:
+ kind: IntegrationPlatform
+ listKind: IntegrationPlatformList
+ plural: integrationplatforms
+ singular: integrationplatform
+ shortNames:
+ - ip
+ additionalPrinterColumns:
+ - name: Phase
+ type: string
+ description: The IntegrationPlatform phase
+ JSONPath: .status.phase
diff --git a/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration.yaml
b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration.yaml
new file mode 100644
index 0000000..e6e2657
--- /dev/null
+++ b/deploy/olm-catalog/camel-k/0.3.4-SNAPSHOT/crd-integration.yaml
@@ -0,0 +1,28 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: integrations.camel.apache.org
+ labels:
+ app: "camel-k"
+spec:
+ group: camel.apache.org
+ scope: Namespaced
+ version: v1alpha1
+ subresources:
+ status: {}
+ names:
+ kind: Integration
+ listKind: IntegrationList
+ plural: integrations
+ singular: integration
+ shortNames:
+ - it
+ additionalPrinterColumns:
+ - name: Phase
+ type: string
+ description: The Integration phase
+ JSONPath: .status.phase
+ - name: Context
+ type: string
+ description: The IntegrationContext to use
+ JSONPath: .status.context
diff --git a/script/Makefile b/script/Makefile
index 030b4bb..5c6b51c 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -115,7 +115,7 @@ build-resources:
go run cmd/util/json-schema-gen/jsonschemagen.go
--out=./assets/json-schema
build-olm:
- operator-sdk olm-catalog gen-csv --csv-version $(VERSION) --csv-config
deploy/olm-catalog/csv-config.yaml --update-crds
+ ./script/build_olm.sh $(VERSION)
build-compile-integration-tests:
go test -c -tags=integration ./test/*.go
diff --git a/script/build_olm.sh b/script/build_olm.sh
new file mode 100755
index 0000000..44719e9
--- /dev/null
+++ b/script/build_olm.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+location=$(dirname $0)
+olm_catalog=${location}/../deploy/olm-catalog
+
+if [ "$#" -ne 1 ]; then
+ echo "usage: $0 version"
+ exit 1
+fi
+
+version=$1
+
+cd $location/..
+
+operator-sdk olm-catalog gen-csv --csv-version ${version} --csv-config
deploy/olm-catalog/csv-config.yaml --update-crds
+
+rm $olm_catalog/camel-k/${version}/crd-*.yaml
+cp $location/../deploy/crd-*.yaml $olm_catalog/camel-k/${version}/
