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 2abfd5f chore(release): bump version to 1.0.0-SNAPSHOT
2abfd5f is described below
commit 2abfd5f4b55cd329af7de7aa7dbcfe6ad1a59520
Author: Nicola Ferraro <ni.ferr...@gmail.com>
AuthorDate: Wed Feb 26 23:56:37 2020 +0100
chore(release): bump version to 1.0.0-SNAPSHOT
---
.../camel-k.v1.0.0-rc2.clusterserviceversion.yaml} | 8 ++++----
.../camel-k/{1.0.0-rc2-snapshot => 1.0.0-rc2}/crd-build.yaml | 0
.../{1.0.0-rc2-snapshot => 1.0.0-rc2}/crd-camel-catalog.yaml | 0
.../{1.0.0-rc2-snapshot => 1.0.0-rc2}/crd-integration-kit.yaml | 0
.../crd-integration-platform.yaml | 0
.../{1.0.0-rc2-snapshot => 1.0.0-rc2}/crd-integration.yaml | 0
.../camel-k.v1.0.0-snapshot.clusterserviceversion.yaml} | 10 +++++-----
.../{1.0.0-rc2-snapshot => 1.0.0-snapshot}/crd-build.yaml | 0
.../crd-camel-catalog.yaml | 0
.../crd-integration-kit.yaml | 0
.../crd-integration-platform.yaml | 0
.../crd-integration.yaml | 0
deploy/olm-catalog/camel-k/camel-k.package.yaml | 2 +-
deploy/operator-deployment.yaml | 2 +-
deploy/resources.go | 8 ++++++++
helm/camel-k/Chart.yaml | 2 +-
helm/camel-k/values.yaml | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 4 ++--
19 files changed, 24 insertions(+), 16 deletions(-)
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc2/camel-k.v1.0.0-rc2.clusterserviceversion.yaml
similarity index 98%
copy from
deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
copy to
deploy/olm-catalog/camel-k/1.0.0-rc2/camel-k.v1.0.0-rc2.clusterserviceversion.yaml
index c6767d9..d2a37a3 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-rc2/camel-k.v1.0.0-rc2.clusterserviceversion.yaml
@@ -70,13 +70,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.0.0-RC2-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.0.0-RC2
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
support: Camel
- name: camel-k-operator.v1.0.0-rc2-SNAPSHOT
+ name: camel-k-operator.v1.0.0-rc2
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -189,7 +189,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:1.0.0-RC2-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-RC2
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -416,4 +416,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-rc2-snapshot
+ version: 1.0.0-rc2
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-build.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc2/crd-build.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-build.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc2/crd-build.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-camel-catalog.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc2/crd-camel-catalog.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-camel-catalog.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc2/crd-camel-catalog.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-kit.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc2/crd-integration-kit.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-kit.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc2/crd-integration-kit.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-platform.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc2/crd-integration-platform.yaml
similarity index 100%
copy from
deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-platform.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc2/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc2/crd-integration.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc2/crd-integration.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml
similarity index 98%
rename from
deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
rename to
deploy/olm-catalog/camel-k/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml
index c6767d9..ac59dc0 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-snapshot/camel-k.v1.0.0-snapshot.clusterserviceversion.yaml
@@ -70,13 +70,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.0.0-RC2-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.0.0-SNAPSHOT
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
support: Camel
- name: camel-k-operator.v1.0.0-rc2-SNAPSHOT
+ name: camel-k-operator.v1.0.0-snapshot
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -189,7 +189,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:1.0.0-RC2-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-SNAPSHOT
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -412,8 +412,8 @@ spec:
minKubeVersion: 1.11.0
provider:
name: The Apache Software Foundation
- replaces: camel-k-operator.v1.0.0-rc1
+ replaces: camel-k-operator.v1.0.0-rc2
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-rc2-snapshot
+ version: 1.0.0-snapshot
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-build.yaml
b/deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-build.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-build.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-build.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-camel-catalog.yaml
b/deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-camel-catalog.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-camel-catalog.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-camel-catalog.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-kit.yaml
b/deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-integration-kit.yaml
similarity index 100%
rename from
deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-kit.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-integration-kit.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-platform.yaml
b/deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-integration-platform.yaml
similarity index 100%
rename from
deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-platform.yaml
rename to
deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration.yaml
b/deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-integration.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-snapshot/crd-integration.yaml
diff --git a/deploy/olm-catalog/camel-k/camel-k.package.yaml
b/deploy/olm-catalog/camel-k/camel-k.package.yaml
index 2693928..1dfb8c1 100644
--- a/deploy/olm-catalog/camel-k/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k/camel-k.package.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
channels:
-- currentCSV: camel-k-operator.v1.0.0-rc2-snapshot
+- currentCSV: camel-k-operator.v1.0.0-snapshot
name: alpha
defaultChannel: alpha
packageName: camel-k
diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index 2c7543e..7871434 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-RC2-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-SNAPSHOT
command:
- kamel
- operator
diff --git a/deploy/resources.go b/deploy/resources.go
index 191ee4e..78bec6a 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -214,6 +214,13 @@ var assets = func() http.FileSystem {
compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x6f\x9b\x40\x14\xbc\xef\xaf\x18\x99\x4b\x22\xf9\xa3\xed\xd1\x3d\xd1\xc4\x56\x51\x23\x5b\x0a\x4e\xa3\x1c\x9f\xe1\x19\x9e\x02\xfb\xe8\xee\x12\xe2\x7f\x5f\x2d\xb6\x9b\x44\xbd\x66\x6f\x88\x61\x3e\x76\x86\x04\xb3\xcf\x3b\x26\xc1\x9d\x14\x6c\x3d\x97\x08\x8a\x50\x33\xd2\x8e\x8a\x9a\x91\xeb\x21\x0c\xe4\x18\x6b\xed\x6d\x49\x41\xd4\xe2\x2a\xcd\xd7\xd7\xe8\x6d\xc9\x0e\x6a\x19\xea\xd0\xaa\x63\x93\xa0\x50\x1b\x9c\xec\x
[...]
},
+ "/operator.yaml": &vfsgen۰CompressedFileInfo{
+ name: "operator.yaml",
+ modTime: time.Time{},
+ uncompressedSize: 2101,
+
+ 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\x3d\xaa\x27\xd5\x71\xb0\x42\x53\xd9\xb0\xbc\x0d\xf6\x54\x4c\xa8\x91\x44\x84\x22\x55\x92\x8a\x56\x7f\x5f\x50\xb6\x13\x3b\xbb\x4d\x7b\x08\xca\x93\xa4\x99\x79\xf3\xde\xcc\x13\x63\xcc\xdf\xef\x44\x31\xee\xa4\x60\xed\xb8\x84\x37\xf0\x0d\x23\xed\x48\x34\x8c\xc2\x54\x7e\x20\xcb\xb8\x35\xbd\x2e\xc9\x4b\xa3\xf1\x21\x2d\x6e\x3f\xa2\xd7\x25\x5b\x18\xcd\x30\x16\x
[...]
+ },
"/platform-cr.yaml": &vfsgen۰CompressedFileInfo{
name: "platform-cr.yaml",
modTime: time.Time{},
@@ -362,6 +369,7 @@ var assets = func() http.FileSystem {
fs["/operator-role-olm.yaml"].(os.FileInfo),
fs["/operator-role-openshift.yaml"].(os.FileInfo),
fs["/operator-service-account.yaml"].(os.FileInfo),
+ fs["/operator.yaml"].(os.FileInfo),
fs["/platform-cr.yaml"].(os.FileInfo),
fs["/platform-integration-kit-groovy.yaml"].(os.FileInfo),
fs["/platform-integration-kit-java.yaml"].(os.FileInfo),
diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index 0d4d587..c7cdd12 100644
--- a/helm/camel-k/Chart.yaml
+++ b/helm/camel-k/Chart.yaml
@@ -35,7 +35,7 @@ version: 0.1.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.0.0-RC2-SNAPSHOT
+appVersion: 1.0.0-SNAPSHOT
icon: https://raw.githubusercontent.com/apache/camel/master/docs/img/logo-d.svg
home: https://camel.apache.org/camel-k/latest/
diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml
index bf7d4d4..685f4c4 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -23,4 +23,4 @@ nameOverride: ""
fullnameOverride: ""
operator:
- image: docker.io/apache/camel-k:1.0.0-RC2-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-SNAPSHOT
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 595dda8..a8dae10 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-RC2-SNAPSHOT"
+ Version = "1.0.0-SNAPSHOT"
// DefaultRuntimeVersion --
DefaultRuntimeVersion = "1.1.0"
diff --git a/script/Makefile b/script/Makefile
index b74cc16..57eea85 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-RC2-SNAPSHOT
-LAST_RELEASED_VERSION := 1.0.0-RC1
+VERSION := 1.0.0-SNAPSHOT
+LAST_RELEASED_VERSION := 1.0.0-RC2
RUNTIME_VERSION := 1.1.0
QUARKUS_VERSION := 1.2.0.Final
BUILDAH_VERSION := 1.14.0
