You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2019/10/05 09:51:53 UTC
[camel-k] 01/04: fix #944: prepare release
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to tag 1.0.0-M2
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 956735d81ff50d47c408b0cfea64981f433013fa
Author: nferraro <ni...@gmail.com>
AuthorDate: Sat Oct 5 10:43:49 2019 +0200
fix #944: prepare release
---
cmd/manager | 1 +
...-M4.yaml => camel-catalog-3.0.0-RC1-1.0.4.yaml} | 125 ++++++++++----------
.../camel-k.v1.0.0-M2.clusterserviceversion.yaml} | 9 +-
.../{1.0.0-M2-SNAPSHOT => 1.0.0-M2}/crd-build.yaml | 0
.../crd-camel-catalog.yaml | 0
.../crd-integration-kit.yaml | 0
.../crd-integration-platform.yaml | 0
.../crd-integration.yaml | 11 +-
....v1.0.0-m3-SNAPSHOT.clusterserviceversion.yaml} | 11 +-
.../crd-integration.yaml | 0
deploy/olm-catalog/camel-k/camel-k.package.yaml | 2 +-
deploy/resources.go | 127 +++++++++++----------
e2e/test_staging_hooks.go | 6 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 5 +
pkg/util/defaults/defaults.go | 6 +-
pkg/util/test/catalog_test.go | 2 +-
script/Makefile | 8 +-
script/build_catalog.sh | 1 +
script/build_olm.sh | 2 +-
19 files changed, 171 insertions(+), 145 deletions(-)
diff --git a/cmd/manager b/cmd/manager
new file mode 120000
index 0000000..6a489e0
--- /dev/null
+++ b/cmd/manager
@@ -0,0 +1 @@
+/home/nferraro/gopaths/camel-k/src/github.com/apache/camel-k/cmd/kamel
\ No newline at end of file
diff --git a/deploy/camel-catalog-3.0.0-M4.yaml b/deploy/camel-catalog-3.0.0-RC1-1.0.4.yaml
similarity index 97%
rename from deploy/camel-catalog-3.0.0-M4.yaml
rename to deploy/camel-catalog-3.0.0-RC1-1.0.4.yaml
index 2d9ca14..35db4f4 100644
--- a/deploy/camel-catalog-3.0.0-M4.yaml
+++ b/deploy/camel-catalog-3.0.0-RC1-1.0.4.yaml
@@ -18,13 +18,15 @@
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
- name: camel-catalog-3.0.0-m4
+ name: camel-catalog-3.0.0-rc1-1.0.4
labels:
app: camel-k
- camel.apache.org/catalog.version: 3.0.0-M4
- camel.apache.org/catalog.loader.version: 3.0.0-M4
+ camel.apache.org/catalog.version: 3.0.0-RC1
+ camel.apache.org/catalog.loader.version: 3.0.0-RC1
+ camel.apache.org/runtime.version: 1.0.4
spec:
- version: 3.0.0-M4
+ version: 3.0.0-RC1
+ runtimeVersion: 1.0.4
artifacts:
camel-activemq:
groupId: org.apache.camel
@@ -57,6 +59,11 @@ spec:
- id: amqp
http: false
passive: false
+ camel-any23:
+ groupId: org.apache.camel
+ artifactId: camel-any23
+ dataformats:
+ - any23
camel-apns:
groupId: org.apache.camel
artifactId: camel-apns
@@ -336,11 +343,6 @@ spec:
- id: bonita
http: false
passive: false
- camel-boon:
- groupId: org.apache.camel
- artifactId: camel-boon
- dataformats:
- - boon
camel-box:
groupId: org.apache.camel
artifactId: camel-box
@@ -595,13 +597,6 @@ spec:
- id: ehcache
http: false
passive: false
- camel-ejb:
- groupId: org.apache.camel
- artifactId: camel-ejb
- schemes:
- - id: ejb
- http: false
- passive: false
camel-elasticsearch-rest:
groupId: org.apache.camel
artifactId: camel-elasticsearch-rest
@@ -666,6 +661,13 @@ spec:
- id: file
http: false
passive: false
+ camel-file-watch:
+ groupId: org.apache.camel
+ artifactId: camel-file-watch
+ schemes:
+ - id: file-watch
+ http: false
+ passive: false
camel-flatpack:
groupId: org.apache.camel
artifactId: camel-flatpack
@@ -878,16 +880,13 @@ spec:
- id: hbase
http: false
passive: false
- camel-hdfs2:
+ camel-hdfs:
groupId: org.apache.camel
- artifactId: camel-hdfs2
+ artifactId: camel-hdfs
schemes:
- id: hdfs
http: false
passive: false
- - id: hdfs2
- http: false
- passive: false
camel-hipchat:
groupId: org.apache.camel
artifactId: camel-hipchat
@@ -902,19 +901,13 @@ spec:
- hl7terser
dataformats:
- hl7
- camel-http4:
+ camel-http:
groupId: org.apache.camel
- artifactId: camel-http4
+ artifactId: camel-http
schemes:
- id: http
http: false
passive: false
- - id: http4
- http: false
- passive: false
- - id: https4
- http: false
- passive: false
- id: https
http: false
passive: false
@@ -1170,19 +1163,34 @@ spec:
version: 1.0.0
dependencies:
- groupId: org.apache.camel
+ artifactId: camel-endpointdsl
+ - groupId: org.apache.camel
artifactId: camel-groovy
camel-k-loader-java:
groupId: org.apache.camel.k
artifactId: camel-k-loader-java
version: 1.0.0
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-endpointdsl
camel-k-loader-js:
groupId: org.apache.camel.k
artifactId: camel-k-loader-js
version: 1.0.0
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-endpointdsl
+ camel-k-loader-knative:
+ groupId: org.apache.camel.k
+ artifactId: camel-k-loader-knative
+ version: 1.0.0
camel-k-loader-kotlin:
groupId: org.apache.camel.k
artifactId: camel-k-loader-kotlin
version: 1.0.0
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-endpointdsl
camel-k-loader-xml:
groupId: org.apache.camel.k
artifactId: camel-k-loader-xml
@@ -1227,14 +1235,16 @@ spec:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-knative
dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-cloud
- groupId: org.apache.camel.k
artifactId: camel-k-loader-yaml
- groupId: org.apache.camel.k
+ artifactId: camel-k-loader-knative
+ - groupId: org.apache.camel.k
artifactId: camel-knative
- groupId: org.apache.camel.k
artifactId: camel-knative-http
- - groupId: org.apache.camel
- artifactId: camel-netty4-http
camel-k-runtime-kotlin:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-kotlin
@@ -1283,7 +1293,7 @@ spec:
passive: false
dependencies:
- groupId: org.apache.camel
- artifactId: camel-netty4-http
+ artifactId: camel-cloud
camel-kubernetes:
groupId: org.apache.camel
artifactId: camel-kubernetes
@@ -1435,6 +1445,13 @@ spec:
- id: micrometer
http: false
passive: false
+ camel-microprofile-metrics:
+ groupId: org.apache.camel
+ artifactId: camel-microprofile-metrics
+ schemes:
+ - id: microprofile-metrics
+ http: false
+ passive: false
camel-milo:
groupId: org.apache.camel
artifactId: camel-milo
@@ -1445,16 +1462,13 @@ spec:
- id: milo-server
http: false
passive: false
- camel-mina2:
+ camel-mina:
groupId: org.apache.camel
- artifactId: camel-mina2
+ artifactId: camel-mina
schemes:
- id: mina
http: false
passive: false
- - id: mina2
- http: false
- passive: false
camel-mllp:
groupId: org.apache.camel
artifactId: camel-mllp
@@ -1469,18 +1483,18 @@ spec:
- id: mock
http: false
passive: true
- camel-mongodb-gridfs:
+ camel-mongodb:
groupId: org.apache.camel
- artifactId: camel-mongodb-gridfs
+ artifactId: camel-mongodb
schemes:
- - id: mongodb-gridfs
+ - id: mongodb
http: false
passive: false
- camel-mongodb3:
+ camel-mongodb-gridfs:
groupId: org.apache.camel
- artifactId: camel-mongodb3
+ artifactId: camel-mongodb-gridfs
schemes:
- - id: mongodb3
+ - id: mongodb-gridfs
http: false
passive: false
camel-mqtt:
@@ -1537,26 +1551,20 @@ spec:
- id: nats
http: false
passive: false
- camel-netty4:
+ camel-netty:
groupId: org.apache.camel
- artifactId: camel-netty4
+ artifactId: camel-netty
schemes:
- id: netty
http: false
passive: false
- - id: netty4
- http: false
- passive: false
- camel-netty4-http:
+ camel-netty-http:
groupId: org.apache.camel
- artifactId: camel-netty4-http
+ artifactId: camel-netty-http
schemes:
- id: netty-http
http: true
passive: false
- - id: netty4-http
- http: true
- passive: false
camel-nsq:
groupId: org.apache.camel
artifactId: camel-nsq
@@ -1680,11 +1688,11 @@ spec:
- id: pulsar
http: false
passive: false
- camel-quartz2:
+ camel-quartz:
groupId: org.apache.camel
- artifactId: camel-quartz2
+ artifactId: camel-quartz
schemes:
- - id: quartz2
+ - id: quartz
http: false
passive: false
camel-quickfix:
@@ -2080,9 +2088,6 @@ spec:
- id: twitter-search
http: false
passive: false
- - id: twitter-streaming
- http: false
- passive: false
- id: twitter-timeline
http: false
passive: false
@@ -2147,7 +2152,7 @@ spec:
artifactId: camel-webhook
schemes:
- id: webhook
- http: false
+ http: true
passive: false
camel-websocket:
groupId: org.apache.camel
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/camel-k.v1.0.0-M2.clusterserviceversion.yaml
similarity index 98%
copy from deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-m2-SNAPSHOT.clusterserviceversion.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-M2/camel-k.v1.0.0-M2.clusterserviceversion.yaml
index 1c9cfa5..22d5f4c 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/camel-k.v1.0.0-M2.clusterserviceversion.yaml
@@ -49,13 +49,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.0.0-M2-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.0.0-M2
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-m2-SNAPSHOT
+ name: camel-k-operator.v1.0.0-M2
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -145,6 +145,7 @@ spec:
template:
metadata:
labels:
+ app: camel-k
camel.apache.org/component: operator
name: camel-k-operator
spec:
@@ -377,8 +378,8 @@ spec:
minKubeVersion: 1.11.0
provider:
name: The Apache Software Foundation
- replaces: camel-k-operator.v1.0.0-m1
+ replaces: camel-k.v1.0.0-m1
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-m2-snapshot
+ version: 1.0.0-M2
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-build.yaml b/deploy/olm-catalog/camel-k/1.0.0-M2/crd-build.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-build.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M2/crd-build.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-camel-catalog.yaml b/deploy/olm-catalog/camel-k/1.0.0-M2/crd-camel-catalog.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-camel-catalog.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M2/crd-camel-catalog.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration-kit.yaml b/deploy/olm-catalog/camel-k/1.0.0-M2/crd-integration-kit.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration-kit.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M2/crd-integration-kit.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration-platform.yaml b/deploy/olm-catalog/camel-k/1.0.0-M2/crd-integration-platform.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration-platform.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M2/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration.yaml b/deploy/olm-catalog/camel-k/1.0.0-M2/crd-integration.yaml
similarity index 83%
copy from deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-M2/crd-integration.yaml
index 0b0f905..be9f64f 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-M2/crd-integration.yaml
@@ -27,6 +27,9 @@ spec:
version: v1alpha1
subresources:
status: {}
+ scale:
+ specReplicasPath: .spec.replicas
+ statusReplicasPath: .status.replicas
names:
kind: Integration
listKind: IntegrationList
@@ -37,9 +40,13 @@ spec:
additionalPrinterColumns:
- name: Phase
type: string
- description: The Integration phase
+ description: The integration phase
JSONPath: .status.phase
- name: Kit
type: string
- description: The IntegrationKit to use
+ description: The integration kit
JSONPath: .status.kit
+ - name: Replicas
+ type: integer
+ description: The number of pods
+ JSONPath: .status.replicas
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-M3-SNAPSHOT/camel-k.v1.0.0-m3-SNAPSHOT.clusterserviceversion.yaml
similarity index 97%
rename from deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-m2-SNAPSHOT.clusterserviceversion.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M3-SNAPSHOT/camel-k.v1.0.0-m3-SNAPSHOT.clusterserviceversion.yaml
index 1c9cfa5..418825c 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-M3-SNAPSHOT/camel-k.v1.0.0-m3-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-M2-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.0.0-M3-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-m2-SNAPSHOT
+ name: camel-k-operator.v1.0.0-m3-SNAPSHOT
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -145,6 +145,7 @@ spec:
template:
metadata:
labels:
+ app: camel-k
camel.apache.org/component: operator
name: camel-k-operator
spec:
@@ -167,7 +168,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:1.0.0-M2-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M3-SNAPSHOT
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -377,8 +378,8 @@ spec:
minKubeVersion: 1.11.0
provider:
name: The Apache Software Foundation
- replaces: camel-k-operator.v1.0.0-m1
+ replaces: camel-k-operator.v1.0.0-m2
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-m2-snapshot
+ version: 1.0.0-m3-snapshot
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration.yaml b/deploy/olm-catalog/camel-k/1.0.0-M3-SNAPSHOT/crd-integration.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-M2-SNAPSHOT/crd-integration.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-M3-SNAPSHOT/crd-integration.yaml
diff --git a/deploy/olm-catalog/camel-k/camel-k.package.yaml b/deploy/olm-catalog/camel-k/camel-k.package.yaml
index a142eb4..7745dc1 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-m2-snapshot
+ currentCSV: camel-k-operator.v1.0.0-m2
diff --git a/deploy/resources.go b/deploy/resources.go
index 960b3ab..4ba646e 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -173,7 +173,7 @@ metadata:
app: "camel-k"
`
- Resources["camel-catalog-3.0.0-M4.yaml"] =
+ Resources["camel-catalog-3.0.0-RC1-1.0.4.yaml"] =
`
# ---------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one or more
@@ -195,13 +195,15 @@ metadata:
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
- name: camel-catalog-3.0.0-m4
+ name: camel-catalog-3.0.0-rc1-1.0.4
labels:
app: camel-k
- camel.apache.org/catalog.version: 3.0.0-M4
- camel.apache.org/catalog.loader.version: 3.0.0-M4
+ camel.apache.org/catalog.version: 3.0.0-RC1
+ camel.apache.org/catalog.loader.version: 3.0.0-RC1
+ camel.apache.org/runtime.version: 1.0.4
spec:
- version: 3.0.0-M4
+ version: 3.0.0-RC1
+ runtimeVersion: 1.0.4
artifacts:
camel-activemq:
groupId: org.apache.camel
@@ -234,6 +236,11 @@ spec:
- id: amqp
http: false
passive: false
+ camel-any23:
+ groupId: org.apache.camel
+ artifactId: camel-any23
+ dataformats:
+ - any23
camel-apns:
groupId: org.apache.camel
artifactId: camel-apns
@@ -513,11 +520,6 @@ spec:
- id: bonita
http: false
passive: false
- camel-boon:
- groupId: org.apache.camel
- artifactId: camel-boon
- dataformats:
- - boon
camel-box:
groupId: org.apache.camel
artifactId: camel-box
@@ -772,13 +774,6 @@ spec:
- id: ehcache
http: false
passive: false
- camel-ejb:
- groupId: org.apache.camel
- artifactId: camel-ejb
- schemes:
- - id: ejb
- http: false
- passive: false
camel-elasticsearch-rest:
groupId: org.apache.camel
artifactId: camel-elasticsearch-rest
@@ -843,6 +838,13 @@ spec:
- id: file
http: false
passive: false
+ camel-file-watch:
+ groupId: org.apache.camel
+ artifactId: camel-file-watch
+ schemes:
+ - id: file-watch
+ http: false
+ passive: false
camel-flatpack:
groupId: org.apache.camel
artifactId: camel-flatpack
@@ -1055,16 +1057,13 @@ spec:
- id: hbase
http: false
passive: false
- camel-hdfs2:
+ camel-hdfs:
groupId: org.apache.camel
- artifactId: camel-hdfs2
+ artifactId: camel-hdfs
schemes:
- id: hdfs
http: false
passive: false
- - id: hdfs2
- http: false
- passive: false
camel-hipchat:
groupId: org.apache.camel
artifactId: camel-hipchat
@@ -1079,19 +1078,13 @@ spec:
- hl7terser
dataformats:
- hl7
- camel-http4:
+ camel-http:
groupId: org.apache.camel
- artifactId: camel-http4
+ artifactId: camel-http
schemes:
- id: http
http: false
passive: false
- - id: http4
- http: false
- passive: false
- - id: https4
- http: false
- passive: false
- id: https
http: false
passive: false
@@ -1347,19 +1340,34 @@ spec:
version: 1.0.0
dependencies:
- groupId: org.apache.camel
+ artifactId: camel-endpointdsl
+ - groupId: org.apache.camel
artifactId: camel-groovy
camel-k-loader-java:
groupId: org.apache.camel.k
artifactId: camel-k-loader-java
version: 1.0.0
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-endpointdsl
camel-k-loader-js:
groupId: org.apache.camel.k
artifactId: camel-k-loader-js
version: 1.0.0
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-endpointdsl
+ camel-k-loader-knative:
+ groupId: org.apache.camel.k
+ artifactId: camel-k-loader-knative
+ version: 1.0.0
camel-k-loader-kotlin:
groupId: org.apache.camel.k
artifactId: camel-k-loader-kotlin
version: 1.0.0
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-endpointdsl
camel-k-loader-xml:
groupId: org.apache.camel.k
artifactId: camel-k-loader-xml
@@ -1404,14 +1412,16 @@ spec:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-knative
dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-cloud
- groupId: org.apache.camel.k
artifactId: camel-k-loader-yaml
- groupId: org.apache.camel.k
+ artifactId: camel-k-loader-knative
+ - groupId: org.apache.camel.k
artifactId: camel-knative
- groupId: org.apache.camel.k
artifactId: camel-knative-http
- - groupId: org.apache.camel
- artifactId: camel-netty4-http
camel-k-runtime-kotlin:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-kotlin
@@ -1460,7 +1470,7 @@ spec:
passive: false
dependencies:
- groupId: org.apache.camel
- artifactId: camel-netty4-http
+ artifactId: camel-cloud
camel-kubernetes:
groupId: org.apache.camel
artifactId: camel-kubernetes
@@ -1612,6 +1622,13 @@ spec:
- id: micrometer
http: false
passive: false
+ camel-microprofile-metrics:
+ groupId: org.apache.camel
+ artifactId: camel-microprofile-metrics
+ schemes:
+ - id: microprofile-metrics
+ http: false
+ passive: false
camel-milo:
groupId: org.apache.camel
artifactId: camel-milo
@@ -1622,16 +1639,13 @@ spec:
- id: milo-server
http: false
passive: false
- camel-mina2:
+ camel-mina:
groupId: org.apache.camel
- artifactId: camel-mina2
+ artifactId: camel-mina
schemes:
- id: mina
http: false
passive: false
- - id: mina2
- http: false
- passive: false
camel-mllp:
groupId: org.apache.camel
artifactId: camel-mllp
@@ -1646,18 +1660,18 @@ spec:
- id: mock
http: false
passive: true
- camel-mongodb-gridfs:
+ camel-mongodb:
groupId: org.apache.camel
- artifactId: camel-mongodb-gridfs
+ artifactId: camel-mongodb
schemes:
- - id: mongodb-gridfs
+ - id: mongodb
http: false
passive: false
- camel-mongodb3:
+ camel-mongodb-gridfs:
groupId: org.apache.camel
- artifactId: camel-mongodb3
+ artifactId: camel-mongodb-gridfs
schemes:
- - id: mongodb3
+ - id: mongodb-gridfs
http: false
passive: false
camel-mqtt:
@@ -1714,26 +1728,20 @@ spec:
- id: nats
http: false
passive: false
- camel-netty4:
+ camel-netty:
groupId: org.apache.camel
- artifactId: camel-netty4
+ artifactId: camel-netty
schemes:
- id: netty
http: false
passive: false
- - id: netty4
- http: false
- passive: false
- camel-netty4-http:
+ camel-netty-http:
groupId: org.apache.camel
- artifactId: camel-netty4-http
+ artifactId: camel-netty-http
schemes:
- id: netty-http
http: true
passive: false
- - id: netty4-http
- http: true
- passive: false
camel-nsq:
groupId: org.apache.camel
artifactId: camel-nsq
@@ -1857,11 +1865,11 @@ spec:
- id: pulsar
http: false
passive: false
- camel-quartz2:
+ camel-quartz:
groupId: org.apache.camel
- artifactId: camel-quartz2
+ artifactId: camel-quartz
schemes:
- - id: quartz2
+ - id: quartz
http: false
passive: false
camel-quickfix:
@@ -2257,9 +2265,6 @@ spec:
- id: twitter-search
http: false
passive: false
- - id: twitter-streaming
- http: false
- passive: false
- id: twitter-timeline
http: false
passive: false
@@ -2324,7 +2329,7 @@ spec:
artifactId: camel-webhook
schemes:
- id: webhook
- http: false
+ http: true
passive: false
camel-websocket:
groupId: org.apache.camel
diff --git a/e2e/test_staging_hooks.go b/e2e/test_staging_hooks.go
index a441084..3aba0cc 100644
--- a/e2e/test_staging_hooks.go
+++ b/e2e/test_staging_hooks.go
@@ -26,12 +26,12 @@ func init() {
// Uncomment the following lines and change references to enable the hook
//testImageName = "docker.io/camelk/camel-k"
- //testImageVersion = "1.0.0-M2-SNAPSHOT"
+ //testImageVersion = "1.0.0-M2"
//kamelHooks = append(kamelHooks, func(cmd []string) []string {
// if len(cmd) > 0 && cmd[0] == "install" {
- // cmd = append(cmd, "--operator-image=docker.io/camelk/camel-k:1.0.0-M2-SNAPSHOT")
- // cmd = append(cmd, "--maven-repository=https://repository.apache.org/content/repositories/orgapachecamel-1145")
+ // cmd = append(cmd, "--operator-image=docker.io/camelk/camel-k:1.0.0-M2")
+ // cmd = append(cmd, "--maven-repository=https://repository.apache.org/content/repositories/orgapachecamel-1156")
// }
// return cmd
//})
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index 8a4e3ea..4f7c333 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -705,6 +705,11 @@ func (in *IntegrationPlatformBuildSpec) DeepCopyInto(out *IntegrationPlatformBui
out.Registry = in.Registry
out.Timeout = in.Timeout
in.Maven.DeepCopyInto(&out.Maven)
+ if in.KanikoBuildCache != nil {
+ in, out := &in.KanikoBuildCache, &out.KanikoBuildCache
+ *out = new(bool)
+ **out = **in
+ }
return
}
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 9477927..a223cd7 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-M2-SNAPSHOT"
+ Version = "1.0.0-M2"
// CamelVersionConstraint --
- CamelVersionConstraint = ">=3.0.0-M4"
+ CamelVersionConstraint = ">=3.0.0-RC1"
// RuntimeVersion --
- RuntimeVersion = "1.0.0"
+ RuntimeVersion = "1.0.4"
// KanikoVersion --
KanikoVersion = "0.9.0"
diff --git a/pkg/util/test/catalog_test.go b/pkg/util/test/catalog_test.go
index 15f07cd..6cdabc2 100644
--- a/pkg/util/test/catalog_test.go
+++ b/pkg/util/test/catalog_test.go
@@ -27,7 +27,7 @@ func TestRuntimeContainsEmbeddedArtifacts(t *testing.T) {
catalog, err := DefaultCatalog()
assert.Nil(t, err)
- assert.Equal(t, "3.0.0-M4", catalog.Version)
+ assert.Equal(t, "3.0.0-RC1", catalog.Version)
artifact := catalog.GetArtifactByScheme("knative")
assert.Equal(t, 1, len(artifact.Schemes))
diff --git a/script/Makefile b/script/Makefile
index 02480f5..55164a7 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -14,11 +14,11 @@
# limitations under the License.
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION := 1.0.0-M2-SNAPSHOT
+VERSION := 1.0.0-M2
LAST_RELEASED_VERSION := 1.0.0-M1
-RUNTIME_VERSION := 1.0.0
-CAMEL_VERSION := 3.0.0-M4
-CAMEL_VERSION_CONSTRAINT := >=3.0.0-M4
+RUNTIME_VERSION := 1.0.4
+CAMEL_VERSION := 3.0.0-RC1
+CAMEL_VERSION_CONSTRAINT := >=3.0.0-RC1
KANIKO_VERSION := 0.9.0
BASE_IMAGE := fabric8/s2i-java:3.0-java8
LOCAL_REPOSITORY := /tmp/artifacts/m2
diff --git a/script/build_catalog.sh b/script/build_catalog.sh
index 90dee43..2227888 100755
--- a/script/build_catalog.sh
+++ b/script/build_catalog.sh
@@ -27,4 +27,5 @@ $rootdir/mvnw -q \
-f ${rootdir}/build/maven/pom-catalog.xml \
-Dcatalog.path=${rootdir}/deploy \
-Dcatalog.version=$1 \
+ -Dcamel.version=$1 \
-Druntime.version=$2
\ No newline at end of file
diff --git a/script/build_olm.sh b/script/build_olm.sh
index 03cd5f5..33d970a 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 || true
+rm $olm_catalog/camel-k/${version}/crd-*.yaml 2>/dev/null || true
cp $location/../deploy/crd-*.yaml $olm_catalog/camel-k/${version}/