This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to tag v1.1.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 29d581a49eacb4d191ff665a559fdd569c6deef7 Author: Nicola Ferraro <ni.ferr...@gmail.com> AuthorDate: Tue Jul 21 14:57:54 2020 +0200 Release 1.1.0 --- .asf.yaml | 17 +++++++++++++++++ .github/workflows/backport.yml | 17 +++++++++++++++++ .../builds.camel.apache.org.crd.yaml | 0 .../camel-k.v1.1.0.clusterserviceversion.yaml} | 8 ++++---- .../camelcatalogs.camel.apache.org.crd.yaml | 0 .../integrationkits.camel.apache.org.crd.yaml | 0 .../integrationplatforms.camel.apache.org.crd.yaml | 0 .../integrations.camel.apache.org.crd.yaml | 0 deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml | 2 +- deploy/operator-deployment.yaml | 2 +- deploy/resources.go | 4 ++-- go.mod | 4 ++-- helm/camel-k/Chart.yaml | 2 +- helm/camel-k/values.yaml | 2 +- pkg/client/camel/go.mod | 2 +- pkg/util/defaults/defaults.go | 2 +- script/Makefile | 2 +- 17 files changed, 49 insertions(+), 15 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 3a93585..f9eb97c 100644 --- a/.asf.yaml +++ b/.asf.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. +# --------------------------------------------------------------------------- + github: description: "Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers" homepage: https://camel.apache.org diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 9c4f5a0..ef5c776 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -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. +# --------------------------------------------------------------------------- + name: Backport on: pull_request: diff --git a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/builds.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0/builds.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/builds.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0/builds.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camel-k.v1.1.0-snapshot.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0/camel-k.v1.1.0.clusterserviceversion.yaml similarity index 98% rename from deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camel-k.v1.1.0-snapshot.clusterserviceversion.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0/camel-k.v1.1.0.clusterserviceversion.yaml index 4cc81c8..e0fd502 100644 --- a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camel-k.v1.1.0-snapshot.clusterserviceversion.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.1.0/camel-k.v1.1.0.clusterserviceversion.yaml @@ -84,14 +84,14 @@ metadata: capabilities: Full Lifecycle categories: Integration & Delivery certified: "false" - containerImage: docker.io/apache/camel-k:1.1.0-SNAPSHOT + containerImage: docker.io/apache/camel-k:1.1.0 createdAt: "2020-06-09T02:45:00Z" description: Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers. repository: https://github.com/apache/camel-k operators.operatorframework.io/internal-objects: '["builds.camel.apache.org","integrationkits.camel.apache.org","camelcatalogs.camel.apache.org"]' support: Camel - name: camel-k-operator.v1.1.0-snapshot + name: camel-k-operator.v1.1.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -226,7 +226,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/apache/camel-k:1.1.0-SNAPSHOT + image: docker.io/apache/camel-k:1.1.0 imagePullPolicy: IfNotPresent name: camel-k-operator resources: {} @@ -468,4 +468,4 @@ spec: selector: matchLabels: name: camel-k-operator - version: 1.1.0-snapshot + version: 1.1.0 diff --git a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camelcatalogs.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0/camelcatalogs.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camelcatalogs.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0/camelcatalogs.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrationkits.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0/integrationkits.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrationkits.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0/integrationkits.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrationplatforms.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0/integrationplatforms.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrationplatforms.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0/integrationplatforms.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrations.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0/integrations.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrations.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0/integrations.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml b/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml index fec2def..53d4b93 100644 --- a/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml +++ b/deploy/olm-catalog/camel-k-dev/camel-k-dev.package.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- channels: -- currentCSV: camel-k-operator.v1.1.0-snapshot +- currentCSV: camel-k-operator.v1.1.0 name: stable - currentCSV: camel-k-operator.v1.0.0-rc2 name: alpha diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml index d63a292..fb77996 100644 --- a/deploy/operator-deployment.yaml +++ b/deploy/operator-deployment.yaml @@ -39,7 +39,7 @@ spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:1.1.0-SNAPSHOT + image: docker.io/apache/camel-k:1.1.0 command: - kamel - operator diff --git a/deploy/resources.go b/deploy/resources.go index c43e536..fcc7a57 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -147,9 +147,9 @@ var assets = func() http.FileSystem { "/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-deployment.yaml", modTime: time.Time{}, - uncompressedSize: 2148, + uncompressedSize: 2139, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x54\xc1\x6e\xe3\x36\x10\xbd\xeb\x2b\x1e\xac\xcb\x2e\x10\xdb\x9b\x1e\xd5\x93\x9a\x38\x88\xd1\x54\x32\x2c\x6f\x83\x3d\x15\x13\x6a\x24\x11\xa1\x48\x95\xa4\xa2\xd5\xdf\x17\x94\xed\xc4\xce\x66\xd3\x1e\x82\xf2\x64\x73\x66\xde\xbc\x37\x6f\xc4\x18\xf3\x8f\x3b\x51\x8c\x3b\x29\x58\x3b\x2e\xe1\x0d\x7c\xc3\x48\x3b\x12\x0d\xa3\x30\x95\x1f\xc8\x32\x6e\x4c\xaf\x4b\xf2\xd2\x68\x7c\x4a\x8b\x9b\xcf\xe8\x75\xc9\x16\x46\x33\x8c\x45\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x54\xc1\x6e\xe3\x36\x14\xbc\xeb\x2b\x06\xd6\x65\x17\x88\xed\x4d\x8f\xea\x49\x4d\x1c\xac\xd0\xad\x6c\x58\xde\x06\x7b\x2a\x5e\xa8\x27\x89\x08\x45\xaa\x24\x15\xad\xfe\xbe\xa0\x6c\xc7\x76\x36\x9b\xf6\x10\x94\x27\x9b\x1c\xce\x9b\x79\xf3\xc4\x18\xf3\xf7\x5b\x51\x8c\x2f\x52\xb0\x76\x5c\xc2\x1b\xf8\x86\x91\x76\x24\x1a\x46\x61\x2a\x3f\x90\x65\xdc\x99\x5e\x97\xe4\xa5\xd1\xf8\x90\x16\x77\x1f\xd1\xeb\x92\x2d\x8c\x66\x18\x8b\x [...] }, "/operator-role-binding-events.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-role-binding-events.yaml", diff --git a/go.mod b/go.mod index b292d07..7733378 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.13 require ( github.com/Masterminds/semver v1.5.0 - github.com/apache/camel-k/pkg/apis/camel v0.0.0 - github.com/apache/camel-k/pkg/client/camel v0.0.0 + github.com/apache/camel-k/pkg/apis/camel v1.1.0 + github.com/apache/camel-k/pkg/client/camel v1.1.0 github.com/container-tools/spectrum v0.3.2 github.com/coreos/prometheus-operator v0.38.1-0.20200424145508-7e176fda06cc github.com/evanphx/json-patch v4.5.0+incompatible diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml index 913235f..1c12f0c 100644 --- a/helm/camel-k/Chart.yaml +++ b/helm/camel-k/Chart.yaml @@ -35,7 +35,7 @@ version: 0.3.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.1.0-SNAPSHOT +appVersion: 1.1.0 icon: https://github.com/apache/camel/raw/master/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 4728cd2..4523887 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.1.0-SNAPSHOT + image: docker.io/apache/camel-k:1.1.0 platform: build: diff --git a/pkg/client/camel/go.mod b/pkg/client/camel/go.mod index be09399..f02023e 100644 --- a/pkg/client/camel/go.mod +++ b/pkg/client/camel/go.mod @@ -3,7 +3,7 @@ module github.com/apache/camel-k/pkg/client/camel go 1.13 require ( - github.com/apache/camel-k/pkg/apis/camel v0.0.0 + github.com/apache/camel-k/pkg/apis/camel v1.1.0 k8s.io/apimachinery v0.18.2 k8s.io/client-go v0.18.2 ) diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index a2b2a84..fb13e14 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -23,7 +23,7 @@ package defaults const ( // Version -- - Version = "1.1.0-SNAPSHOT" + Version = "1.1.0" // DefaultRuntimeVersion -- DefaultRuntimeVersion = "1.4.1" diff --git a/script/Makefile b/script/Makefile index fabc398..217c50b 100644 --- a/script/Makefile +++ b/script/Makefile @@ -14,7 +14,7 @@ # limitations under the License. VERSIONFILE := pkg/util/defaults/defaults.go -VERSION := 1.1.0-SNAPSHOT +VERSION := 1.1.0 LAST_RELEASED_VERSION := 1.0.1 RUNTIME_VERSION := 1.4.1 BUILDAH_VERSION := 1.14.0