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
The following commit(s) were added to refs/heads/main by this push:
new b0eb043 chore(release): bump version to 1.7.0-SNAPSHOT
b0eb043 is described below
commit b0eb0439d1eb15acd887be6b51ffa455cc5dc6e3
Author: nicolaferraro <ni.ferr...@gmail.com>
AuthorDate: Fri Sep 3 17:43:21 2021 +0200
chore(release): bump version to 1.7.0-SNAPSHOT
---
config/manager/operator-deployment.yaml | 2 +-
config/manifests/bases/camel-k.clusterserviceversion.yaml | 2 +-
helm/camel-k/Chart.yaml | 4 ++--
helm/camel-k/values.yaml | 2 +-
pkg/resources/resources.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
release.adoc | 10 +++++++---
script/Makefile | 4 ++--
8 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/config/manager/operator-deployment.yaml
b/config/manager/operator-deployment.yaml
index 414123c..d64c2fa 100644
--- a/config/manager/operator-deployment.yaml
+++ b/config/manager/operator-deployment.yaml
@@ -39,7 +39,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:1.6.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.7.0-SNAPSHOT
imagePullPolicy: IfNotPresent
command:
- kamel
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml
b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 7bba062..601b367 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -22,7 +22,7 @@ metadata:
capabilities: Full Lifecycle
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.6.0-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.7.0-SNAPSHOT
createdAt: 2021-05-03T07:48:00Z
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes, with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.3.0
diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index 0386fa3..c7acd4c 100644
--- a/helm/camel-k/Chart.yaml
+++ b/helm/camel-k/Chart.yaml
@@ -31,11 +31,11 @@ type: application
# This is the chart version. This version number should be incremented each
time you make changes
# to the chart and its templates, including the app version.
-version: 0.7.0
+version: 0.8.0
# This is the version number of the application being deployed. This version
number should be
# incremented each time you make changes to the application.
-appVersion: 1.6.0-SNAPSHOT
+appVersion: 1.7.0-SNAPSHOT
icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png
home: https://camel.apache.org/camel-k/latest/
diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml
index 2ad2c6d..c14011a 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -23,7 +23,7 @@ nameOverride: ""
fullnameOverride: ""
operator:
- image: docker.io/apache/camel-k:1.6.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.7.0-SNAPSHOT
platform:
build:
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 929da2b..a545399 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -144,7 +144,7 @@ var assets = func() http.FileSystem {
modTime: time.Time{},
uncompressedSize: 2397,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\xc1\x6e\xe3\x36\x10\xbd\xeb\x2b\x1e\xac\xcb\x2e\x10\xdb\xc9\x1e\x8a\x85\x7a\x52\x13\xa7\x31\x9a\xda\x86\xe5\x6d\xb0\xa7\x82\xa6\xc6\x12\x11\x8a\xa3\x92\x94\xbd\xea\xd7\x17\x94\x2d\xc7\xf6\xa6\x69\x0f\x01\x96\x27\x4b\x33\xf3\xe6\xbd\x99\x27\x3a\xc6\xf0\xfd\x4e\x14\xe3\x51\x49\x32\x8e\x72\x78\x86\x2f\x09\x69\x2d\x64\x49\xc8\x78\xe3\x77\xc2\x12\xee\xb9\x31\xb9\xf0\x8a\x0d\x3e\xa4\xd9\xfd\x47\x34\x26\x27\x0b\x36\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\xc1\x72\xe2\x46\x10\xbd\xeb\x2b\x5e\xa1\xcb\x6e\x95\x01\x7b\x2f\xd9\x52\x4e\x8a\x8d\x63\x2a\x0e\x50\x88\x8d\x6b\x4f\xa9\x61\xd4\x48\x53\x1e\x4d\x2b\x33\x23\x58\xe5\xeb\x53\x23\x10\x06\xd6\x71\x72\x70\xd5\xce\x09\xa9\xbb\x5f\xbf\xd7\xfd\x34\xc4\x18\xbe\xdf\x89\x62\x3c\x2a\x49\xc6\x51\x0e\xcf\xf0\x25\x21\xad\x85\x2c\x09\x19\x6f\xfc\x4e\x58\xc2\x3d\x37\x26\x17\x5e\xb1\xc1\x87\x34\xbb\xff\x88\xc6\xe4\x64\xc1\x86\x
[...]
},
"/manager/operator-service-account.yaml":
&vfsgen۰CompressedFileInfo{
name: "operator-service-account.yaml",
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 6ad9f37..5467852 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -23,7 +23,7 @@ package defaults
const (
// Version --
- Version = "1.6.0-SNAPSHOT"
+ Version = "1.7.0-SNAPSHOT"
// DefaultRuntimeVersion --
DefaultRuntimeVersion = "1.9.0"
diff --git a/release.adoc b/release.adoc
index eabcafa..8ac74bb 100644
--- a/release.adoc
+++ b/release.adoc
@@ -149,10 +149,14 @@ kamel install
--operator-image=camelk/camel-k:$CAMEL_K_VERSION --maven-repositor
Release notes can be generated with:
-
```
-# Check that VERSION points to the current version and LAST_RELEASED_VERSION
points to the immediately previous one
-make release-notes
+# previous version released on same branch, e.g. 1.5.0
+export PREV=a.b.c
+# current version to be released, e.g. 1.6.0
+export CUR=x.y.z
+# Branch where both tags are present
+export BRANCH=main
+./script/gen_release_notes.sh $PREV $CUR $BRANCH
```
A `release-notes.md` file is generated and can be attached to the release
github issue for reference.
diff --git a/script/Makefile b/script/Makefile
index 1c0d38f..1e0ddbe 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -14,7 +14,7 @@
# limitations under the License.
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION ?= 1.6.0-SNAPSHOT
+VERSION ?= 1.7.0-SNAPSHOT
OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION))
LAST_RELEASED_VERSION := 1.5.1
RUNTIME_VERSION := 1.9.0
@@ -38,7 +38,7 @@ STAGING_RUNTIME_REPO :=
https://repository.apache.org/content/repositories/orgap
# 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 := v0.4.0
+KAMELET_CATALOG_REPO_BRANCH := main
# When packaging artifacts into the docker image, you can "copy" them from
local maven
# or "download" them from Apache Snapshots and Maven Central
