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
commit 204f46e4c40d845703ac25329a42a0c4885382d4 Author: Nicola Ferraro <[email protected]> AuthorDate: Tue Jun 9 15:48:35 2020 +0200 Bump version to 1.1.0-SNAPSHOT and prepare OLM --- .../builds.camel.apache.org.crd.yaml | 0 .../camel-k.v1.0.0.clusterserviceversion.yaml} | 10 +++++----- .../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 .../builds.camel.apache.org.crd.yaml | 0 .../camel-k.v1.1.0-snapshot.clusterserviceversion.yaml} | 14 +++++++------- .../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 | 6 +++--- helm/camel-k/Chart.yaml | 4 ++-- helm/camel-k/values.yaml | 2 +- pkg/util/defaults/defaults.go | 2 +- script/Makefile | 4 ++-- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/builds.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.0.0/builds.camel.apache.org.crd.yaml similarity index 100% copy from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/builds.camel.apache.org.crd.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.0/builds.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k-dev/1.0.0/camel-k.v1.0.0.clusterserviceversion.yaml similarity index 98% copy from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.0/camel-k.v1.0.0.clusterserviceversion.yaml index a7d87b4..cd4592c 100644 --- a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.0.0/camel-k.v1.0.0.clusterserviceversion.yaml @@ -81,17 +81,17 @@ metadata: }, "spec": {} }] - capabilities: Basic Install + capabilities: Full Lifecycle categories: Integration & Delivery certified: "false" - containerImage: docker.io/apache/camel-k:1.0.0-SNAPSHOT + containerImage: docker.io/apache/camel-k:1.0.0 createdAt: "2019-07-26T02: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.0.0-snapshot + name: camel-k-operator.v1.0.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -226,7 +226,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/apache/camel-k:1.0.0-SNAPSHOT + image: docker.io/apache/camel-k:1.0.0 imagePullPolicy: IfNotPresent name: camel-k-operator resources: {} @@ -468,4 +468,4 @@ spec: selector: matchLabels: name: camel-k-operator - version: 1.0.0-snapshot + version: 1.0.0 diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camelcatalogs.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.0.0/camelcatalogs.camel.apache.org.crd.yaml similarity index 100% copy from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camelcatalogs.camel.apache.org.crd.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.0/camelcatalogs.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrationkits.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.0.0/integrationkits.camel.apache.org.crd.yaml similarity index 100% copy from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrationkits.camel.apache.org.crd.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.0/integrationkits.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrationplatforms.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.0.0/integrationplatforms.camel.apache.org.crd.yaml similarity index 100% copy from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrationplatforms.camel.apache.org.crd.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.0/integrationplatforms.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrations.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.0.0/integrations.camel.apache.org.crd.yaml similarity index 100% copy from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrations.camel.apache.org.crd.yaml copy to deploy/olm-catalog/camel-k-dev/1.0.0/integrations.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/builds.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/builds.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/builds.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/builds.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camel-k.v1.1.0-snapshot.clusterserviceversion.yaml similarity index 97% rename from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camel-k.v1.1.0-snapshot.clusterserviceversion.yaml index a7d87b4..4cc81c8 100644 --- a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camel-k.v1.1.0-snapshot.clusterserviceversion.yaml @@ -81,17 +81,17 @@ metadata: }, "spec": {} }] - capabilities: Basic Install + capabilities: Full Lifecycle categories: Integration & Delivery certified: "false" - containerImage: docker.io/apache/camel-k:1.0.0-SNAPSHOT - createdAt: "2019-07-26T02:45:00Z" + containerImage: docker.io/apache/camel-k:1.1.0-SNAPSHOT + 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.0.0-snapshot + name: camel-k-operator.v1.1.0-snapshot namespace: placeholder spec: apiservicedefinitions: {} @@ -226,7 +226,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/apache/camel-k:1.0.0-SNAPSHOT + image: docker.io/apache/camel-k:1.1.0-SNAPSHOT imagePullPolicy: IfNotPresent name: camel-k-operator resources: {} @@ -464,8 +464,8 @@ spec: minKubeVersion: 1.11.0 provider: name: The Apache Software Foundation - replaces: camel-k-operator.v1.0.0-rc2 + replaces: camel-k-operator.v1.0.0 selector: matchLabels: name: camel-k-operator - version: 1.0.0-snapshot + version: 1.1.0-snapshot diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camelcatalogs.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camelcatalogs.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/camelcatalogs.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/camelcatalogs.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrationkits.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrationkits.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrationkits.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrationkits.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrationplatforms.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrationplatforms.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrationplatforms.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrationplatforms.camel.apache.org.crd.yaml diff --git a/deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrations.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrations.camel.apache.org.crd.yaml similarity index 100% rename from deploy/olm-catalog/camel-k-dev/1.0.0-snapshot/integrations.camel.apache.org.crd.yaml rename to deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/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 b08fcb2..fec2def 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.0.0-snapshot +- currentCSV: camel-k-operator.v1.1.0-snapshot 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 7871434..d63a292 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.0.0-SNAPSHOT + image: docker.io/apache/camel-k:1.1.0-SNAPSHOT command: - kamel - operator diff --git a/deploy/resources.go b/deploy/resources.go index 6ee950c..8b5ec60 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -149,7 +149,7 @@ var assets = func() http.FileSystem { modTime: time.Time{}, uncompressedSize: 2148, - 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\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 [...] }, "/operator-role-binding-events.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-role-binding-events.yaml", @@ -354,9 +354,9 @@ var assets = func() http.FileSystem { "/traits.yaml": &vfsgen۰CompressedFileInfo{ name: "traits.yaml", modTime: time.Time{}, - uncompressedSize: 32888, + uncompressedSize: 33233, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xed\x6e\x1c\x37\x96\xe8\x7f\x3f\x05\xa1\x7b\x01\x7d\xa0\xbb\x24\x67\x90\x49\x46\xf7\xfa\x06\xba\xb6\x33\xa3\x24\xb6\xb5\xb6\x32\xb3\x8b\x6c\x30\xcd\xae\x3a\xdd\xcd\x88\x45\xd6\x90\x2c\xc9\x9d\xc5\x02\xfb\x1a\xfb\x7a\xfb\x24\x8b\x73\xf8\x51\xac\xea\x92\x54\x72\xa2\x20\x02\x36\xf9\x61\xb5\x54\x75\x78\x78\x78\xbe\x3f\xd8\xce\x70\xe1\xec\xe9\xb3\x39\x53\xbc\x86\x53\xc6\x57\x2b\xa1\x84\xdb\x3e\x63\xac\x91\xdc\xad\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x6e\x24\x37\xf2\xd8\xff\xfb\x14\x84\x12\x40\x1f\x98\x69\xed\xfa\xe0\xb3\x4f\x89\x73\x50\xd6\xbe\x3b\xd9\xde\xb5\xb2\xbb\x77\x97\xe0\x72\xb8\xe1\x74\xd7\xcc\xd0\xea\x26\xfb\x47\xb2\x47\x3b\x0e\x02\xe4\x35\xf2\x7a\x79\x92\xa0\xaa\x48\x36\xbb\xa7\x25\x8d\xd6\x96\x61\x01\x3f\xec\x1f\xab\x91\xba\x8b\xc5\x62\x7d\x7f\x70\xbc\x95\xca\xbb\x8b\x17\x73\xa1\x65\x03\x17\x42\xae\x56\x4a\x2b\xbf\x7b\x21\x44\x5b\x4b\xbf\x [...] }, "/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{ name: "user-cluster-role.yaml", diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml index 701c2dc..913235f 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.2.1 +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.0.0-SNAPSHOT +appVersion: 1.1.0-SNAPSHOT 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 71a2cad..4728cd2 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.0.0-SNAPSHOT + image: docker.io/apache/camel-k:1.1.0-SNAPSHOT platform: build: diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index 63d8066..51d7270 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -23,7 +23,7 @@ package defaults const ( // Version -- - Version = "1.0.0-SNAPSHOT" + Version = "1.1.0-SNAPSHOT" // DefaultRuntimeVersion -- DefaultRuntimeVersion = "1.3.0" diff --git a/script/Makefile b/script/Makefile index 014c0fb..bd110ae 100644 --- a/script/Makefile +++ b/script/Makefile @@ -14,8 +14,8 @@ # limitations under the License. VERSIONFILE := pkg/util/defaults/defaults.go -VERSION := 1.0.0-SNAPSHOT -LAST_RELEASED_VERSION := 1.0.0-RC2 +VERSION := 1.1.0-SNAPSHOT +LAST_RELEASED_VERSION := 1.0.0 RUNTIME_VERSION := 1.3.0 BUILDAH_VERSION := 1.14.0 KANIKO_VERSION := 0.17.1
