This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch release-1.6.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 25dbf7cd3f8c8afebd51ad0c17ca233d81fdce5e Author: nicolaferraro <ni.ferr...@gmail.com> AuthorDate: Tue Sep 7 17:53:11 2021 +0200 chore(release): bump version to 1.6.1-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 | 4 ++-- pkg/util/defaults/defaults.go | 2 +- script/Makefile | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/manager/operator-deployment.yaml b/config/manager/operator-deployment.yaml index 11b4965..3239c52 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 + image: docker.io/apache/camel-k:1.6.1-SNAPSHOT imagePullPolicy: IfNotPresent command: - kamel diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml index fcdfa87..9d58e13 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 + containerImage: docker.io/apache/camel-k:1.6.1-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 22492ae..9e75a3a 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.7.1 # 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 +appVersion: 1.6.1-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 7bbf80e..f4712af 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 + image: docker.io/apache/camel-k:1.6.1-SNAPSHOT platform: build: diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index bbd2960..dce9012 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -142,9 +142,9 @@ var assets = func() http.FileSystem { "/manager/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-deployment.yaml", modTime: time.Time{}, - uncompressedSize: 2388, + uncompressedSize: 2397, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\x41\x73\xe2\x46\x13\xbd\xeb\x57\xbc\x42\x97\xdd\x2a\x1b\xec\x3d\x7c\xb5\xa5\xef\xa4\xd8\x38\x4b\xc5\x01\x0a\xb1\x71\xed\x29\x35\x8c\x1a\xd4\xe5\xd1\xb4\x32\x33\xc0\x92\x5f\x9f\x1a\x81\x30\xb0\x8e\x93\x83\xab\x32\x27\xa4\xee\x7e\xfd\x5e\xf7\xd3\x90\xe2\xfa\xfd\x4e\x92\xe2\x91\x35\x59\x4f\x25\x82\x20\x54\x84\xbc\x51\xba\x22\x14\xb2\x0c\x5b\xe5\x08\x0f\xb2\xb6\xa5\x0a\x2c\x16\x1f\xf2\xe2\xe1\x23\xd6\xb6\x24\x07\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\x41\x8f\xe2\x46\x13\xbd\xfb\x57\x3c\xe1\xcb\xae\x34\xc0\xb0\x87\x4f\x2b\x7f\x27\x67\x86\xc9\xa2\x4c\x00\x61\x36\xa3\x3d\x45\x4d\xbb\xb0\x5b\xd3\xee\x72\xba\xdb\xb0\xce\xaf\x8f\xda\x60\x06\xd8\xc9\x24\x87\x91\xd2\x27\xec\xaa\x7a\xf5\x5e\xd5\x73\x13\x63\xf8\x7e\x27\x8a\xf1\xa8\x24\x19\x47\x39\x3c\xc3\x97\x84\xb4\x16\xb2\x24\x64\xbc\xf5\x7b\x61\x09\x0f\xdc\x98\x5c\x78\xc5\x06\x1f\xd2\xec\xe1\x23\x1a\x93\x93\x05\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 1427d11..d17499b 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" + Version = "1.6.1-SNAPSHOT" // DefaultRuntimeVersion -- DefaultRuntimeVersion = "1.9.0" diff --git a/script/Makefile b/script/Makefile index ba77caf..1dbfe10 100644 --- a/script/Makefile +++ b/script/Makefile @@ -14,9 +14,9 @@ # limitations under the License. VERSIONFILE := pkg/util/defaults/defaults.go -VERSION ?= 1.6.0 +VERSION ?= 1.6.1-SNAPSHOT OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION)) -LAST_RELEASED_VERSION := 1.5.1 +LAST_RELEASED_VERSION := 1.6.0 RUNTIME_VERSION := 1.9.0 BUILDAH_VERSION := 1.14.0 KANIKO_VERSION := 0.17.1 @@ -33,7 +33,7 @@ LINT_DEADLINE := 10m # Used to push pre-release artifacts STAGING_IMAGE_NAME := docker.io/camelk/camel-k -STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1352 +STAGING_RUNTIME_REPO := # Define here the repo containing the default Kamelet catalog (if any) KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git