You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/06/06 07:13:46 UTC
[camel-k] branch release-1.12.x updated (6797daed7 -> 3dbb5042e)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 6797daed7 fix: Avoid build monitor to block builds with maxRunningBuilds=0
new e5f4cc60f fix(ci): temporarily repair upgrade checks
new ec12ca407 fix(e2e): let platform to keep staging settings
new 3dbb5042e fix(ctrl): use builtin command kill
The 3 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:
e2e/global/builder/build_test.go | 21 ++-------------------
e2e/namespace/upgrade/cli_upgrade_test.go | 13 ++++++++++++-
e2e/namespace/upgrade/olm_upgrade_test.go | 3 +++
pkg/controller/build/monitor_pod.go | 2 +-
4 files changed, 18 insertions(+), 21 deletions(-)
[camel-k] 02/03: fix(e2e): let platform to keep staging settings
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ec12ca4074b1a36e814a41ccda6293c7440845a6
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Jun 5 10:35:38 2023 +0200
fix(e2e): let platform to keep staging settings
---
e2e/global/builder/build_test.go | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/e2e/global/builder/build_test.go b/e2e/global/builder/build_test.go
index 6f289c775..746e22051 100644
--- a/e2e/global/builder/build_test.go
+++ b/e2e/global/builder/build_test.go
@@ -60,26 +60,9 @@ func TestKitMaxBuildLimit(t *testing.T) {
WithNewTestNamespace(t, func(ns1 string) {
WithNewTestNamespace(t, func(ns2 string) {
- pl1 := v1.NewIntegrationPlatform(ns1, fmt.Sprintf("camel-k-%s", ns))
- pl.Spec.DeepCopyInto(&pl1.Spec)
- pl1.Spec.Build.Maven.Settings = v1.ValueSource{}
- pl1.SetOperatorID(fmt.Sprintf("camel-k-%s", ns))
- if err := TestClient().Create(TestContext, &pl1); err != nil {
- t.Error(err)
- t.FailNow()
- }
-
+ createOperator(ns1, "500Mi", "8m0s", "--skip-operator-setup", "-x", fmt.Sprintf("camel-k-%s", ns))
Eventually(PlatformPhase(ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
-
- pl2 := v1.NewIntegrationPlatform(ns2, fmt.Sprintf("camel-k-%s", ns))
- pl.Spec.DeepCopyInto(&pl2.Spec)
- pl2.Spec.Build.Maven.Settings = v1.ValueSource{}
- pl2.SetOperatorID(fmt.Sprintf("camel-k-%s", ns))
- if err := TestClient().Create(TestContext, &pl2); err != nil {
- t.Error(err)
- t.FailNow()
- }
-
+ createOperator(ns2, "500Mi", "8m0s", "--skip-operator-setup", "-x", fmt.Sprintf("camel-k-%s", ns))
Eventually(PlatformPhase(ns2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
doKitBuildInNamespace(buildA, ns, TestTimeoutShort, kitOptions{
[camel-k] 01/03: fix(ci): temporarily repair upgrade checks
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e5f4cc60fcdbe42d5b06cbb7a74daaa00901bd7b
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Jun 1 17:05:06 2023 +0200
fix(ci): temporarily repair upgrade checks
Ref #4312
---
e2e/namespace/upgrade/cli_upgrade_test.go | 13 ++++++++++++-
e2e/namespace/upgrade/olm_upgrade_test.go | 3 +++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/e2e/namespace/upgrade/cli_upgrade_test.go b/e2e/namespace/upgrade/cli_upgrade_test.go
index e3f155c87..19f61b5eb 100644
--- a/e2e/namespace/upgrade/cli_upgrade_test.go
+++ b/e2e/namespace/upgrade/cli_upgrade_test.go
@@ -51,7 +51,18 @@ func TestOperatorUpgrade(t *testing.T) {
Expect(os.Setenv("KAMEL_BIN", kamel)).To(Succeed())
// Should both install the CRDs and kamel in the given namespace
- Expect(Kamel("install", "-n", ns, "--olm=false", "--force", "--base-image", defaults.BaseImage()).Execute()).To(Succeed())
+ Expect(Kamel(
+ "install",
+ "-n",
+ ns,
+ "--olm=false",
+ "--force",
+ "--base-image",
+ defaults.BaseImage(),
+ // TODO: remove GOMAXPROCS when https://github.com/apache/camel-k/issues/4312 is closed
+ "--operator-env-vars",
+ "GOMAXPROCS=1",
+ ).Execute()).To(Succeed())
// Check the operator pod is running
Eventually(OperatorPodPhase(ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
diff --git a/e2e/namespace/upgrade/olm_upgrade_test.go b/e2e/namespace/upgrade/olm_upgrade_test.go
index 7325df3e4..1a74dc131 100644
--- a/e2e/namespace/upgrade/olm_upgrade_test.go
+++ b/e2e/namespace/upgrade/olm_upgrade_test.go
@@ -91,6 +91,9 @@ func TestOLMAutomaticUpgrade(t *testing.T) {
"--olm-source", catalogSourceName,
"--olm-source-namespace", ns,
"--base-image", defaults.BaseImage(),
+ // TODO: remove GOMAXPROCS when https://github.com/apache/camel-k/issues/4312 is closed
+ "--operator-env-vars",
+ "GOMAXPROCS=1",
}
if prevUpdateChannel != "" {
[camel-k] 03/03: fix(ctrl): use builtin command kill
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3dbb5042e67c737a7c0ebaed8ad78f84767e803d
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Apr 13 10:53:24 2023 +0200
fix(ctrl): use builtin command kill
The builder Pods may not have a /bin/kill command, but do have a builtin shell kill command available.
Closes #4241
---
pkg/controller/build/monitor_pod.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/controller/build/monitor_pod.go b/pkg/controller/build/monitor_pod.go
index 0cd4bb859..07d078258 100644
--- a/pkg/controller/build/monitor_pod.go
+++ b/pkg/controller/build/monitor_pod.go
@@ -215,7 +215,7 @@ func (action *monitorPodAction) sigterm(pod *corev1.Pod) error {
r.VersionedParams(&corev1.PodExecOptions{
Container: container.Name,
- Command: []string{"kill", "-SIGTERM", "1"},
+ Command: []string{"/bin/bash", "-c", "kill -SIGTERM 1"},
Stdout: true,
Stderr: true,
TTY: false,