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 92c8605 preparing for next release
92c8605 is described below
commit 92c860599760f8d74c63c5f71e689e0a7b374438
Author: nicolaferraro <ni.ferr...@gmail.com>
AuthorDate: Tue Apr 13 22:50:42 2021 +0200
preparing for next release
---
...log-1.7.0-SNAPSHOT.yaml => camel-catalog-1.7.0.yaml} | 6 +++---
.../common/kamelet-binding-autoload/secret-default.yaml | 17 +++++++++++++++++
.../kamelet-binding-autoload/secret-specific.yaml | 17 +++++++++++++++++
e2e/yaks/common/kamelet-steps/steps-binding.yaml | 17 +++++++++++++++++
go.sum | 1 +
pkg/resources/resources.go | 10 +++++-----
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 9 +++++----
8 files changed, 66 insertions(+), 13 deletions(-)
diff --git a/deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
b/deploy/camel-catalog-1.7.0.yaml
similarity index 99%
rename from deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
rename to deploy/camel-catalog-1.7.0.yaml
index 8918b60..a0a291e 100644
--- a/deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
+++ b/deploy/camel-catalog-1.7.0.yaml
@@ -18,15 +18,15 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.7.0-snapshot
+ name: camel-catalog-1.7.0
labels:
app: camel-k
camel.apache.org/catalog.loader.version: 3.9.0
camel.apache.org/catalog.version: 3.9.0
- camel.apache.org/runtime.version: 1.7.0-SNAPSHOT
+ camel.apache.org/runtime.version: 1.7.0
spec:
runtime:
- version: 1.7.0-SNAPSHOT
+ version: 1.7.0
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
diff --git a/e2e/yaks/common/kamelet-binding-autoload/secret-default.yaml
b/e2e/yaks/common/kamelet-binding-autoload/secret-default.yaml
index edb12ce..35e00f4 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/secret-default.yaml
+++ b/e2e/yaks/common/kamelet-binding-autoload/secret-default.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: Secret
metadata:
diff --git a/e2e/yaks/common/kamelet-binding-autoload/secret-specific.yaml
b/e2e/yaks/common/kamelet-binding-autoload/secret-specific.yaml
index b5cbfcb..56cbfff 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/secret-specific.yaml
+++ b/e2e/yaks/common/kamelet-binding-autoload/secret-specific.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: Secret
metadata:
diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.yaml
b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
index 42ebc11..b2956bf 100644
--- a/e2e/yaks/common/kamelet-steps/steps-binding.yaml
+++ b/e2e/yaks/common/kamelet-steps/steps-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.
+# ---------------------------------------------------------------------------
+
apiVersion: camel.apache.org/v1alpha1
kind: KameletBinding
metadata:
diff --git a/go.sum b/go.sum
index 7c25274..6d7ac2c 100644
--- a/go.sum
+++ b/go.sum
@@ -1568,6 +1568,7 @@ k8s.io/code-generator v0.18.2/go.mod
h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRV
k8s.io/code-generator v0.18.6/go.mod
h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
k8s.io/code-generator v0.19.2/go.mod
h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
k8s.io/code-generator v0.19.7/go.mod
h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
+k8s.io/code-generator v0.19.8 h1:uxctqO1/3jnMDWB4imT8unRvgCXVPX2NTm/cMFCyigY=
k8s.io/code-generator v0.19.8/go.mod
h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
k8s.io/component-base v0.17.4/go.mod
h1:5BRqHMbbQPm2kKu35v3G+CpVq4K0RJKC7TRioF0I9lE=
k8s.io/component-base v0.18.2/go.mod
h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM=
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index db4bf71..c4cc1b1 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.7.0-SNAPSHOT.yaml":
&vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.7.0-SNAPSHOT.yaml",
+ "/camel-catalog-1.7.0.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.7.0.yaml",
modTime: time.Time{},
- uncompressedSize: 87675,
+ uncompressedSize: 87648,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x3a\x96\xee\xdc\xbf\x82\xeb\x64\xd2\xbd\x6e\x09\x75\x4e\x52\xb7\x4f\xdf\xdc\x91\x2d\xc7\x89\x1d\xcb\x76\x22\x57\x92\xaa\xc9\x59\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\xef\x85\x07\x9f\x52\x36\x1f\x02\xd4\x1a\x88\x20\xb1\xf1\x6d\xec\x0f\x0f\x12\xef\x37\xc1\xc4\xdd\xef\xec\x4d\x70\x4b\x43\x92\x0a\x12\x05\x92\x05\x72\x4d\x82\xf3\x0c\x87\x6b\x12\xcc\xd9\x52\xbe\x60\x4e\x82\x2b\x96\xa7\x11\x96\x94\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x3a\x96\xee\x3c\xbf\x82\xeb\x64\xd2\xbd\x6e\x09\x75\x4e\x52\xb7\x4f\xdf\xdc\x91\x2d\xc7\x89\x1d\xcb\x71\x22\x57\x92\xaa\xc9\x59\x10\x09\x51\xb0\x48\x82\x06\x40\x59\xce\xaf\xef\x85\x07\x9f\x52\x36\x1f\x06\xd4\x1a\x88\x20\xb1\xf1\x6d\xec\x0f\x0f\x12\xef\xd7\xc1\xcc\xdd\xef\xd5\xeb\xe0\x86\x86\x24\x13\x24\x0a\x24\x0b\xe4\x86\x04\x67\x39\x0e\x37\x24\x58\xb2\xb5\x7c\xc2\x9c\x04\x97\xac\xc8\x22\x2c\x29\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.7.0-SNAPSHOT.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.7.0.yaml"].(os.FileInfo),
fs["/crd"].(os.FileInfo),
fs["/default"].(os.FileInfo),
fs["/manager"].(os.FileInfo),
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 809f00b..063cdb8 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.4.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.7.0-SNAPSHOT"
+ DefaultRuntimeVersion = "1.7.0"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index 1d315b4..325c5c9 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -17,7 +17,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.4.0-SNAPSHOT
OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION))
LAST_RELEASED_VERSION := 1.3.0
-RUNTIME_VERSION := 1.7.0-SNAPSHOT
+RUNTIME_VERSION := 1.7.0
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
BASE_IMAGE := adoptopenjdk/openjdk11:slim
@@ -32,12 +32,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-1309
# 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 := master
+KAMELET_CATALOG_REPO_BRANCH := v0.1.0
# When packaging artifacts into the docker image, you can "copy" them from
local maven
# or "download" them from Apache Snapshots and Maven Central
@@ -135,7 +135,8 @@ generate-deepcopy: controller-gen
cd pkg/apis/camel && $(CONTROLLER_GEN) paths="./..." object
generate-json-schema:
- ./script/gen_json_schema.sh $(RUNTIME_VERSION) $(STAGING_RUNTIME_REPO)
+ # Skip since the YAML DSL schema has been moved to apache/camel
+ #./script/gen_json_schema.sh $(RUNTIME_VERSION) $(STAGING_RUNTIME_REPO)
generate-strimzi:
cd addons/strimzi/duck && $(CONTROLLER_GEN) paths="./..." object
