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/18 22:04:13 UTC
[camel-k] branch master updated: preparing for next release
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
The following commit(s) were added to refs/heads/master by this push:
new 642b0b4 preparing for next release
642b0b4 is described below
commit 642b0b42fec1973cec425e9b28e2c1899ae40753
Author: nferraro <ni...@gmail.com>
AuthorDate: Sat Oct 19 00:03:48 2019 +0200
preparing for next release
---
assets/json-schema/CamelCatalog.json | 49 ++++++++
assets/json-schema/Integration.json | 52 +++++++++
assets/json-schema/IntegrationKit.json | 49 ++++++++
...HOT.yaml => camel-catalog-3.0.0-RC1-1.0.5.yaml} | 56 +--------
deploy/resources.go | 126 ++++++++++++---------
pkg/util/defaults/defaults.go | 4 +-
script/Makefile | 4 +-
7 files changed, 229 insertions(+), 111 deletions(-)
diff --git a/assets/json-schema/CamelCatalog.json b/assets/json-schema/CamelCatalog.json
index b8e37a6..a1a71a8 100644
--- a/assets/json-schema/CamelCatalog.json
+++ b/assets/json-schema/CamelCatalog.json
@@ -122,6 +122,13 @@
},
"type": "object"
},
+ "managedFields": {
+ "items": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "$ref": "#/definitions/ManagedFieldsEntry"
+ },
+ "type": "array"
+ },
"name": {
"type": "string"
},
@@ -206,6 +213,23 @@
"additionalProperties": false,
"type": "object"
},
+ "Fields": {
+ "required": [
+ "Map"
+ ],
+ "properties": {
+ "Map": {
+ "patternProperties": {
+ ".*": {
+ "$ref": "#/definitions/Fields"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "additionalProperties": false,
+ "type": "object"
+ },
"Initializer": {
"required": [
"name"
@@ -238,6 +262,28 @@
"additionalProperties": false,
"type": "object"
},
+ "ManagedFieldsEntry": {
+ "properties": {
+ "apiVersion": {
+ "type": "string"
+ },
+ "fields": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "$ref": "#/definitions/Fields"
+ },
+ "manager": {
+ "type": "string"
+ },
+ "operation": {
+ "type": "string"
+ },
+ "time": {
+ "$ref": "#/definitions/Time"
+ }
+ },
+ "additionalProperties": false,
+ "type": "object"
+ },
"OwnerReference": {
"required": [
"apiVersion",
@@ -292,6 +338,9 @@
"reason": {
"type": "string"
},
+ "remainingItemCount": {
+ "type": "integer"
+ },
"resourceVersion": {
"type": "string"
},
diff --git a/assets/json-schema/Integration.json b/assets/json-schema/Integration.json
index beb8bc5..fcdd30b 100644
--- a/assets/json-schema/Integration.json
+++ b/assets/json-schema/Integration.json
@@ -59,6 +59,23 @@
"additionalProperties": false,
"type": "object"
},
+ "Fields": {
+ "required": [
+ "Map"
+ ],
+ "properties": {
+ "Map": {
+ "patternProperties": {
+ ".*": {
+ "$ref": "#/definitions/Fields"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "additionalProperties": false,
+ "type": "object"
+ },
"Initializer": {
"required": [
"name"
@@ -144,6 +161,13 @@
},
"type": "object"
},
+ "managedFields": {
+ "items": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "$ref": "#/definitions/ManagedFieldsEntry"
+ },
+ "type": "array"
+ },
"name": {
"type": "string"
},
@@ -328,6 +352,28 @@
"additionalProperties": false,
"type": "object"
},
+ "ManagedFieldsEntry": {
+ "properties": {
+ "apiVersion": {
+ "type": "string"
+ },
+ "fields": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "$ref": "#/definitions/Fields"
+ },
+ "manager": {
+ "type": "string"
+ },
+ "operation": {
+ "type": "string"
+ },
+ "time": {
+ "$ref": "#/definitions/Time"
+ }
+ },
+ "additionalProperties": false,
+ "type": "object"
+ },
"OwnerReference": {
"required": [
"apiVersion",
@@ -402,6 +448,9 @@
"language": {
"type": "string"
},
+ "loader": {
+ "type": "string"
+ },
"name": {
"type": "string"
}
@@ -433,6 +482,9 @@
"reason": {
"type": "string"
},
+ "remainingItemCount": {
+ "type": "integer"
+ },
"resourceVersion": {
"type": "string"
},
diff --git a/assets/json-schema/IntegrationKit.json b/assets/json-schema/IntegrationKit.json
index 0815ea8..d1a9ca9 100644
--- a/assets/json-schema/IntegrationKit.json
+++ b/assets/json-schema/IntegrationKit.json
@@ -77,6 +77,23 @@
"additionalProperties": false,
"type": "object"
},
+ "Fields": {
+ "required": [
+ "Map"
+ ],
+ "properties": {
+ "Map": {
+ "patternProperties": {
+ ".*": {
+ "$ref": "#/definitions/Fields"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "additionalProperties": false,
+ "type": "object"
+ },
"Initializer": {
"required": [
"name"
@@ -162,6 +179,13 @@
},
"type": "object"
},
+ "managedFields": {
+ "items": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "$ref": "#/definitions/ManagedFieldsEntry"
+ },
+ "type": "array"
+ },
"name": {
"type": "string"
},
@@ -312,6 +336,28 @@
"additionalProperties": false,
"type": "object"
},
+ "ManagedFieldsEntry": {
+ "properties": {
+ "apiVersion": {
+ "type": "string"
+ },
+ "fields": {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "$ref": "#/definitions/Fields"
+ },
+ "manager": {
+ "type": "string"
+ },
+ "operation": {
+ "type": "string"
+ },
+ "time": {
+ "$ref": "#/definitions/Time"
+ }
+ },
+ "additionalProperties": false,
+ "type": "object"
+ },
"OwnerReference": {
"required": [
"apiVersion",
@@ -366,6 +412,9 @@
"reason": {
"type": "string"
},
+ "remainingItemCount": {
+ "type": "integer"
+ },
"resourceVersion": {
"type": "string"
},
diff --git a/deploy/camel-catalog-3.0.0-RC1-1.0.5-SNAPSHOT.yaml b/deploy/camel-catalog-3.0.0-RC1-1.0.5.yaml
similarity index 96%
rename from deploy/camel-catalog-3.0.0-RC1-1.0.5-SNAPSHOT.yaml
rename to deploy/camel-catalog-3.0.0-RC1-1.0.5.yaml
index af5b939..34077fa 100644
--- a/deploy/camel-catalog-3.0.0-RC1-1.0.5-SNAPSHOT.yaml
+++ b/deploy/camel-catalog-3.0.0-RC1-1.0.5.yaml
@@ -18,15 +18,15 @@
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
- name: camel-catalog-3.0.0-rc1-1.0.5-snapshot
+ name: camel-catalog-3.0.0-rc1-1.0.5
labels:
app: camel-k
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.5-SNAPSHOT
+ camel.apache.org/runtime.version: 1.0.5
spec:
version: 3.0.0-RC1
- runtimeVersion: 1.0.5-SNAPSHOT
+ runtimeVersion: 1.0.5
artifacts:
camel-activemq:
groupId: org.apache.camel
@@ -1160,7 +1160,6 @@ spec:
camel-k-loader-groovy:
groupId: org.apache.camel.k
artifactId: camel-k-loader-groovy
- version: 1.0.0
dependencies:
- groupId: org.apache.camel
artifactId: camel-endpointdsl
@@ -1169,41 +1168,27 @@ spec:
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
- version: 1.0.0
- camel-k-runtime-groovy:
- groupId: org.apache.camel.k
- artifactId: camel-k-runtime-groovy
- version: 1.0.0
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-groovy
- - groupId: org.apache.camel
- artifactId: camel-groovy
camel-k-runtime-health:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-health
@@ -1212,25 +1197,6 @@ spec:
artifactId: camel-servlet
- groupId: org.apache.camel.k
artifactId: camel-k-runtime-servlet
- camel-k-runtime-jvm:
- groupId: org.apache.camel.k
- artifactId: camel-k-runtime-jvm
- version: 1.0.0
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-runtime-main
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-js
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-xml
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-java
- - groupId: org.apache.camel
- artifactId: camel-core-engine
- - groupId: org.apache.camel
- artifactId: camel-main
- - groupId: org.apache.camel
- artifactId: camel-properties
camel-k-runtime-knative:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-knative
@@ -1247,17 +1213,9 @@ spec:
artifactId: camel-knative
- groupId: org.apache.camel.k
artifactId: camel-knative-http
- camel-k-runtime-kotlin:
- groupId: org.apache.camel.k
- artifactId: camel-k-runtime-kotlin
- version: 1.0.0
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-kotlin
camel-k-runtime-main:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-main
- version: 1.0.0
dependencies:
- groupId: org.apache.camel
artifactId: camel-core-engine
@@ -1271,13 +1229,6 @@ spec:
dependencies:
- groupId: org.apache.camel
artifactId: camel-servlet
- camel-k-runtime-yaml:
- groupId: org.apache.camel.k
- artifactId: camel-k-runtime-yaml
- version: 1.0.0
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-yaml
camel-kafka:
groupId: org.apache.camel
artifactId: camel-kafka
@@ -1288,7 +1239,6 @@ spec:
camel-knative:
groupId: org.apache.camel.k
artifactId: camel-knative
- version: 1.0.0
schemes:
- id: knative
http: true
diff --git a/deploy/resources.go b/deploy/resources.go
index c320d81..bfde5a3 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -26,6 +26,23 @@ func init() {
Resources["builder-role-binding.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -43,6 +60,23 @@ roleRef:
`
Resources["builder-role-kubernetes.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -82,6 +116,23 @@ rules:
`
Resources["builder-role-openshift.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
kind: Role
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
@@ -165,6 +216,23 @@ rules:
`
Resources["builder-service-account.yaml"] =
`
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
apiVersion: v1
kind: ServiceAccount
metadata:
@@ -2434,7 +2502,7 @@ spec:
passive: false
`
- Resources["camel-catalog-3.0.0-RC1-1.0.5-SNAPSHOT.yaml"] =
+ Resources["camel-catalog-3.0.0-RC1-1.0.5.yaml"] =
`
# ---------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one or more
@@ -2456,15 +2524,15 @@ spec:
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
- name: camel-catalog-3.0.0-rc1-1.0.5-snapshot
+ name: camel-catalog-3.0.0-rc1-1.0.5
labels:
app: camel-k
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.5-SNAPSHOT
+ camel.apache.org/runtime.version: 1.0.5
spec:
version: 3.0.0-RC1
- runtimeVersion: 1.0.5-SNAPSHOT
+ runtimeVersion: 1.0.5
artifacts:
camel-activemq:
groupId: org.apache.camel
@@ -3598,7 +3666,6 @@ spec:
camel-k-loader-groovy:
groupId: org.apache.camel.k
artifactId: camel-k-loader-groovy
- version: 1.0.0
dependencies:
- groupId: org.apache.camel
artifactId: camel-endpointdsl
@@ -3607,41 +3674,27 @@ spec:
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
- version: 1.0.0
- camel-k-runtime-groovy:
- groupId: org.apache.camel.k
- artifactId: camel-k-runtime-groovy
- version: 1.0.0
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-groovy
- - groupId: org.apache.camel
- artifactId: camel-groovy
camel-k-runtime-health:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-health
@@ -3650,25 +3703,6 @@ spec:
artifactId: camel-servlet
- groupId: org.apache.camel.k
artifactId: camel-k-runtime-servlet
- camel-k-runtime-jvm:
- groupId: org.apache.camel.k
- artifactId: camel-k-runtime-jvm
- version: 1.0.0
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-runtime-main
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-js
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-xml
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-java
- - groupId: org.apache.camel
- artifactId: camel-core-engine
- - groupId: org.apache.camel
- artifactId: camel-main
- - groupId: org.apache.camel
- artifactId: camel-properties
camel-k-runtime-knative:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-knative
@@ -3685,17 +3719,9 @@ spec:
artifactId: camel-knative
- groupId: org.apache.camel.k
artifactId: camel-knative-http
- camel-k-runtime-kotlin:
- groupId: org.apache.camel.k
- artifactId: camel-k-runtime-kotlin
- version: 1.0.0
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-kotlin
camel-k-runtime-main:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-main
- version: 1.0.0
dependencies:
- groupId: org.apache.camel
artifactId: camel-core-engine
@@ -3709,13 +3735,6 @@ spec:
dependencies:
- groupId: org.apache.camel
artifactId: camel-servlet
- camel-k-runtime-yaml:
- groupId: org.apache.camel.k
- artifactId: camel-k-runtime-yaml
- version: 1.0.0
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-loader-yaml
camel-kafka:
groupId: org.apache.camel
artifactId: camel-kafka
@@ -3726,7 +3745,6 @@ spec:
camel-knative:
groupId: org.apache.camel.k
artifactId: camel-knative
- version: 1.0.0
schemes:
- id: knative
http: true
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index d30b181..b4680f6 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -31,10 +31,10 @@ const (
CamelVersionConstraint = ">=3.0.0-RC1"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.0.5-SNAPSHOT"
+ DefaultRuntimeVersion = "1.0.5"
// RuntimeVersionConstraint --
- RuntimeVersionConstraint = ">=1.0.5-SNAPSHOT"
+ RuntimeVersionConstraint = ">=1.0.5"
// KanikoVersion --
KanikoVersion = "0.9.0"
diff --git a/script/Makefile b/script/Makefile
index 7e2cbf4..a9b85a2 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,8 +16,8 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.0.0-M3-SNAPSHOT
LAST_RELEASED_VERSION := 1.0.0-M1
-RUNTIME_VERSION := 1.0.5-SNAPSHOT
-RUNTIME_VERSION_CONSTRAINT := >=1.0.5-SNAPSHOT
+RUNTIME_VERSION := 1.0.5
+RUNTIME_VERSION_CONSTRAINT := >=1.0.5
CAMEL_VERSION := 3.0.0-RC1
CAMEL_VERSION_CONSTRAINT := >=3.0.0-RC1
KANIKO_VERSION := 0.9.0