This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d57f33c4aaa131fa33b3ba831e7b4a566abb5b84
Author: nicolaferraro <ni.ferr...@gmail.com>
AuthorDate: Fri Sep 3 17:09:14 2021 +0200
preparing for next release
---
...log-1.9.0-SNAPSHOT.yaml => camel-catalog-1.9.0.yaml} | 9 +++------
e2e/common/traits/files/template.yaml | 17 +++++++++++++++++
e2e/knative/files/template-knative.yaml | 17 +++++++++++++++++
e2e/support/files/nexus.yaml | 17 +++++++++++++++++
.../properties-binding.yaml | 17 +++++++++++++++++
examples/amqp/artemis/artemis-amqp.yaml | 17 +++++++++++++++++
examples/amqp/artemis/artemis-service.yaml | 17 +++++++++++++++++
.../databases/postgres-deploy/postgres-configmap.yaml | 17 +++++++++++++++++
.../databases/postgres-deploy/postgres-deployment.yaml | 17 +++++++++++++++++
.../databases/postgres-deploy/postgres-service.yaml | 17 +++++++++++++++++
.../databases/postgres-deploy/postgres-storage.yaml | 17 +++++++++++++++++
examples/kamelets/chuck-norris/chuck.xml | 15 +++++++++++++++
pkg/resources/resources.go | 10 +++++-----
pkg/trait/pod_test.go | 17 +++++++++++++++++
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 6 +++---
16 files changed, 214 insertions(+), 15 deletions(-)
diff --git a/deploy/camel-catalog-1.9.0-SNAPSHOT.yaml
b/deploy/camel-catalog-1.9.0.yaml
similarity index 99%
rename from deploy/camel-catalog-1.9.0-SNAPSHOT.yaml
rename to deploy/camel-catalog-1.9.0.yaml
index b794756..29b24ee 100644
--- a/deploy/camel-catalog-1.9.0-SNAPSHOT.yaml
+++ b/deploy/camel-catalog-1.9.0.yaml
@@ -18,15 +18,15 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.9.0-snapshot
+ name: camel-catalog-1.9.0
labels:
app: camel-k
camel.apache.org/catalog.loader.version: 3.11.1
camel.apache.org/catalog.version: 3.11.1
- camel.apache.org/runtime.version: 1.9.0-SNAPSHOT
+ camel.apache.org/runtime.version: 1.9.0
spec:
runtime:
- version: 1.9.0-SNAPSHOT
+ version: 1.9.0
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
@@ -91,9 +91,6 @@ spec:
camel-k-master:
groupId: org.apache.camel.k
artifactId: camel-k-master
- camel-k-webhook:
- groupId: org.apache.camel.k
- artifactId: camel-k-webhook
camel-quarkus-activemq:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-activemq
diff --git a/e2e/common/traits/files/template.yaml
b/e2e/common/traits/files/template.yaml
index e5f0bdc..871a2eb 100644
--- a/e2e/common/traits/files/template.yaml
+++ b/e2e/common/traits/files/template.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
containers:
- name: integration
env:
diff --git a/e2e/knative/files/template-knative.yaml
b/e2e/knative/files/template-knative.yaml
index 431b276..2c7ac34 100644
--- a/e2e/knative/files/template-knative.yaml
+++ b/e2e/knative/files/template-knative.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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.
+# ---------------------------------------------------------------------------
+
containers:
- name: integration
env:
diff --git a/e2e/support/files/nexus.yaml b/e2e/support/files/nexus.yaml
index c4e8403..0be0a31 100644
--- a/e2e/support/files/nexus.yaml
+++ b/e2e/support/files/nexus.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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: Namespace
metadata:
diff --git
a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
index f482ece..b4b39cb 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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: KameletBinding
apiVersion: camel.apache.org/v1alpha1
metadata:
diff --git a/examples/amqp/artemis/artemis-amqp.yaml
b/examples/amqp/artemis/artemis-amqp.yaml
index 0695e5b..deb1ecd 100644
--- a/examples/amqp/artemis/artemis-amqp.yaml
+++ b/examples/amqp/artemis/artemis-amqp.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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: broker.amq.io/v2alpha4
kind: ActiveMQArtemis
metadata:
diff --git a/examples/amqp/artemis/artemis-service.yaml
b/examples/amqp/artemis/artemis-service.yaml
index 0ba5878..33a8406 100644
--- a/examples/amqp/artemis/artemis-service.yaml
+++ b/examples/amqp/artemis/artemis-service.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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: Service
metadata:
diff --git a/examples/databases/postgres-deploy/postgres-configmap.yaml
b/examples/databases/postgres-deploy/postgres-configmap.yaml
index c94b6ad..76bc901 100644
--- a/examples/databases/postgres-deploy/postgres-configmap.yaml
+++ b/examples/databases/postgres-deploy/postgres-configmap.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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: ConfigMap
metadata:
diff --git a/examples/databases/postgres-deploy/postgres-deployment.yaml
b/examples/databases/postgres-deploy/postgres-deployment.yaml
index 001d2ec..25f6c85 100644
--- a/examples/databases/postgres-deploy/postgres-deployment.yaml
+++ b/examples/databases/postgres-deploy/postgres-deployment.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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: apps/v1
kind: Deployment
metadata:
diff --git a/examples/databases/postgres-deploy/postgres-service.yaml
b/examples/databases/postgres-deploy/postgres-service.yaml
index f3ed357..3496b5c 100644
--- a/examples/databases/postgres-deploy/postgres-service.yaml
+++ b/examples/databases/postgres-deploy/postgres-service.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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: Service
metadata:
diff --git a/examples/databases/postgres-deploy/postgres-storage.yaml
b/examples/databases/postgres-deploy/postgres-storage.yaml
index 36a8db2..200a739 100644
--- a/examples/databases/postgres-deploy/postgres-storage.yaml
+++ b/examples/databases/postgres-deploy/postgres-storage.yaml
@@ -1,3 +1,20 @@
+# ---------------------------------------------------------------------------
+# 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: PersistentVolume
apiVersion: v1
metadata:
diff --git a/examples/kamelets/chuck-norris/chuck.xml
b/examples/kamelets/chuck-norris/chuck.xml
index cbb2f63..0d2a2e4 100644
--- a/examples/kamelets/chuck-norris/chuck.xml
+++ b/examples/kamelets/chuck-norris/chuck.xml
@@ -1,3 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<route>
<from uri="kamelet:chuck-norris-source"/>
<log message="${body}"/>
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 086d23e..929da2b 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -457,12 +457,12 @@ var assets = func() http.FileSystem {
compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x44\x8e\x31\x4e\x04\x31\x0c\x45\xfb\x9c\xe2\x2b\xdb\x32\xd2\xd0\x5a\xa2\xa2\x41\xe2\x00\xd4\x66\xd7\x33\x44\x24\x71\xe4\x38\x12\x73\x7b\x94\x1d\xc1\xba\xfc\x7e\xf6\x7f\x17\x5c\xb9\x48\x5e\xbe\x09\x99\xeb\x3e\x78\x97\x97\x83\x4b\x0e\xe1\x82\x0f\x4b\x2e\x38\x74\x18\x4c\x87\x4b\xc7\x97\x98\x3c\x61\x53\x83\xfc\x70\x69\x59\x28\x2c\xd8\x4c\x0b\x05\x00\x18\x96\x08\xd1\x53\x11\xa3\xf9\x24\xde\xd3\xc6\xc6\x45\x5c\xac\x9f\x14\x
[...]
},
- "/camel-catalog-1.9.0-SNAPSHOT.yaml":
&vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.9.0-SNAPSHOT.yaml",
+ "/camel-catalog-1.9.0.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.9.0.yaml",
modTime: time.Time{},
- uncompressedSize: 89792,
+ uncompressedSize: 89676,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5b\x77\xdb\x38\xb6\xe6\xbb\x7f\x05\x57\xe5\xe5\x9c\x35\x2d\x74\x55\xaa\xe7\xd4\x4c\xcd\x93\x2d\xc7\x89\x1d\xdb\x71\x22\x77\x92\xee\x97\x5a\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x9f\x05\x10\xbc\x4a\xd9\xbc\x78\xc3\xed\x07\x93\x22\x36\xbe\x8d\xef\x03\x08\x12\x17\x02\x6f\x82\x19\xde\xdf\xc9\x9b\xe0\x9a\x87\x2c\x55\x2c\x0a\xb4\x08\xf4\x86\x05\xa7\x19\x0d\x37\x2c\x58\x88\x95\x7e\xa2\x92\x05\x17\x22\x4f\x23\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5b\x77\xdb\x38\xb6\xe6\x7b\x7e\x05\x57\xe5\xe5\x9c\x35\x2d\x74\x55\xaa\xe7\xd4\x4c\xcd\x93\x23\xc7\x89\x1d\xcb\x71\x22\x77\x92\xee\x97\x5a\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x9f\x05\x10\xbc\x4a\xd9\xbc\x78\xc3\xed\x07\x93\x22\x36\xbe\x8d\xef\x03\x08\x12\x17\x02\xaf\x83\x19\xde\xdf\xab\xd7\xc1\x35\x0f\x59\xaa\x58\x14\x68\x11\xe8\x2d\x0b\xce\x32\x1a\x6e\x59\xb0\x14\x6b\xfd\x48\x25\x0b\x2e\x44\x9e\x46\x
[...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
@@ -474,7 +474,7 @@ var assets = func() http.FileSystem {
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/addons"].(os.FileInfo),
- fs["/camel-catalog-1.9.0-SNAPSHOT.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.9.0.yaml"].(os.FileInfo),
fs["/crd"].(os.FileInfo),
fs["/default"].(os.FileInfo),
fs["/manager"].(os.FileInfo),
diff --git a/pkg/trait/pod_test.go b/pkg/trait/pod_test.go
index ca4bf0c..b82bfcd 100755
--- a/pkg/trait/pod_test.go
+++ b/pkg/trait/pod_test.go
@@ -1,3 +1,20 @@
+/*
+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.
+*/
+
package trait
import (
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 7f76b74..6ad9f37 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.6.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.9.0-SNAPSHOT"
+ DefaultRuntimeVersion = "1.9.0"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index cb90963..1c0d38f 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -17,7 +17,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 1.6.0-SNAPSHOT
OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION))
LAST_RELEASED_VERSION := 1.5.1
-RUNTIME_VERSION := 1.9.0-SNAPSHOT
+RUNTIME_VERSION := 1.9.0
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
INSTALL_DEFAULT_KAMELETS := true
@@ -33,12 +33,12 @@ LINT_DEADLINE := 10m
# Used to push pre-release artifacts
STAGING_IMAGE_NAME := docker.io/camelk/camel-k
-STAGING_RUNTIME_REPO :=
+STAGING_RUNTIME_REPO :=
https://repository.apache.org/content/repositories/orgapachecamel-1352
# Define here the repo containing the default Kamelet catalog (if any)
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git
# Optional branch for the default Kamelet catalog (change this to a tag before
release)
-KAMELET_CATALOG_REPO_BRANCH := main
+KAMELET_CATALOG_REPO_BRANCH := v0.4.0
# When packaging artifacts into the docker image, you can "copy" them from
local maven
# or "download" them from Apache Snapshots and Maven Central
