This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f3b01def1c665bf2151ce8042edaa764c5abebfd
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Fri Jul 26 03:09:47 2019 +0200
chore(release): bump version to 1.0.0-M2-SNAPSHOT
---
.../camel-k.v1.0.0-M1.clusterserviceversion.yaml} | 10 +++++-----
.../{1.0.0-M1-SNAPSHOT => 1.0.0-M1}/crd-build.yaml | 0
.../crd-camel-catalog.yaml | 0
.../crd-integration-context.yaml | 0
.../crd-integration-platform.yaml | 0
.../crd-integration.yaml | 0
...-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml} | 14 +++++++-------
.../crd-build.yaml | 0
.../crd-camel-catalog.yaml | 0
.../crd-integration-kit.yaml} | 20 ++++++++++----------
.../crd-integration-platform.yaml | 0
.../crd-integration.yaml | 6 +++---
deploy/olm-catalog/camel-k/camel-k.package.yaml | 2 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 2 +-
pkg/util/defaults/defaults.go | 4 ++--
script/Makefile | 4 ++--
script/build_olm.sh | 2 +-
17 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M1/camel-k.v1.0.0-M1.clusterserviceversion.yaml
similarity index 97%
copy from
deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
copy to
deploy/olm-catalog/camel-k/1.0.0-M1/camel-k.v1.0.0-M1.clusterserviceversion.yaml
index 62ef228..eda97ca 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-M1/camel-k.v1.0.0-M1.clusterserviceversion.yaml
@@ -49,13 +49,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.0.0-M1-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.0.0-M1
createdAt: "2019-05-06T16:45:00Z"
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes,
with serverless superpowers.
repository: https://github.com/apache/camel-k
support: Camel
- name: camel-k-operator.v1.0.0-M1-SNAPSHOT
+ name: camel-k-operator.v1.0.0-M1
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -155,7 +155,7 @@ spec:
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
- fieldPath: metadata.namespace
+ fieldPath: metadata.annotations['olm.targetNamespaces']
- name: OPERATOR_NAME
value: camel-k
- name: POD_NAME
@@ -166,7 +166,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:1.0.0-M1-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M1
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -379,4 +379,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-M1-SNAPSHOT
+ version: 1.0.0-M1
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-build.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M1/crd-build.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-build.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-M1/crd-build.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-camel-catalog.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M1/crd-camel-catalog.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-camel-catalog.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-M1/crd-camel-catalog.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-context.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-context.yaml
similarity index 100%
copy from
deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-context.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-context.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-platform.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-platform.yaml
similarity index 100%
copy from
deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-platform.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-M1/crd-integration.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml
similarity index 97%
rename from
deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
rename to
deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml
index 62ef228..2b5dbbe 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/camel-k.v1.0.0-M1-SNAPSHOT.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-M2-SNAPSHOT.clusterserviceversion.yaml
@@ -49,13 +49,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.0.0-M1-SNAPSHOT
- createdAt: "2019-05-06T16:45:00Z"
+ containerImage: docker.io/apache/camel-k:1.0.0-M2-SNAPSHOT
+ createdAt: "2019-07-26T02:45:00Z"
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes,
with serverless superpowers.
repository: https://github.com/apache/camel-k
support: Camel
- name: camel-k-operator.v1.0.0-M1-SNAPSHOT
+ name: camel-k-operator.v1.0.0-M2-SNAPSHOT
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -155,7 +155,7 @@ spec:
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
- fieldPath: metadata.namespace
+ fieldPath: metadata.annotations['olm.targetNamespaces']
- name: OPERATOR_NAME
value: camel-k
- name: POD_NAME
@@ -166,7 +166,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:1.0.0-M1-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M2-SNAPSHOT
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -375,8 +375,8 @@ spec:
minKubeVersion: 1.11.0
provider:
name: The Apache Software Foundation
- replaces: camel-k-operator.v0.3.4
+ replaces: camel-k-operator.v1.0.0-M1
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-M1-SNAPSHOT
+ version: 1.0.0-M2-SNAPSHOT
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-build.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-build.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-build.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-build.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-camel-catalog.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-camel-catalog.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-camel-catalog.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-camel-catalog.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-context.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration-kit.yaml
similarity index 77%
rename from
deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-context.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration-kit.yaml
index ae67d41..04f3e81 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-context.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/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-M1-SNAPSHOT/crd-integration-platform.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration-platform.yaml
similarity index 100%
rename from
deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration-platform.yaml
rename to
deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration.yaml
b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration.yaml
similarity index 93%
rename from deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration.yaml
index 68d89f7..0b0f905 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-M1-SNAPSHOT/crd-integration.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration.yaml
@@ -39,7 +39,7 @@ spec:
type: string
description: The Integration phase
JSONPath: .status.phase
- - name: Context
+ - name: Kit
type: string
- description: The IntegrationContext to use
- JSONPath: .status.context
+ description: The IntegrationKit to use
+ JSONPath: .status.kit
diff --git a/deploy/olm-catalog/camel-k/camel-k.package.yaml
b/deploy/olm-catalog/camel-k/camel-k.package.yaml
index 1420dc7..b6f1016 100644
--- a/deploy/olm-catalog/camel-k/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k/camel-k.package.yaml
@@ -18,4 +18,4 @@
packageName: camel-k
channels:
- name: alpha
- currentCSV: camel-k-operator.v1.0.0-M1-SNAPSHOT
+ currentCSV: camel-k-operator.v1.0.0-M2-SNAPSHOT
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index 5f31fa6..e0298b8 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -1,6 +1,6 @@
// +build !ignore_autogenerated
-// Code generated by deepcopy-gen. DO NOT EDIT.
+// Code generated by operator-sdk. DO NOT EDIT.
package v1alpha1
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 2c9ebbf..a4a2605 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -22,13 +22,13 @@ package defaults
const (
// Version --
- Version = "1.0.0-M1-SNAPSHOT"
+ Version = "1.0.0-M2-SNAPSHOT"
// CamelVersionConstraint --
CamelVersionConstraint = ">=3.0.0-M4"
// RuntimeVersion --
- RuntimeVersion = "1.0.0-SNAPSHOT"
+ RuntimeVersion = "1.0.0"
// BaseImage --
BaseImage = "fabric8/s2i-java:3.0-java8"
diff --git a/script/Makefile b/script/Makefile
index 4ddbd5a..55a4c0f 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -14,8 +14,8 @@
# limitations under the License.
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION := 1.0.0-M1-SNAPSHOT
-RUNTIME_VERSION := 1.0.0-SNAPSHOT
+VERSION := 1.0.0-M2-SNAPSHOT
+RUNTIME_VERSION := 1.0.0
CAMEL_VERSION := 3.0.0-M4
CAMEL_VERSION_CONSTRAINT := >=3.0.0-M4
BASE_IMAGE := fabric8/s2i-java:3.0-java8
diff --git a/script/build_olm.sh b/script/build_olm.sh
index adc7889..03cd5f5 100755
--- a/script/build_olm.sh
+++ b/script/build_olm.sh
@@ -29,5 +29,5 @@ 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
+rm $olm_catalog/camel-k/${version}/crd-*.yaml || true
cp $location/../deploy/crd-*.yaml $olm_catalog/camel-k/${version}/
