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
The following commit(s) were added to refs/heads/master by this push:
new 8cec90b fix(OLM): Remove integration context leftovers from OLM
bundles
8cec90b is described below
commit 8cec90b3ca6b11710b2f51687d94ffcad4f4caa0
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Mon Aug 19 15:42:49 2019 +0200
fix(OLM): Remove integration context leftovers from OLM bundles
---
.../camel-k.v1.0.0-M1.clusterserviceversion.yaml | 10 +++++-----
...gration-context.yaml => crd-integration-kit.yaml} | 20 ++++++++++----------
...l-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml | 10 +++++-----
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M1/camel-k.v1.0.0-M1.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M1/camel-k.v1.0.0-M1.clusterserviceversion.yaml
index eda97ca..87b43d9 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-M1/camel-k.v1.0.0-M1.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-M1/camel-k.v1.0.0-M1.clusterserviceversion.yaml
@@ -27,7 +27,7 @@ metadata:
},
{
"apiVersion": "camel.apache.org/v1alpha1",
- "kind": "IntegrationContext",
+ "kind": "IntegrationKit",
"metadata": {
"name": "example"
}
@@ -76,10 +76,10 @@ spec:
kind: Integration
name: integrations.camel.apache.org
version: v1alpha1
- - description: A Camel K integration context
- displayName: Integration Context
- kind: IntegrationContext
- name: integrationcontexts.camel.apache.org
+ - description: A Camel K integration kit
+ displayName: Integration Kit
+ kind: IntegrationKit
+ name: integrationkits.camel.apache.org
version: v1alpha1
- description: A Camel K integration platform
displayName: Integration Platform
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-context.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-kit.yaml
similarity index 77%
rename from deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-context.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-kit.yaml
index ae67d41..04f3e81 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-context.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-kit.yaml
@@ -18,7 +18,7 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: integrationcontexts.camel.apache.org
+ name: integrationkits.camel.apache.org
labels:
app: "camel-k"
spec:
@@ -28,22 +28,22 @@ spec:
subresources:
status: {}
names:
- kind: IntegrationContext
- listKind: IntegrationContextList
- plural: integrationcontexts
- singular: integrationcontext
+ kind: IntegrationKit
+ listKind: IntegrationKitList
+ plural: integrationkits
+ singular: integrationkit
shortNames:
- - ictx
+ - ik
additionalPrinterColumns:
- name: Phase
type: string
- description: The IntegrationContext phase
+ description: The IntegrationKit phase
JSONPath: .status.phase
- name: Type
type: string
- description: The IntegrationContext type
- JSONPath: .metadata.labels.camel\.apache\.org\/context\.type
+ description: The IntegrationKit type
+ JSONPath: .metadata.labels.camel\.apache\.org\/kit\.type
- name: Image
type: string
- description: The IntegrationContext image
+ description: The IntegrationKit image
JSONPath: .status.image
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml
index 2b5dbbe..a618210 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml
@@ -27,7 +27,7 @@ metadata:
},
{
"apiVersion": "camel.apache.org/v1alpha1",
- "kind": "IntegrationContext",
+ "kind": "IntegrationKit",
"metadata": {
"name": "example"
}
@@ -76,10 +76,10 @@ spec:
kind: Integration
name: integrations.camel.apache.org
version: v1alpha1
- - description: A Camel K integration context
- displayName: Integration Context
- kind: IntegrationContext
- name: integrationcontexts.camel.apache.org
+ - description: A Camel K integration kit
+ displayName: Integration Kit
+ kind: IntegrationKit
+ name: integrationkits.camel.apache.org
version: v1alpha1
- description: A Camel K integration platform
displayName: Integration Platform
