You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2019/10/07 08:28:11 UTC
[camel-k] branch master updated (bee432b -> ee1b8d3)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from bee432b fix #972: strip local host data from build
add 956735d fix #944: prepare release
add 44292ec fix #944: fix failing tests
add ad71e6e fix #944: fix yaml examples
new 2c183d1 upgrade to M3-SNAPSHOT
new ee1b8d3 chore(release): Prepare env for next dev iteration
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cmd/manager | 1 +
...-M4.yaml => camel-catalog-3.0.0-RC1-1.0.4.yaml} | 125 ++++++++++----------
.../camel-k.v1.0.0-M2.clusterserviceversion.yaml} | 11 +-
.../{1.0.0-M2-SNAPSHOT => 1.0.0-M2}/crd-build.yaml | 0
.../crd-camel-catalog.yaml | 0
.../crd-integration-kit.yaml | 0
.../crd-integration-platform.yaml | 0
.../camel-k/1.0.0-M2}/crd-integration.yaml | 0
....v1.0.0-m3-SNAPSHOT.clusterserviceversion.yaml} | 11 +-
.../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 | 129 +++++++++++----------
e2e/files/yaml.yaml | 3 +-
e2e/test_staging_hooks.go | 6 +-
examples/routes.yaml | 3 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 5 +
pkg/builder/builder_steps_test.go | 4 +
pkg/metadata/metadata_dependencies_test.go | 28 ++---
pkg/util/defaults/defaults.go | 6 +-
pkg/util/test/catalog_test.go | 2 +-
script/Makefile | 8 +-
script/build_catalog.sh | 1 +
script/build_olm.sh | 2 +-
28 files changed, 185 insertions(+), 164 deletions(-)
create mode 120000 cmd/manager
rename deploy/{camel-catalog-3.0.0-M4.yaml => camel-catalog-3.0.0-RC1-1.0.4.yaml} (97%)
copy deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-m2-SNAPSHOT.clusterserviceversion.yaml => 1.0.0-M2/camel-k.v1.0.0-M2.clusterserviceversion.yaml} (98%)
copy deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M2}/crd-build.yaml (100%)
copy deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M2}/crd-camel-catalog.yaml (100%)
copy deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M2}/crd-integration-kit.yaml (100%)
copy deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M2}/crd-integration-platform.yaml (100%)
copy deploy/{ => olm-catalog/camel-k/1.0.0-M2}/crd-integration.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT/camel-k.v1.0.0-m2-SNAPSHOT.clusterserviceversion.yaml => 1.0.0-M3-SNAPSHOT/camel-k.v1.0.0-m3-SNAPSHOT.clusterserviceversion.yaml} (97%)
rename deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M3-SNAPSHOT}/crd-build.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M3-SNAPSHOT}/crd-camel-catalog.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M3-SNAPSHOT}/crd-integration-kit.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M3-SNAPSHOT}/crd-integration-platform.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-M2-SNAPSHOT => 1.0.0-M3-SNAPSHOT}/crd-integration.yaml (100%)
[camel-k] 01/02: upgrade to M3-SNAPSHOT
Posted by nf...@apache.org.
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 2c183d138734721ad91937fe8225fdf9108f32cb
Author: nferraro <ni...@gmail.com>
AuthorDate: Mon Oct 7 10:05:31 2019 +0200
upgrade to M3-SNAPSHOT
---
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index a223cd7..cc780cf 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -22,7 +22,7 @@ package defaults
const (
// Version --
- Version = "1.0.0-M2"
+ Version = "1.0.0-M3-SNAPSHOT"
// CamelVersionConstraint --
CamelVersionConstraint = ">=3.0.0-RC1"
diff --git a/script/Makefile b/script/Makefile
index 55164a7..9be6b22 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -14,7 +14,7 @@
# limitations under the License.
VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION := 1.0.0-M2
+VERSION := 1.0.0-M3-SNAPSHOT
LAST_RELEASED_VERSION := 1.0.0-M1
RUNTIME_VERSION := 1.0.4
CAMEL_VERSION := 3.0.0-RC1
[camel-k] 02/02: chore(release): Prepare env for next dev iteration
Posted by nf...@apache.org.
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 ee1b8d34961df9553abc7e364e965f00dbbe2bb0
Author: nferraro <ni...@gmail.com>
AuthorDate: Mon Oct 7 10:27:59 2019 +0200
chore(release): Prepare env for next dev iteration
---
.../camel-k/1.0.0-M2/camel-k.v1.0.0-M2.clusterserviceversion.yaml | 2 +-
deploy/operator-deployment.yaml | 2 +-
deploy/resources.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/deploy/olm-catalog/camel-k/1.0.0-M2/camel-k.v1.0.0-M2.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/1.0.0-M2/camel-k.v1.0.0-M2.clusterserviceversion.yaml
index 22d5f4c..59812d4 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-M2/camel-k.v1.0.0-M2.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-M2/camel-k.v1.0.0-M2.clusterserviceversion.yaml
@@ -168,7 +168,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:1.0.0-M2-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M2
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index 6b69b29..bebf2b8 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-M2-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M3-SNAPSHOT
command:
- kamel
- operator
diff --git a/deploy/resources.go b/deploy/resources.go
index 4ba646e..2a59ae0 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -2775,7 +2775,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:1.0.0-M2-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-M3-SNAPSHOT
command:
- kamel
- operator