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/12/20 09:29:45 UTC
[camel-k] branch master updated (aaf63fa -> ab3d996)
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 aaf63fa chore(release): fix missing licenses
new 38ebd66 chore(release): bump version to 1.0.0-RC2-SNAPSHOT
new ab3d996 chore(test): give some time on operator scale down to fix flacky tests
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:
.../camel-k.v1.0.0-rc1.clusterserviceversion.yaml} | 8 ++++----
.../camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-build.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-camel-catalog.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration-kit.yaml | 0
.../crd-integration-platform.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration.yaml | 0
.../camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml} | 10 +++++-----
.../{1.0.0-rc1-snapshot => 1.0.0-rc2-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 | 2 +-
e2e/test_support.go | 6 +++---
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
18 files changed, 17 insertions(+), 17 deletions(-)
copy deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml => 1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml} (98%)
copy deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-build.yaml (100%)
copy deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-camel-catalog.yaml (100%)
copy deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration-kit.yaml (100%)
copy deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration-platform.yaml (100%)
copy deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml => 1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml} (98%)
rename deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc2-snapshot}/crd-build.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc2-snapshot}/crd-camel-catalog.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc2-snapshot}/crd-integration-kit.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc2-snapshot}/crd-integration-platform.yaml (100%)
rename deploy/olm-catalog/camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc2-snapshot}/crd-integration.yaml (100%)
[camel-k] 02/02: chore(test): give some time on operator scale down
to fix flacky tests
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 ab3d996eeb817be8482ba039280011707340a3d1
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Fri Dec 20 09:57:15 2019 +0100
chore(test): give some time on operator scale down to fix flacky tests
---
e2e/test_support.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/e2e/test_support.go b/e2e/test_support.go
index a05066d..d9f437c 100644
--- a/e2e/test_support.go
+++ b/e2e/test_support.go
@@ -486,10 +486,10 @@ func operatorPod(ns string) func() *corev1.Pod {
}
}
-func operatorTryPodForceKill(ns string) {
+func operatorTryPodForceKill(ns string, timeSeconds int) {
pod := operatorPod(ns)()
if pod != nil {
- if err := testClient.Delete(testContext, pod, k8sclient.GracePeriodSeconds(0)); err != nil {
+ if err := testClient.Delete(testContext, pod, k8sclient.GracePeriodSeconds(timeSeconds)); err != nil {
log.Error(err, "cannot forcefully kill the pod")
}
}
@@ -526,7 +526,7 @@ func scaleOperator(ns string, replicas int32) func() error {
if replicas == 0 {
// speedup scale down by killing the pod
- operatorTryPodForceKill(ns)
+ operatorTryPodForceKill(ns, 10)
}
return nil
}
[camel-k] 01/02: chore(release): bump version to 1.0.0-RC2-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 38ebd66383be48993b296f3b77a3c4c3d18bffdd
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Fri Dec 20 09:50:35 2019 +0100
chore(release): bump version to 1.0.0-RC2-SNAPSHOT
---
.../camel-k.v1.0.0-rc1.clusterserviceversion.yaml} | 8 ++++----
.../camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-build.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-camel-catalog.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration-kit.yaml | 0
.../crd-integration-platform.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration.yaml | 0
.../camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml} | 10 +++++-----
.../{1.0.0-rc1-snapshot => 1.0.0-rc2-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 | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
17 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
similarity index 98%
copy from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
index 9ce7df6..307e604 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
@@ -66,13 +66,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.0.0-RC1-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.0.0-RC1
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-rc1-SNAPSHOT
+ name: camel-k-operator.v1.0.0-rc1
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -185,7 +185,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:1.0.0-RC1-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-RC1
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -399,4 +399,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-rc1-snapshot
+ version: 1.0.0-rc1
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-build.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-build.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-camel-catalog.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-camel-catalog.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration-kit.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration-kit.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration-platform.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration.yaml
similarity index 100%
copy from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml
copy to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
similarity index 98%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
index 9ce7df6..df1dc6f 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
@@ -66,13 +66,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
- containerImage: docker.io/apache/camel-k:1.0.0-RC1-SNAPSHOT
+ containerImage: docker.io/apache/camel-k:1.0.0-RC2-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-rc1-SNAPSHOT
+ name: camel-k-operator.v1.0.0-rc2-SNAPSHOT
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -185,7 +185,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: docker.io/apache/camel-k:1.0.0-RC1-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-RC2-SNAPSHOT
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -395,8 +395,8 @@ spec:
minKubeVersion: 1.11.0
provider:
name: The Apache Software Foundation
- replaces: camel-k-operator.v1.0.0-m4
+ replaces: camel-k-operator.v1.0.0-rc1
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-rc1-snapshot
+ version: 1.0.0-rc2-snapshot
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-build.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-build.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-camel-catalog.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-camel-catalog.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-kit.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-kit.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-platform.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/crd-integration.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc2-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 7ca59a7..2693928 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-rc1-snapshot
+- currentCSV: camel-k-operator.v1.0.0-rc2-snapshot
name: alpha
defaultChannel: alpha
packageName: camel-k
diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index 7bbd4a8..2c7543e 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-RC1-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-RC2-SNAPSHOT
command:
- kamel
- operator
diff --git a/deploy/resources.go b/deploy/resources.go
index cec53a4..5c19f1f 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -4165,7 +4165,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:1.0.0-RC1-SNAPSHOT
+ image: docker.io/apache/camel-k:1.0.0-RC2-SNAPSHOT
command:
- kamel
- operator
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 7f88f56..9a50e8a 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-RC1-SNAPSHOT"
+ Version = "1.0.0-RC2-SNAPSHOT"
// DefaultCamelVersion --
DefaultCamelVersion = "3.0.0"
diff --git a/script/Makefile b/script/Makefile
index 163bcf6..3ddaca8 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-RC1-SNAPSHOT
+VERSION := 1.0.0-RC2-SNAPSHOT
LAST_RELEASED_VERSION := 1.0.0-M4
RUNTIME_VERSION := 1.0.9
CAMEL_VERSION := 3.0.0