You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cd...@apache.org on 2024/03/08 19:35:53 UTC
(camel-k) branch main updated (b986989b8 -> 39097a550)
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from b986989b8 fix(trait): revert persisted status
new 773622571 chore(e2e): Improve E2E tests
new 4e2db21a8 chore(e2e): Run E2E tests in parallel
new c39835610 chore(e2e): Use fresh Gomega instance for each test
new 19199b2ec chore(e2e): Use operator instance per package in common tests
new fc225f188 chore(e2e): Fix concurrent access to viper flags
new fcd6f33e4 chore(e2e): Skip cluster setup when installing Camel K operators in test namespaces
new 92ea86144 chore(e2e): Use separate operator instances for trait e2e tests
new e0803311e chore(e2e): Synchronize kamel install command in e2e tests
new 5fa6aaf2d chore(e2e): Use separate viper instance per command
new 39097a550 chore(e2e): Fix E2E tests
The 10 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:
.github/actions/e2e-common/exec-tests.sh | 2 +
e2e/advanced/build_order_strategy_test.go | 184 ++--
e2e/advanced/builder_test.go | 47 +-
e2e/advanced/catalog_builder_test.go | 94 +-
e2e/advanced/debug_test.go | 61 +-
e2e/advanced/deployment_test.go | 23 +-
e2e/advanced/dump_test.go | 33 +-
e2e/advanced/environment_test.go | 61 +-
e2e/advanced/incremental_build_test.go | 220 +++--
e2e/advanced/integration_profile_test.go | 118 +--
e2e/advanced/kamelet_repo_test.go | 31 +-
e2e/advanced/local_platform_test.go | 98 +-
e2e/advanced/main_test.go | 75 ++
e2e/advanced/maven_http_proxy_test.go | 75 +-
e2e/advanced/operator_id_filtering_test.go | 102 +-
e2e/advanced/operator_metrics_test.go | 156 +--
e2e/advanced/platform_traits_test.go | 37 +-
e2e/advanced/promote_test.go | 134 +--
e2e/advanced/reset_test.go | 63 +-
e2e/advanced/synthetic_test.go | 90 +-
e2e/advanced/tekton_test.go | 16 +-
e2e/builder/build_test.go | 168 ++--
e2e/builder/registry_test.go | 34 +-
e2e/common/cli/bind_test.go | 56 +-
e2e/common/cli/config_test.go | 42 +-
e2e/common/cli/default.go | 9 +-
e2e/common/cli/delete_test.go | 76 +-
e2e/common/cli/describe_test.go | 66 +-
e2e/common/cli/dev_mode_test.go | 193 ++--
e2e/common/cli/duplicate_parameters_test.go | 4 +-
e2e/common/cli/get_test.go | 78 +-
e2e/common/cli/help_test.go | 28 +-
e2e/common/cli/log_test.go | 40 +-
.../startup_test.go => common/cli/main_test.go} | 47 +-
e2e/common/cli/offline_commands_test.go | 23 +-
e2e/common/cli/run_test.go | 337 ++++---
e2e/common/cli/version_test.go | 6 +-
e2e/common/config/config_reload_test.go | 233 +++--
e2e/common/config/config_test.go | 588 ++++++-----
e2e/common/config/default.go | 26 -
e2e/common/config/kamelet_config_test.go | 625 ++++++------
e2e/common/config/pipe_config_test.go | 397 ++++----
e2e/common/languages/default.go | 26 -
e2e/common/languages/groovy_test.go | 29 +-
e2e/common/languages/java_test.go | 29 +-
e2e/common/languages/js_test.go | 29 +-
e2e/common/languages/kotlin_test.go | 29 +-
e2e/common/languages/polyglot_test.go | 33 +-
e2e/common/languages/xml_test.go | 29 +-
e2e/common/languages/yaml_test.go | 29 +-
e2e/common/main_test.go | 65 ++
e2e/common/misc/client_test.go | 45 +-
e2e/common/misc/cron_test.go | 83 +-
e2e/common/misc/default.go | 26 -
e2e/common/misc/integration_fail_test.go | 301 +++---
e2e/common/misc/integration_trait_update_test.go | 39 +-
e2e/common/misc/kamelet_test.go | 62 +-
e2e/common/misc/kamelet_update_test.go | 33 +-
e2e/common/misc/maven_repository_test.go | 44 +-
e2e/common/misc/pipe_test.go | 155 +--
e2e/common/misc/pipe_with_image_test.go | 128 +--
e2e/common/misc/registry_maven_wagon_test.go | 197 ++--
e2e/common/misc/rest_test.go | 68 +-
e2e/common/misc/scale_binding_test.go | 185 ++--
e2e/common/misc/scale_integration_test.go | 184 ++--
e2e/common/misc/structured_logs_test.go | 63 +-
e2e/common/runtimes/default.go | 26 -
e2e/common/runtimes/runtimes_test.go | 76 +-
e2e/common/support/startup_test.go | 51 -
e2e/common/support/teardown_test.go | 40 -
e2e/common/traits/affinity_test.go | 159 +--
e2e/common/traits/builder_test.go | 493 +++++-----
e2e/common/traits/camel_test.go | 71 +-
e2e/common/traits/container_test.go | 149 +--
e2e/common/traits/default.go | 26 -
e2e/common/traits/deployment_test.go | 135 +--
e2e/common/traits/error_handler_test.go | 39 +-
e2e/common/traits/errored_trait_test.go | 85 +-
e2e/common/traits/health_test.go | 773 +++++++--------
e2e/common/traits/istio_test.go | 61 +-
e2e/common/traits/jolokia_test.go | 76 +-
e2e/common/traits/jvm_test.go | 67 +-
e2e/common/traits/kamelet_test.go | 59 +-
e2e/common/traits/master_test.go | 90 +-
e2e/common/traits/openapi_test.go | 64 +-
e2e/common/traits/pdb_test.go | 213 ++--
e2e/common/traits/pod_test.go | 121 +--
e2e/common/traits/prometheus_test.go | 87 +-
e2e/common/traits/pull_secret_test.go | 121 +--
e2e/common/traits/route_test.go | 313 +++---
e2e/common/traits/service_binding_test.go | 139 +--
e2e/common/traits/service_test.go | 176 ++--
e2e/common/traits/toleration_test.go | 185 ++--
e2e/install/cli/global_kamelet_test.go | 38 +-
e2e/install/cli/global_test.go | 138 ++-
e2e/install/cli/install_test.go | 114 +--
e2e/install/cli/maven_ca_secret_test.go | 70 +-
e2e/install/cli/uninstall_test.go | 104 +-
e2e/install/helm/setup_test.go | 32 +-
e2e/install/kustomize/operator_test.go | 85 +-
e2e/install/kustomize/setup_test.go | 42 +-
e2e/install/kustomize/uninstall_test.go | 81 +-
e2e/install/olm/olm_install_test.go | 42 +-
e2e/install/upgrade/cli_upgrade_test.go | 79 +-
e2e/install/upgrade/helm_upgrade_test.go | 81 +-
e2e/install/upgrade/olm_upgrade_test.go | 134 +--
e2e/knative/default.go | 9 +-
e2e/knative/kamelet_test.go | 32 +-
e2e/knative/knative_platform_test.go | 48 +-
e2e/knative/knative_test.go | 150 +--
e2e/knative/openapi_test.go | 16 +-
e2e/knative/pod_test.go | 20 +-
e2e/knative/support/teardown_test.go | 40 -
e2e/native/native_binding_test.go | 26 +-
e2e/native/native_test.go | 92 +-
e2e/native/native_with_sources_test.go | 68 +-
e2e/support/csv.go | 37 +-
e2e/support/test_nexus_hooks.go | 2 +-
e2e/support/test_support.go | 1024 +++++++++++---------
e2e/support/test_util.go | 35 +-
e2e/support/util/dump.go | 2 +-
e2e/telemetry/telemetry_test.go | 46 +-
pkg/apis/camel/v1/kamelet_types_support.go | 5 +
pkg/cmd/bind.go | 2 +-
pkg/cmd/bind_test.go | 2 +-
pkg/cmd/builder.go | 2 +-
pkg/cmd/builder_test.go | 2 +-
pkg/cmd/config.go | 2 +-
pkg/cmd/config_test.go | 2 +-
pkg/cmd/debug.go | 2 +-
pkg/cmd/delete.go | 2 +-
pkg/cmd/delete_test.go | 2 +-
pkg/cmd/describe_integration.go | 2 +-
pkg/cmd/describe_kamelet.go | 2 +-
pkg/cmd/describe_kit.go | 2 +-
pkg/cmd/describe_platform.go | 2 +-
pkg/cmd/dump.go | 2 +-
pkg/cmd/get.go | 2 +-
pkg/cmd/install.go | 46 +-
pkg/cmd/install_test.go | 2 +-
pkg/cmd/kamelet_add_repo.go | 2 +-
pkg/cmd/kamelet_add_repo_test.go | 2 +-
pkg/cmd/kamelet_delete.go | 2 +-
pkg/cmd/kamelet_get.go | 2 +-
pkg/cmd/kamelet_remove_repo.go | 2 +-
pkg/cmd/kamelet_remove_repo_test.go | 2 +-
pkg/cmd/kit_create.go | 2 +-
pkg/cmd/kit_create_test.go | 2 +-
pkg/cmd/kit_delete.go | 2 +-
pkg/cmd/kit_get.go | 2 +-
pkg/cmd/log.go | 2 +-
pkg/cmd/log_test.go | 2 +-
pkg/cmd/operator.go | 7 +-
pkg/cmd/operator_test.go | 4 +-
pkg/cmd/promote.go | 2 +-
pkg/cmd/promote_test.go | 2 +-
pkg/cmd/rebuild.go | 2 +-
pkg/cmd/rebuild_test.go | 2 +-
pkg/cmd/reset.go | 2 +-
pkg/cmd/root.go | 28 +-
pkg/cmd/root_test.go | 39 +-
pkg/cmd/run.go | 5 +-
pkg/cmd/run_test.go | 4 +-
pkg/cmd/uninstall.go | 13 +-
pkg/cmd/uninstall_test.go | 6 +-
pkg/cmd/util.go | 23 +-
pkg/cmd/util_config.go | 2 +-
pkg/cmd/version.go | 2 +-
pkg/cmd/version_test.go | 2 +-
pkg/platform/platform.go | 4 +-
pkg/util/olm/available.go | 4 +-
script/Makefile | 26 +-
172 files changed, 7042 insertions(+), 6533 deletions(-)
create mode 100644 e2e/advanced/main_test.go
rename e2e/{knative/support/startup_test.go => common/cli/main_test.go} (53%)
delete mode 100644 e2e/common/config/default.go
delete mode 100644 e2e/common/languages/default.go
create mode 100644 e2e/common/main_test.go
delete mode 100644 e2e/common/misc/default.go
delete mode 100644 e2e/common/runtimes/default.go
delete mode 100644 e2e/common/support/startup_test.go
delete mode 100644 e2e/common/support/teardown_test.go
delete mode 100644 e2e/common/traits/default.go
delete mode 100644 e2e/knative/support/teardown_test.go
(camel-k) 05/10: chore(e2e): Fix concurrent access to viper flags
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit fc225f18898eae766a7ebe131b71eaa58d1c18e6
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Mon Mar 4 21:56:05 2024 +0100
chore(e2e): Fix concurrent access to viper flags
---
pkg/cmd/install.go | 5 +++++
pkg/cmd/root.go | 8 ++++++++
pkg/cmd/run.go | 5 +++++
pkg/cmd/uninstall.go | 5 +++++
pkg/cmd/util.go | 16 ++++------------
5 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 8567165b6..4e54b0046 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -676,6 +676,11 @@ func (o *installCmdOptions) postRun(cmd *cobra.Command, _ []string) error {
func (o *installCmdOptions) decode(cmd *cobra.Command, _ []string) error {
path := pathToRoot(cmd)
+
+ // Requires synchronization as viper bind flag is not able to handle concurrency
+ m.Lock()
+ defer m.Unlock()
+
if err := decodeKey(o, path); err != nil {
return err
}
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index a43e5a349..70c18209e 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -23,6 +23,7 @@ import (
"fmt"
"os"
"strings"
+ "sync"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@@ -39,6 +40,9 @@ const kamelCommandLongDescription = `Apache Camel K is a lightweight integration
superpowers.
`
+// Mutex to synchronize flag operations as viper library is not able to handle concurrency.
+var m = sync.Mutex{}
+
// RootCmdOptions --.
// nolint: containedctx
type RootCmdOptions struct {
@@ -93,6 +97,10 @@ func kamelPreAddCommandInit(options *RootCmdOptions) *cobra.Command {
}
func kamelPostAddCommandInit(cmd *cobra.Command) error {
+ // Requires synchronization as viper bind flag is not able to handle concurrency
+ m.Lock()
+ defer m.Unlock()
+
if err := bindPFlagsHierarchy(cmd); err != nil {
return err
}
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 12ce4da6b..4c33c4154 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -187,6 +187,11 @@ func (o *runCmdOptions) decode(cmd *cobra.Command, args []string) error {
// load from kamel.run (1)
pathToRoot := pathToRoot(cmd)
+
+ // Requires synchronization as viper bind flag is not able to handle concurrency
+ m.Lock()
+ defer m.Unlock()
+
if err := decodeKey(o, pathToRoot); err != nil {
return err
}
diff --git a/pkg/cmd/uninstall.go b/pkg/cmd/uninstall.go
index 461435c0b..489da6c1f 100644
--- a/pkg/cmd/uninstall.go
+++ b/pkg/cmd/uninstall.go
@@ -107,6 +107,11 @@ var defaultListOptions = metav1.ListOptions{
func (o *uninstallCmdOptions) decode(cmd *cobra.Command, _ []string) error {
path := pathToRoot(cmd)
+
+ // Requires synchronization as viper bind flag is not able to handle concurrency
+ m.Lock()
+ defer m.Unlock()
+
if err := decodeKey(o, path); err != nil {
return err
}
diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
index 4365addee..aec422477 100644
--- a/pkg/cmd/util.go
+++ b/pkg/cmd/util.go
@@ -25,7 +25,6 @@ import (
"log"
"reflect"
"strings"
- "sync"
"github.com/mitchellh/mapstructure"
@@ -45,9 +44,6 @@ const (
offlineCommandLabel = "camel.apache.org/cmd.offline"
)
-// Mutex to synchronize flag operations as viper library is not able to handle concurrency.
-var m = sync.Mutex{}
-
// DeleteIntegration --.
func DeleteIntegration(ctx context.Context, c client.Client, name string, namespace string) error {
integration := v1.Integration{
@@ -78,10 +74,6 @@ func bindPFlagsHierarchy(cmd *cobra.Command) error {
}
func bindPFlags(cmd *cobra.Command) error {
- // Requires synchronization as viper bind flag is not able to handle concurrency
- m.Lock()
- defer m.Unlock()
-
prefix := pathToRoot(cmd)
pl := p.NewClient()
@@ -122,10 +114,6 @@ func pathToRoot(cmd *cobra.Command) string {
}
func decodeKey(target interface{}, key string) error {
- // Requires synchronization as viper all settings is not able to handle concurrency
- m.Lock()
- defer m.Unlock()
-
nodes := strings.Split(key, ".")
settings := viper.AllSettings()
@@ -168,6 +156,10 @@ func decodeKey(target interface{}, key string) error {
func decode(target interface{}) func(*cobra.Command, []string) error {
return func(cmd *cobra.Command, args []string) error {
+ // Requires synchronization as viper bind flag is not able to handle concurrency
+ m.Lock()
+ defer m.Unlock()
+
path := pathToRoot(cmd)
if err := decodeKey(target, path); err != nil {
return err
(camel-k) 08/10: chore(e2e): Synchronize kamel install command in e2e tests
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e0803311e132d3393c77a926ac9042479c6aed2f
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Mar 5 19:29:37 2024 +0100
chore(e2e): Synchronize kamel install command in e2e tests
---
e2e/advanced/build_order_strategy_test.go | 2 +-
e2e/advanced/builder_test.go | 2 +-
e2e/advanced/catalog_builder_test.go | 2 +-
e2e/advanced/debug_test.go | 2 +-
e2e/advanced/deployment_test.go | 2 +-
e2e/advanced/dump_test.go | 2 +-
e2e/advanced/environment_test.go | 2 +-
e2e/advanced/incremental_build_test.go | 8 +-
e2e/advanced/integration_profile_test.go | 6 +-
e2e/advanced/kamelet_repo_test.go | 2 +-
e2e/advanced/local_platform_test.go | 4 +-
e2e/advanced/maven_http_proxy_test.go | 4 +-
e2e/advanced/operator_id_filtering_test.go | 6 +-
e2e/advanced/operator_metrics_test.go | 2 +-
e2e/advanced/platform_traits_test.go | 2 +-
e2e/advanced/promote_test.go | 4 +-
e2e/advanced/reset_test.go | 2 +-
e2e/advanced/synthetic_test.go | 4 +-
e2e/builder/build_test.go | 2 +-
e2e/builder/registry_test.go | 6 +-
e2e/common/cli/main_test.go | 2 +-
e2e/common/cli/run_test.go | 4 +-
e2e/common/config/config_reload_test.go | 8 +-
e2e/common/config/config_test.go | 2 +-
e2e/common/config/kamelet_config_test.go | 194 +++--------------------
e2e/common/config/pipe_config_test.go | 2 +-
e2e/common/languages/groovy_test.go | 2 +-
e2e/common/languages/java_test.go | 2 +-
e2e/common/languages/js_test.go | 2 +-
e2e/common/languages/kotlin_test.go | 2 +-
e2e/common/languages/polyglot_test.go | 2 +-
e2e/common/languages/xml_test.go | 2 +-
e2e/common/languages/yaml_test.go | 2 +-
e2e/common/misc/cron_test.go | 2 +-
e2e/common/misc/integration_fail_test.go | 2 +-
e2e/common/misc/integration_trait_update_test.go | 2 +-
e2e/common/misc/kamelet_test.go | 2 +-
e2e/common/misc/kamelet_update_test.go | 2 +-
e2e/common/misc/maven_repository_test.go | 2 +-
e2e/common/misc/pipe_test.go | 2 +-
e2e/common/misc/pipe_with_image_test.go | 2 +-
e2e/common/misc/registry_maven_wagon_test.go | 2 +-
e2e/common/misc/rest_test.go | 2 +-
e2e/common/misc/scale_binding_test.go | 2 +-
e2e/common/misc/scale_integration_test.go | 2 +-
e2e/common/misc/structured_logs_test.go | 2 +-
e2e/common/runtimes/runtimes_test.go | 2 +-
e2e/common/traits/affinity_test.go | 2 +-
e2e/common/traits/builder_test.go | 2 +-
e2e/common/traits/camel_test.go | 2 +-
e2e/common/traits/container_test.go | 2 +-
e2e/common/traits/deployment_test.go | 4 +-
e2e/common/traits/error_handler_test.go | 2 +-
e2e/common/traits/errored_trait_test.go | 2 +-
e2e/common/traits/health_test.go | 2 +-
e2e/common/traits/istio_test.go | 2 +-
e2e/common/traits/jolokia_test.go | 2 +-
e2e/common/traits/jvm_test.go | 2 +-
e2e/common/traits/kamelet_test.go | 2 +-
e2e/common/traits/master_test.go | 2 +-
e2e/common/traits/openapi_test.go | 2 +-
e2e/common/traits/pdb_test.go | 2 +-
e2e/common/traits/pod_test.go | 2 +-
e2e/common/traits/prometheus_test.go | 2 +-
e2e/common/traits/pull_secret_test.go | 2 +-
e2e/common/traits/route_test.go | 2 +-
e2e/common/traits/service_binding_test.go | 2 +-
e2e/common/traits/service_test.go | 2 +-
e2e/common/traits/toleration_test.go | 2 +-
e2e/install/cli/global_kamelet_test.go | 6 +-
e2e/install/cli/global_test.go | 8 +-
e2e/install/cli/install_test.go | 16 +-
e2e/install/cli/maven_ca_secret_test.go | 2 +-
e2e/install/cli/uninstall_test.go | 16 +-
e2e/install/upgrade/cli_upgrade_test.go | 2 +-
e2e/knative/knative_platform_test.go | 2 +-
e2e/knative/knative_test.go | 2 +-
e2e/native/native_binding_test.go | 2 +-
e2e/native/native_test.go | 2 +-
e2e/native/native_with_sources_test.go | 2 +-
e2e/support/test_support.go | 15 +-
e2e/telemetry/telemetry_test.go | 2 +-
script/Makefile | 2 +-
83 files changed, 152 insertions(+), 293 deletions(-)
diff --git a/e2e/advanced/build_order_strategy_test.go b/e2e/advanced/build_order_strategy_test.go
index ad30b02e8..42ebe538b 100644
--- a/e2e/advanced/build_order_strategy_test.go
+++ b/e2e/advanced/build_order_strategy_test.go
@@ -43,7 +43,7 @@ func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--max-running-pipelines", "4",
- "--build-order-strategy", string(v1.BuildOrderStrategyDependencies)).Execute()).To(Succeed())
+ "--build-order-strategy", string(v1.BuildOrderStrategyDependencies))).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(CreateTimerKamelet(t, operatorID, ns, "timer-source")()).To(Succeed())
diff --git a/e2e/advanced/builder_test.go b/e2e/advanced/builder_test.go
index 2ab36f8c1..d18100be6 100644
--- a/e2e/advanced/builder_test.go
+++ b/e2e/advanced/builder_test.go
@@ -42,7 +42,7 @@ func TestBuilderTimeout(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
diff --git a/e2e/advanced/catalog_builder_test.go b/e2e/advanced/catalog_builder_test.go
index 4279e7f75..cd8faa52b 100644
--- a/e2e/advanced/catalog_builder_test.go
+++ b/e2e/advanced/catalog_builder_test.go
@@ -42,7 +42,7 @@ func TestCamelCatalogBuilder(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
diff --git a/e2e/advanced/debug_test.go b/e2e/advanced/debug_test.go
index 753d6b27c..1bee4ba18 100644
--- a/e2e/advanced/debug_test.go
+++ b/e2e/advanced/debug_test.go
@@ -43,7 +43,7 @@ func TestKamelCLIDebug(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/deployment_test.go b/e2e/advanced/deployment_test.go
index 91cefb686..3d58c6eb7 100644
--- a/e2e/advanced/deployment_test.go
+++ b/e2e/advanced/deployment_test.go
@@ -41,7 +41,7 @@ func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
nsRestr := "restr"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
// Create restricted namespace
ExpectExecSucceed(t, g,
exec.Command(
diff --git a/e2e/advanced/dump_test.go b/e2e/advanced/dump_test.go
index 7791863d0..96c218af1 100644
--- a/e2e/advanced/dump_test.go
+++ b/e2e/advanced/dump_test.go
@@ -49,7 +49,7 @@ func TestKamelCLIDump(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
diff --git a/e2e/advanced/environment_test.go b/e2e/advanced/environment_test.go
index c17839ef9..bff92d269 100644
--- a/e2e/advanced/environment_test.go
+++ b/e2e/advanced/environment_test.go
@@ -72,7 +72,7 @@ func TestEnvironmentTrait(t *testing.T) {
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=%s", httpProxy),
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","),
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/incremental_build_test.go b/e2e/advanced/incremental_build_test.go
index 40db5479a..b34f6c84b 100644
--- a/e2e/advanced/incremental_build_test.go
+++ b/e2e/advanced/incremental_build_test.go
@@ -42,7 +42,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) {
operatorID := "camel-k-incremental-build-routine"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
@@ -97,7 +97,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-incremental-build-pod"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
@@ -158,7 +158,7 @@ func TestRunIncrementalBuildOff(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-standard-build"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
@@ -210,7 +210,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-incremental-different-base"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
diff --git a/e2e/advanced/integration_profile_test.go b/e2e/advanced/integration_profile_test.go
index 849450f1d..422490ecd 100644
--- a/e2e/advanced/integration_profile_test.go
+++ b/e2e/advanced/integration_profile_test.go
@@ -40,7 +40,7 @@ func TestIntegrationProfile(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-integration-profile"
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
@@ -128,7 +128,7 @@ func TestIntegrationProfileInfluencesKit(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-ipr-kit"
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
@@ -173,7 +173,7 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-ipr-changes"
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "debug-profile")
diff --git a/e2e/advanced/kamelet_repo_test.go b/e2e/advanced/kamelet_repo_test.go
index 4a77e16ed..fd9e3502b 100644
--- a/e2e/advanced/kamelet_repo_test.go
+++ b/e2e/advanced/kamelet_repo_test.go
@@ -40,7 +40,7 @@ func TestKameletFromCustomRepository(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
kameletName := "timer-custom-source"
diff --git a/e2e/advanced/local_platform_test.go b/e2e/advanced/local_platform_test.go
index d6403862d..1b6923d91 100644
--- a/e2e/advanced/local_platform_test.go
+++ b/e2e/advanced/local_platform_test.go
@@ -40,7 +40,7 @@ func TestLocalPlatform(t *testing.T) {
operatorID := "camel-k-platform-local"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
@@ -56,7 +56,7 @@ func TestLocalPlatform(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns1 string) {
// Install platform (use the installer to get staging if present)
- g.Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup")).To(Succeed())
g.Expect(UpdatePlatform(t, ns1, "local-platform", func(pl *v1.IntegrationPlatform) {
pl.Spec.Build.Maven.Properties = make(map[string]string)
diff --git a/e2e/advanced/maven_http_proxy_test.go b/e2e/advanced/maven_http_proxy_test.go
index a556377b6..b2e099673 100644
--- a/e2e/advanced/maven_http_proxy_test.go
+++ b/e2e/advanced/maven_http_proxy_test.go
@@ -181,7 +181,7 @@ func TestMavenProxy(t *testing.T) {
}()
// ENV values should be injected by the OLM
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
} else {
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=http://%s", hostname),
@@ -189,7 +189,7 @@ func TestMavenProxy(t *testing.T) {
// "--operator-env-vars", fmt.Sprintf("HTTPS_PROXY=https://%s", hostname),
// "--maven-ca-secret", secret.Name+"/"+corev1.TLSCertKey,
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","),
- ).Execute()).To(Succeed())
+ )).To(Succeed())
}
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/operator_id_filtering_test.go b/e2e/advanced/operator_id_filtering_test.go
index d7c316e4e..e73ea68c3 100644
--- a/e2e/advanced/operator_id_filtering_test.go
+++ b/e2e/advanced/operator_id_filtering_test.go
@@ -39,7 +39,7 @@ func TestOperatorIDCamelCatalogReconciliation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
})
@@ -53,14 +53,14 @@ func TestOperatorIDFiltering(t *testing.T) {
operator1 := "operator-1"
g.Expect(CopyCamelCatalog(t, nsop1, operator1)).To(Succeed())
g.Expect(CopyIntegrationKits(t, nsop1, operator1)).To(Succeed())
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
WithNewTestNamespace(t, func(g *WithT, nsop2 string) {
operator2 := "operator-2"
g.Expect(CopyCamelCatalog(t, nsop2, operator2)).To(Succeed())
g.Expect(CopyIntegrationKits(t, nsop2, operator2)).To(Succeed())
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Operators ignore non-scoped integrations", func(t *testing.T) {
diff --git a/e2e/advanced/operator_metrics_test.go b/e2e/advanced/operator_metrics_test.go
index de59ed585..004ce2950 100644
--- a/e2e/advanced/operator_metrics_test.go
+++ b/e2e/advanced/operator_metrics_test.go
@@ -62,7 +62,7 @@ func TestMetrics(t *testing.T) {
name := RandomizedSuffixName("java")
operatorID := "camel-k-metrics"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug")).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/advanced/platform_traits_test.go b/e2e/advanced/platform_traits_test.go
index d62b32b46..a23c7603d 100644
--- a/e2e/advanced/platform_traits_test.go
+++ b/e2e/advanced/platform_traits_test.go
@@ -42,7 +42,7 @@ func TestTraitOnIntegrationPlatform(t *testing.T) {
operatorID := "camel-k-platform-trait-test"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
containerTestName := "testname"
diff --git a/e2e/advanced/promote_test.go b/e2e/advanced/promote_test.go
index 6327b0fc5..b03e1686e 100644
--- a/e2e/advanced/promote_test.go
+++ b/e2e/advanced/promote_test.go
@@ -43,7 +43,7 @@ func TestKamelCLIPromote(t *testing.T) {
operatorDevID := "camel-k-cli-promote-dev"
g.Expect(CopyCamelCatalog(t, nsDev, operatorDevID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, nsDev, operatorDevID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorDevID, nsDev).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorDevID, nsDev)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Dev content configmap
@@ -86,7 +86,7 @@ func TestKamelCLIPromote(t *testing.T) {
operatorProdID := "camel-k-cli-promote-prod"
g.Expect(CopyCamelCatalog(t, nsProd, operatorProdID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, nsProd, operatorProdID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorProdID, nsProd).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorProdID, nsProd)).To(Succeed())
g.Eventually(PlatformPhase(t, nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("no configmap in destination", func(t *testing.T) {
diff --git a/e2e/advanced/reset_test.go b/e2e/advanced/reset_test.go
index 7e7a34504..6b0773dc8 100644
--- a/e2e/advanced/reset_test.go
+++ b/e2e/advanced/reset_test.go
@@ -39,7 +39,7 @@ func TestKamelReset(t *testing.T) {
operatorID := "camel-k-cli-reset"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/synthetic_test.go b/e2e/advanced/synthetic_test.go
index 5d8382984..f6282dd0a 100644
--- a/e2e/advanced/synthetic_test.go
+++ b/e2e/advanced/synthetic_test.go
@@ -42,7 +42,7 @@ func TestSyntheticIntegrationOff(t *testing.T) {
operatorID := "camel-k-synthetic-env-off"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the external deployment
@@ -68,7 +68,7 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", "CAMEL_K_SYNTHETIC_INTEGRATIONS=true",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
// Run the external deployment
ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 33498a5d1..7aed010f9 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -403,7 +403,7 @@ func createOperator(t *testing.T, g *WithT, ns string, buildTimeout string, inst
args = append(args, installArgs...)
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, args...).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, args...)).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
}
diff --git a/e2e/builder/registry_test.go b/e2e/builder/registry_test.go
index e61b72dbc..653b94412 100644
--- a/e2e/builder/registry_test.go
+++ b/e2e/builder/registry_test.go
@@ -48,8 +48,7 @@ func TestRunWithDockerHubRegistry(t *testing.T) {
"--organization", user,
"--registry-auth-username", user,
"--registry-auth-password", pass,
- "--cluster-type", "kubernetes").
- Execute()).To(Succeed())
+ "--cluster-type", "kubernetes")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
@@ -76,8 +75,7 @@ func TestRunWithGithubPackagesRegistry(t *testing.T) {
"--organization", repo,
"--registry-auth-username", user,
"--registry-auth-password", pass,
- "--cluster-type", "kubernetes").
- Execute()).To(Succeed())
+ "--cluster-type", "kubernetes")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
diff --git a/e2e/common/cli/main_test.go b/e2e/common/cli/main_test.go
index fa9e31452..c4dfbe1fa 100644
--- a/e2e/common/cli/main_test.go
+++ b/e2e/common/cli/main_test.go
@@ -50,7 +50,7 @@ func TestMain(m *testing.M) {
// Install global operator for tests in this package, all tests must use this operatorID
g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, operatorNS, "--global", "--force")).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
exitCode := m.Run()
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index bf95dc437..548cb95bc 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -192,7 +192,7 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
@@ -219,7 +219,7 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
diff --git a/e2e/common/config/config_reload_test.go b/e2e/common/config/config_reload_test.go
index cf12faa24..d59c719ad 100644
--- a/e2e/common/config/config_reload_test.go
+++ b/e2e/common/config/config_reload_test.go
@@ -42,7 +42,7 @@ func TestConfigmapHotReload(t *testing.T) {
operatorID := "camel-k-config-hot-reload"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -78,7 +78,7 @@ func TestConfigmapHotReloadDefault(t *testing.T) {
operatorID := "camel-k-config-hot-reload-default"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -111,7 +111,7 @@ func TestSecretHotReload(t *testing.T) {
operatorID := "camel-k-secret-hot-reload"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -154,7 +154,7 @@ func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
operatorID := fmt.Sprintf("camel-k-config-owner-ref-%s", strconv.FormatBool(hotreload))
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index f8978f2bb..fee946697 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -41,7 +41,7 @@ func TestRunConfigExamples(t *testing.T) {
operatorID := "camel-k-config"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go
index e40d0f4c4..67114fded 100644
--- a/e2e/common/config/kamelet_config_test.go
+++ b/e2e/common/config/kamelet_config_test.go
@@ -42,7 +42,7 @@ func TestKameletImplicitConfigDefaultUserProperty(t *testing.T) {
operatorID := "camel-k-config-kamelet-user-property"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -60,22 +60,9 @@ func TestKameletImplicitConfigDefaultUserProperty(t *testing.T) {
g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig01-timer-source")).To(Succeed())
- })
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-mount"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config using mounted secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig03-timer-source")()).To(Succeed())
@@ -99,22 +86,9 @@ func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig03-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-configmap-mount"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config using mounted configmap", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig04-timer-source")()).To(Succeed())
@@ -136,22 +110,9 @@ func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "iconfig04-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigNamedUserProperty(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-named-property"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test named config using properties", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig05-timer-source")()).To(Succeed())
@@ -167,22 +128,9 @@ func TestKameletImplicitConfigNamedUserProperty(t *testing.T) {
g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig05-timer-source")).To(Succeed())
- })
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-labeled-named"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test named config using labeled secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig06-timer-source")()).To(Succeed())
@@ -209,22 +157,9 @@ func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig06-timer-source")).To(Succeed())
- })
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-mount-named"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test named config using mounted secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig07-timer-source")()).To(Succeed())
@@ -249,22 +184,9 @@ func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig07-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-configmap-mount-named"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test named config using mounted configmap", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig08-timer-source")()).To(Succeed())
@@ -287,22 +209,9 @@ func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "iconfig08-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-labeled"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config using labeled secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig09-timer-source")()).To(Succeed())
@@ -327,24 +236,9 @@ func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig09-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-// Tests on integration with kamelets containing configuration from properties and secrets with parameters inside the integration.
-func TestKameletConfigInlinedUserProperty(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-user-property-inlined"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config inlined properties", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "config01-timer-source")()).To(Succeed())
@@ -362,22 +256,9 @@ func TestKameletConfigInlinedUserProperty(t *testing.T) {
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "config01-timer-source")).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config01-log-sink")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-func TestKameletConfigDefaultParamUserProperty(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-user-property-param"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config parameters properties", func(t *testing.T) {
@@ -398,22 +279,9 @@ func TestKameletConfigDefaultParamUserProperty(t *testing.T) {
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
- })
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-mount-param"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config secret properties", func(t *testing.T) {
@@ -440,22 +308,9 @@ func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-configmap-mount-param"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config configmap properties", func(t *testing.T) {
@@ -482,8 +337,9 @@ func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
+
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index 220b7cf53..b896e7f8a 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -40,7 +40,7 @@ func TestPipeConfig(t *testing.T) {
operatorID := "camel-k-config"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go
index 02bcf7253..d4aa49724 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleGroovyExamples(t *testing.T) {
operatorID := "camel-k-runtimes-groovy"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go
index 9e2ee0e4d..9e6873e11 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleJavaExamples(t *testing.T) {
operatorID := "camel-k-runtimes-java"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index 4a0218156..4234f2807 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleJavaScriptExamples(t *testing.T) {
operatorID := "camel-k-runtimes-js"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index 190d76cde..e1e360d46 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleKotlinExamples(t *testing.T) {
operatorID := "camel-k-runtimes-kotlin"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go
index d52f79c4c..21a5d51f1 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -40,7 +40,7 @@ func TestRunPolyglotExamples(t *testing.T) {
operatorID := "camel-k-runtimes-polyglot"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index 53ee19bbe..a53d4da32 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleXmlExamples(t *testing.T) {
operatorID := "camel-k-runtimes-xml"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go
index a78465c6e..270445375 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleYamlExamples(t *testing.T) {
operatorID := "camel-k-runtimes-yaml"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index de2abf7ef..76948bbb8 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -40,7 +40,7 @@ func TestRunCronExample(t *testing.T) {
operatorID := "camel-k-cron"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go
index 73f2223d1..b2468bea3 100644
--- a/e2e/common/misc/integration_fail_test.go
+++ b/e2e/common/misc/integration_fail_test.go
@@ -41,7 +41,7 @@ func TestBadRouteIntegration(t *testing.T) {
operatorID := "camel-k-bad-route"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/integration_trait_update_test.go b/e2e/common/misc/integration_trait_update_test.go
index 5a4be2dfe..d56fee0f1 100644
--- a/e2e/common/misc/integration_trait_update_test.go
+++ b/e2e/common/misc/integration_trait_update_test.go
@@ -40,7 +40,7 @@ func TestTraitUpdates(t *testing.T) {
operatorID := "camel-k-trait-update"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index a71b60a10..6558d4ba8 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -40,7 +40,7 @@ func TestKameletClasspathLoading(t *testing.T) {
operatorID := "camel-k-kamelet-loading"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index 10d9ec9f7..f97eb530c 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -41,7 +41,7 @@ func TestBundleKameletUpdate(t *testing.T) {
operatorID := "camel-k-kamelet-bundle"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go
index 9f57b9efb..5b2ea10d1 100644
--- a/e2e/common/misc/maven_repository_test.go
+++ b/e2e/common/misc/maven_repository_test.go
@@ -40,7 +40,7 @@ func TestRunExtraRepository(t *testing.T) {
operatorID := "camel-k-extra-repository"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go
index 5d97ed3a3..ef2f60936 100644
--- a/e2e/common/misc/pipe_test.go
+++ b/e2e/common/misc/pipe_test.go
@@ -41,7 +41,7 @@ func TestPipe(t *testing.T) {
operatorID := "camel-k-pipe"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/pipe_with_image_test.go b/e2e/common/misc/pipe_with_image_test.go
index 59bbe2277..f898de01b 100644
--- a/e2e/common/misc/pipe_with_image_test.go
+++ b/e2e/common/misc/pipe_with_image_test.go
@@ -41,7 +41,7 @@ func TestPipeWithImage(t *testing.T) {
operatorID := "camel-k-pipe-image"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index 2d93ce51e..a7643f175 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -51,7 +51,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
operatorID := "camel-k-rest"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go
index 1a4f30492..1bbfdaf16 100644
--- a/e2e/common/misc/rest_test.go
+++ b/e2e/common/misc/rest_test.go
@@ -45,7 +45,7 @@ func TestRunRest(t *testing.T) {
operatorID := "camel-k-rest"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index f9dae8451..adc9fd36b 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -46,7 +46,7 @@ func TestPipeScale(t *testing.T) {
operatorID := "camel-k-pipe-scale"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go
index bad583991..c3b697427 100644
--- a/e2e/common/misc/scale_integration_test.go
+++ b/e2e/common/misc/scale_integration_test.go
@@ -45,7 +45,7 @@ func TestIntegrationScale(t *testing.T) {
operatorID := "camel-k-integration-scale"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index 5214aaeb9..47d7d59ec 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -41,7 +41,7 @@ func TestStructuredLogs(t *testing.T) {
operatorID := "camel-k-structured-logs"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go
index 81ed54642..fa43dd530 100644
--- a/e2e/common/runtimes/runtimes_test.go
+++ b/e2e/common/runtimes/runtimes_test.go
@@ -40,7 +40,7 @@ func TestSourceLessIntegrations(t *testing.T) {
operatorID := "camel-k-runtimes"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go
index 73a75b94d..8621cd8fb 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -43,7 +43,7 @@ func TestAffinityTrait(t *testing.T) {
operatorID := "camel-k-traits-affinity"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index 6f8d8f860..42dc5b1b7 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -43,7 +43,7 @@ func TestBuilderTrait(t *testing.T) {
operatorID := "camel-k-traits-builder"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go
index f9f6b4ab3..439bca8f2 100644
--- a/e2e/common/traits/camel_test.go
+++ b/e2e/common/traits/camel_test.go
@@ -40,7 +40,7 @@ func TestCamelTrait(t *testing.T) {
operatorID := "camel-k-traits-camel"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go
index a5fd859d3..12e1937f2 100644
--- a/e2e/common/traits/container_test.go
+++ b/e2e/common/traits/container_test.go
@@ -41,7 +41,7 @@ func TestContainerTrait(t *testing.T) {
operatorID := "camel-k-traits-container"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index 67fcf4bd5..68d57b6b5 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -44,7 +44,7 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
operatorID := "camel-k-traits-deployment"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -91,7 +91,7 @@ func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
operatorID := "camel-k-traits-deployment-rolling"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go
index 73a102375..3292750f7 100644
--- a/e2e/common/traits/error_handler_test.go
+++ b/e2e/common/traits/error_handler_test.go
@@ -40,7 +40,7 @@ func TestErrorHandlerTrait(t *testing.T) {
operatorID := "camel-k-traits-errorhandler"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 6b807221d..9d967d2df 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -40,7 +40,7 @@ func TestErroredTrait(t *testing.T) {
operatorID := "camel-k-traits-error"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 13914cc6e..0f2ff7bf9 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -49,7 +49,7 @@ func TestHealthTrait(t *testing.T) {
operatorID := "camel-k-traits-health"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index 0fd149802..97cafe4b5 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -41,7 +41,7 @@ func TestIstioTrait(t *testing.T) {
operatorID := "camel-k-traits-istio"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go
index 419b9f880..470732744 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -42,7 +42,7 @@ func TestJolokiaTrait(t *testing.T) {
operatorID := "camel-k-traits-jolokia"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go
index 5f220a587..329c90f90 100644
--- a/e2e/common/traits/jvm_test.go
+++ b/e2e/common/traits/jvm_test.go
@@ -43,7 +43,7 @@ func TestJVMTrait(t *testing.T) {
operatorID := "camel-k-traits-jvm"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go
index 2d2516f2d..d04d84803 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -40,7 +40,7 @@ func TestKameletTrait(t *testing.T) {
operatorID := "camel-k-traits-kamelet"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go
index 65713e2bd..014b26c33 100644
--- a/e2e/common/traits/master_test.go
+++ b/e2e/common/traits/master_test.go
@@ -42,7 +42,7 @@ func TestMasterTrait(t *testing.T) {
operatorID := "camel-k-traits-master"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go
index 2ac84e4d2..e761d632a 100644
--- a/e2e/common/traits/openapi_test.go
+++ b/e2e/common/traits/openapi_test.go
@@ -42,7 +42,7 @@ func TestOpenAPI(t *testing.T) {
operatorID := "camel-k-traits-openapi"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index b6b355121..bd6e91a2e 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -49,7 +49,7 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
operatorID := "camel-k-traits-pdb"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go
index 28b05cae8..fbe662c8e 100644
--- a/e2e/common/traits/pod_test.go
+++ b/e2e/common/traits/pod_test.go
@@ -40,7 +40,7 @@ func TestPodTrait(t *testing.T) {
operatorID := "camel-k-traits-pod"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go
index 6d11d9df2..1937e1de8 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -50,7 +50,7 @@ func TestPrometheusTrait(t *testing.T) {
operatorID := "camel-k-traits-prometheus"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go
index 1267e9fa6..989e67b97 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -42,7 +42,7 @@ func TestPullSecretTrait(t *testing.T) {
operatorID := "camel-k-traits-pull-secret"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index b8b031c4b..3df769452 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -78,7 +78,7 @@ func TestRunRoutes(t *testing.T) {
operatorID := "camel-k-traits-route"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift")).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 6f07f0f12..8eca83f10 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -42,7 +42,7 @@ func TestServiceBindingTrait(t *testing.T) {
operatorID := "camel-k-traits-service-binding"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go
index def097354..ea776dd1c 100644
--- a/e2e/common/traits/service_test.go
+++ b/e2e/common/traits/service_test.go
@@ -41,7 +41,7 @@ func TestServiceTrait(t *testing.T) {
operatorID := "camel-k-traits-service"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go
index 64491bdb1..e47330f73 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -42,7 +42,7 @@ func TestTolerationTrait(t *testing.T) {
operatorID := "camel-k-traits-toleration"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/install/cli/global_kamelet_test.go b/e2e/install/cli/global_kamelet_test.go
index 15ae5871e..160b763a6 100644
--- a/e2e/install/cli/global_kamelet_test.go
+++ b/e2e/install/cli/global_kamelet_test.go
@@ -34,7 +34,7 @@ import (
func TestRunGlobalKamelet(t *testing.T) {
WithGlobalOperatorNamespace(t, func(g *WithT, operatorNamespace string) {
operatorID := "camel-k-global-kamelet"
- g.Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force")).To(Succeed())
t.Run("Global operator + namespaced kamelet test", func(t *testing.T) {
@@ -42,7 +42,7 @@ func TestRunGlobalKamelet(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns2 string) {
g.Expect(CreateTimerKamelet(t, operatorID, ns2, "my-own-timer-source")()).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns2, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns2, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -57,7 +57,7 @@ func TestRunGlobalKamelet(t *testing.T) {
// NS3: namespace without operator
WithNewTestNamespace(t, func(g *WithT, ns3 string) {
- g.Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns3, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns3, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
diff --git a/e2e/install/cli/global_test.go b/e2e/install/cli/global_test.go
index c0f3cb05d..10db634ca 100644
--- a/e2e/install/cli/global_test.go
+++ b/e2e/install/cli/global_test.go
@@ -41,7 +41,7 @@ import (
func TestRunGlobalInstall(t *testing.T) {
WithGlobalOperatorNamespace(t, func(g *WithT, operatorNamespace string) {
- g.Expect(KamelInstall(t, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstall(t, operatorNamespace, "--global", "--force")).To(Succeed())
g.Eventually(OperatorPodPhase(t, operatorNamespace), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
t.Run("Global CamelCatalog reconciliation", func(t *testing.T) {
@@ -56,7 +56,7 @@ func TestRunGlobalInstall(t *testing.T) {
t.Run("Global test on namespace with platform", func(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns2 string) {
// Creating namespace local platform
- g.Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false")).To(Succeed())
g.Eventually(Platform(t, ns2)).ShouldNot(BeNil())
// Run with global operator id
@@ -77,9 +77,9 @@ func TestRunGlobalInstall(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns3 string) {
operatorID := "camel-k-local-ns3"
if NoOlmOperatorImage != "" {
- g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage)).To(Succeed())
} else {
- g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false")).To(Succeed())
}
g.Eventually(OperatorPodPhase(t, ns3), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
g.Expect(KamelRunWithID(t, operatorID, ns3, "files/Java.java").Execute()).To(Succeed())
diff --git a/e2e/install/cli/install_test.go b/e2e/install/cli/install_test.go
index 35fdb2e84..7500b6eb3 100644
--- a/e2e/install/cli/install_test.go
+++ b/e2e/install/cli/install_test.go
@@ -49,7 +49,7 @@ import (
func TestBasicInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
@@ -108,7 +108,7 @@ func TestBasicInstallation(t *testing.T) {
func TestAlternativeImageInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest")).To(Succeed())
g.Eventually(OperatorImage(t, ns)).Should(Equal("x/y:latest"))
})
}
@@ -116,7 +116,7 @@ func TestAlternativeImageInstallation(t *testing.T) {
func TestKitMainInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Expect(Kamel(t, "kit", "create", "timer", "-d", "camel:timer", "-x", operatorID, "-n", ns).Execute()).To(Succeed())
g.Eventually(Build(t, ns, "timer"), TestTimeoutMedium).ShouldNot(BeNil())
})
@@ -125,7 +125,7 @@ func TestKitMainInstallation(t *testing.T) {
func TestMavenRepositoryInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/")).To(Succeed())
configmapName := fmt.Sprintf("%s-maven-settings", operatorID)
g.Eventually(Configmap(t, ns, configmapName)).Should(Not(BeNil()))
g.Eventually(func() string {
@@ -141,7 +141,7 @@ func TestMavenRepositoryInstallation(t *testing.T) {
func TestSkipRegistryInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup")).To(Succeed())
g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
g.Eventually(func() v1.RegistrySpec {
return Platform(t, ns)().Spec.Build.Registry
@@ -181,7 +181,7 @@ func TestConsoleCliDownload(t *testing.T) {
}
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(ConsoleCLIDownload(t, name), TestTimeoutMedium).Should(Not(BeNil()))
cliDownload = ConsoleCLIDownload(t, name)()
@@ -206,7 +206,7 @@ func TestConsoleCliDownload(t *testing.T) {
func TestInstallSkipDefaultKameletsInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup")).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Expect(KameletList(t, ns)()).Should(BeEmpty())
})
@@ -215,7 +215,7 @@ func TestInstallSkipDefaultKameletsInstallation(t *testing.T) {
func TestInstallDebugLogging(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug")).To(Succeed())
g.Eventually(OperatorEnvVarValue(t, ns, "LOG_LEVEL"), TestTimeoutLong).Should(Equal("debug"))
})
diff --git a/e2e/install/cli/maven_ca_secret_test.go b/e2e/install/cli/maven_ca_secret_test.go
index e5096735c..595b4c331 100644
--- a/e2e/install/cli/maven_ca_secret_test.go
+++ b/e2e/install/cli/maven_ca_secret_test.go
@@ -427,7 +427,7 @@ ProxyPreserveHost On
"--maven-ca-secret", secret.Name+"/"+corev1.TLSCertKey,
// Active batch mode to assert dependencies download
"--maven-cli-option", "--batch-mode",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/install/cli/uninstall_test.go b/e2e/install/cli/uninstall_test.go
index 5989848ae..5eb0ef0b1 100644
--- a/e2e/install/cli/uninstall_test.go
+++ b/e2e/install/cli/uninstall_test.go
@@ -36,7 +36,7 @@ func TestBasicUninstall(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
@@ -71,7 +71,7 @@ func TestUninstallSkipOperator(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except operator
g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-operator").Execute()).To(Succeed())
@@ -83,7 +83,7 @@ func TestUninstallSkipRole(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false")).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except roles
g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-roles").Execute()).To(Succeed())
@@ -95,7 +95,7 @@ func TestUninstallSkipRoleBinding(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false")).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except role-bindings
g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-role-bindings").Execute()).To(Succeed())
@@ -107,7 +107,7 @@ func TestUninstallSkipServiceAccounts(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false")).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-service-accounts").Execute()).To(Succeed())
@@ -119,7 +119,7 @@ func TestUninstallSkipIntegrationPlatform(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
// NOTE: skip CRDs is also required in addition to skip integration platform
@@ -132,7 +132,7 @@ func TestUninstallSkipKamelets(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except kamelets
@@ -145,7 +145,7 @@ func TestUninstallSkipCamelCatalogs(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except camel catalogs
diff --git a/e2e/install/upgrade/cli_upgrade_test.go b/e2e/install/upgrade/cli_upgrade_test.go
index dfc1362e6..2fffef78a 100644
--- a/e2e/install/upgrade/cli_upgrade_test.go
+++ b/e2e/install/upgrade/cli_upgrade_test.go
@@ -95,7 +95,7 @@ func TestCLIOperatorUpgrade(t *testing.T) {
g.Expect(os.Setenv("KAMEL_BIN", "")).To(Succeed())
// Upgrade the operator by installing the current version
- g.Expect(KamelInstall(t, ns, "--olm=false", "--force", "--operator-image", image, "--base-image", defaults.BaseImage()).Execute()).To(Succeed())
+ g.Expect(KamelInstall(t, ns, "--olm=false", "--force", "--operator-image", image, "--base-image", defaults.BaseImage())).To(Succeed())
// Check the operator image is the current built one
g.Eventually(OperatorImage(t, ns)).Should(Equal(image))
diff --git a/e2e/knative/knative_platform_test.go b/e2e/knative/knative_platform_test.go
index e43b6c9ae..743332f7b 100644
--- a/e2e/knative/knative_platform_test.go
+++ b/e2e/knative/knative_platform_test.go
@@ -50,7 +50,7 @@ func TestKnativePlatformDetection(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-knative"
// Install without profile (should automatically detect the presence of Knative)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Eventually(PlatformProfile(t, ns), TestTimeoutShort).Should(Equal(v1.TraitProfile("")))
cluster := Platform(t, ns)().Status.Cluster
diff --git a/e2e/knative/knative_test.go b/e2e/knative/knative_test.go
index a6ba857b7..600f423fa 100644
--- a/e2e/knative/knative_test.go
+++ b/e2e/knative/knative_test.go
@@ -139,7 +139,7 @@ func TestKnative(t *testing.T) {
func TestRunBroker(t *testing.T) {
WithNewTestNamespaceWithKnativeBroker(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile", "knative").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile", "knative")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/knativeevt1.groovy").Execute()).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/knativeevt2.groovy").Execute()).To(Succeed())
diff --git a/e2e/native/native_binding_test.go b/e2e/native/native_binding_test.go
index a04cd8293..7bf2ea840 100644
--- a/e2e/native/native_binding_test.go
+++ b/e2e/native/native_binding_test.go
@@ -36,7 +36,7 @@ func TestNativeBinding(t *testing.T) {
g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns,
"--build-timeout", "90m0s",
"--maven-cli-option", "-Dquarkus.native.native-image-xmx=6g",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
message := "Magicstring!"
t.Run("binding with native build", func(t *testing.T) {
diff --git a/e2e/native/native_test.go b/e2e/native/native_test.go
index 479642c93..9f04bbf82 100644
--- a/e2e/native/native_test.go
+++ b/e2e/native/native_test.go
@@ -40,7 +40,7 @@ func TestNativeIntegrations(t *testing.T) {
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--build-timeout", "90m0s",
"--maven-cli-option", "-Dquarkus.native.native-image-xmx=6g",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("unsupported integration source language", func(t *testing.T) {
diff --git a/e2e/native/native_with_sources_test.go b/e2e/native/native_with_sources_test.go
index a2ded791b..ac6e49e79 100644
--- a/e2e/native/native_with_sources_test.go
+++ b/e2e/native/native_with_sources_test.go
@@ -38,7 +38,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) {
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--build-timeout", "90m0s",
"--maven-cli-option", "-Dquarkus.native.native-image-xmx=9g",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
javaNativeName := RandomizedSuffixName("java-native")
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index b5cabc7a1..e9fe94d63 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -141,6 +141,7 @@ var testClient client.Client
var clientMutex = sync.Mutex{}
var kamelCLIMutex = sync.Mutex{}
+var kamelInstallMutex = sync.Mutex{}
// Only panic the test if absolutely necessary and there is
// no test locus. In most cases, the test should fail gracefully
@@ -262,19 +263,22 @@ func Kamel(t *testing.T, args ...string) *cobra.Command {
return KamelWithContext(t, TestContext, args...)
}
-func KamelInstall(t *testing.T, namespace string, args ...string) *cobra.Command {
+func KamelInstall(t *testing.T, namespace string, args ...string) error {
return KamelInstallWithID(t, platform.DefaultPlatformName, namespace, args...)
}
-func KamelInstallWithID(t *testing.T, operatorID string, namespace string, args ...string) *cobra.Command {
+func KamelInstallWithID(t *testing.T, operatorID string, namespace string, args ...string) error {
return kamelInstallWithContext(t, TestContext, operatorID, namespace, true, args...)
}
-func KamelInstallWithIDAndKameletCatalog(t *testing.T, operatorID string, namespace string, args ...string) *cobra.Command {
+func KamelInstallWithIDAndKameletCatalog(t *testing.T, operatorID string, namespace string, args ...string) error {
return kamelInstallWithContext(t, TestContext, operatorID, namespace, false, args...)
}
-func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID string, namespace string, skipKameletCatalog bool, args ...string) *cobra.Command {
+func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID string, namespace string, skipKameletCatalog bool, args ...string) error {
+ kamelInstallMutex.Lock()
+ defer kamelInstallMutex.Unlock()
+
var installArgs []string
installArgs = []string{"install", "-n", namespace, "--operator-id", operatorID, "--skip-cluster-setup"}
@@ -316,7 +320,8 @@ func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID strin
}
installArgs = append(installArgs, args...)
- return KamelWithContext(t, ctx, installArgs...)
+ installCommand := KamelWithContext(t, ctx, installArgs...)
+ return installCommand.Execute()
}
func KamelRun(t *testing.T, namespace string, args ...string) *cobra.Command {
diff --git a/e2e/telemetry/telemetry_test.go b/e2e/telemetry/telemetry_test.go
index 2ad915d75..cb93fcf84 100644
--- a/e2e/telemetry/telemetry_test.go
+++ b/e2e/telemetry/telemetry_test.go
@@ -37,7 +37,7 @@ import (
func TestTelemetryTrait(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-trait-telemetry"
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
// Check service is available
g.Eventually(ServicesByType(t, "otlp", corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
diff --git a/script/Makefile b/script/Makefile
index f518b09e4..4dd8283e5 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -94,7 +94,7 @@ KAMELET_CATALOG_REPO_TAG := v4.0.1
DO_TEST_PREBUILD ?= true
TEST_PREBUILD = build
# Tests may run in parallel to each other. This count sets the amount of tests run in parallel. (default value usually is GOMAXPROCS)
-TEST_COMMON_PARALLEL_COUNT ?= 4
+TEST_COMMON_PARALLEL_COUNT ?= 2
TEST_ADVANCED_PARALLEL_COUNT ?= 4
# OLM (Operator Lifecycle Manager and Operator Hub): uncomment to override operator settings at build time
(camel-k) 06/10: chore(e2e): Skip cluster setup when installing Camel K operators in test namespaces
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit fcd6f33e400fe708a8e73baa9335832ca20bfcc2
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Mar 5 09:28:48 2024 +0100
chore(e2e): Skip cluster setup when installing Camel K operators in test namespaces
---
e2e/support/test_support.go | 4 ++--
script/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 3fac8750c..b5cabc7a1 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -277,10 +277,10 @@ func KamelInstallWithIDAndKameletCatalog(t *testing.T, operatorID string, namesp
func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID string, namespace string, skipKameletCatalog bool, args ...string) *cobra.Command {
var installArgs []string
- installArgs = []string{"install", "-n", namespace, "--operator-id", operatorID}
+ installArgs = []string{"install", "-n", namespace, "--operator-id", operatorID, "--skip-cluster-setup"}
if skipKameletCatalog {
- installArgs = append(installArgs, "--operator-env-vars", "KAMEL_INSTALL_DEFAULT_KAMELETS=false")
+ installArgs = append(installArgs, "--skip-default-kamelets-setup")
}
logLevel := os.Getenv("CAMEL_K_TEST_LOG_LEVEL")
diff --git a/script/Makefile b/script/Makefile
index 68ed85910..79f5beccc 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -94,7 +94,7 @@ KAMELET_CATALOG_REPO_TAG := v4.0.1
DO_TEST_PREBUILD ?= true
TEST_PREBUILD = build
# Tests may run in parallel to each other. This count sets the amount of tests run in parallel. (default value usually is GOMAXPROCS)
-TEST_COMMON_PARALLEL_COUNT ?= 2
+TEST_COMMON_PARALLEL_COUNT ?= 4
TEST_ADVANCED_PARALLEL_COUNT ?= 4
# OLM (Operator Lifecycle Manager and Operator Hub): uncomment to override operator settings at build time
(camel-k) 01/10: chore(e2e): Improve E2E tests
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 773622571d0e6241880c93dd4305c9b7e1eb9155
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Feb 27 12:01:44 2024 +0100
chore(e2e): Improve E2E tests
- Improve common-it to use separate test namespace and default global operator
- Create default integration kits with global operator before tests are run
- TestMain func() creates commonly used Camel K integrations before the test so the integration kits are reused during the test run
- Reuse default integration kits (type=external image) in all test namespaces with custom operator installation
- Reduces builds of integration kits in tests
- Fix missing IntegrationProfile CRD
- Fix flaky update install tests
---
.github/actions/e2e-common/exec-tests.sh | 2 +
e2e/advanced/build_order_strategy_test.go | 2 +
e2e/advanced/builder_test.go | 1 +
e2e/advanced/catalog_builder_test.go | 1 +
e2e/advanced/debug_test.go | 1 +
e2e/advanced/deployment_test.go | 1 +
e2e/advanced/dump_test.go | 1 +
e2e/advanced/environment_test.go | 3 +-
e2e/advanced/incremental_build_test.go | 1 +
e2e/advanced/kamelet_repo_test.go | 1 +
e2e/advanced/local_platform_test.go | 1 +
e2e/advanced/main_test.go | 68 ++
e2e/advanced/maven_http_proxy_test.go | 5 +-
e2e/advanced/operator_id_filtering_test.go | 2 +
e2e/advanced/platform_traits_test.go | 1 +
e2e/advanced/promote_test.go | 2 +
e2e/advanced/reset_test.go | 1 +
e2e/advanced/synthetic_test.go | 2 +
e2e/common/cli/bind_test.go | 57 +-
e2e/common/cli/config_test.go | 42 +-
e2e/common/cli/default.go | 9 +-
e2e/common/cli/delete_test.go | 74 +--
e2e/common/cli/describe_test.go | 67 +-
e2e/common/cli/dev_mode_test.go | 196 +++---
e2e/common/cli/get_test.go | 74 +--
e2e/common/cli/log_test.go | 40 +-
e2e/common/cli/run_test.go | 325 +++++-----
e2e/common/config/config_reload_test.go | 206 ++++---
e2e/common/config/config_test.go | 576 +++++++++--------
e2e/common/config/default.go | 9 +-
e2e/common/config/kamelet_config_test.go | 407 ++++++------
e2e/common/config/pipe_config_test.go | 387 ++++++------
e2e/common/languages/default.go | 9 +-
e2e/common/languages/groovy_test.go | 17 +-
e2e/common/languages/java_test.go | 17 +-
e2e/common/languages/js_test.go | 17 +-
e2e/common/languages/kotlin_test.go | 17 +-
e2e/common/languages/polyglot_test.go | 21 +-
e2e/common/languages/xml_test.go | 17 +-
e2e/common/languages/yaml_test.go | 17 +-
e2e/common/misc/client_test.go | 55 +-
e2e/common/misc/cron_test.go | 75 +--
e2e/common/misc/default.go | 9 +-
e2e/common/misc/integration_fail_test.go | 293 ++++-----
e2e/common/misc/integration_trait_update_test.go | 31 +-
e2e/common/misc/kamelet_test.go | 49 +-
e2e/common/misc/kamelet_update_test.go | 17 +-
e2e/common/misc/maven_repository_test.go | 35 +-
e2e/common/misc/pipe_test.go | 141 ++---
e2e/common/misc/pipe_with_image_test.go | 119 ++--
e2e/common/misc/registry_maven_wagon_test.go | 2 +-
e2e/common/misc/rest_test.go | 59 +-
e2e/common/misc/scale_binding_test.go | 177 +++---
e2e/common/misc/scale_integration_test.go | 177 +++---
e2e/common/misc/structured_logs_test.go | 46 +-
e2e/common/runtimes/default.go | 9 +-
e2e/common/runtimes/runtimes_test.go | 65 +-
e2e/common/setup/main_test.go | 63 ++
e2e/common/setup/testdata/Java.java | 28 +
e2e/common/setup/testdata/yaml.yaml | 28 +
e2e/common/support/startup_test.go | 51 --
e2e/common/support/teardown_test.go | 40 --
e2e/common/traits/affinity_test.go | 135 ++--
e2e/common/traits/builder_test.go | 486 +++++++--------
e2e/common/traits/camel_test.go | 63 +-
e2e/common/traits/container_test.go | 141 ++---
e2e/common/traits/default.go | 9 +-
e2e/common/traits/deployment_test.go | 120 ++--
e2e/common/traits/error_handler_test.go | 31 +-
e2e/common/traits/errored_trait_test.go | 77 +--
e2e/common/traits/health_test.go | 753 ++++++++++++-----------
e2e/common/traits/istio_test.go | 47 +-
e2e/common/traits/jolokia_test.go | 68 +-
e2e/common/traits/jvm_test.go | 49 +-
e2e/common/traits/kamelet_test.go | 51 +-
e2e/common/traits/master_test.go | 79 +--
e2e/common/traits/openapi_test.go | 45 +-
e2e/common/traits/pdb_test.go | 201 +++---
e2e/common/traits/pod_test.go | 113 ++--
e2e/common/traits/prometheus_test.go | 75 +--
e2e/common/traits/pull_secret_test.go | 101 +--
e2e/common/traits/route_test.go | 301 ++++-----
e2e/common/traits/service_binding_test.go | 127 ++--
e2e/common/traits/service_test.go | 167 ++---
e2e/common/traits/toleration_test.go | 177 +++---
e2e/install/cli/uninstall_test.go | 2 +-
e2e/install/kustomize/operator_test.go | 9 +-
e2e/install/kustomize/setup_test.go | 10 +-
e2e/install/kustomize/uninstall_test.go | 9 +-
e2e/install/upgrade/cli_upgrade_test.go | 12 +
e2e/install/upgrade/helm_upgrade_test.go | 35 +-
e2e/install/upgrade/olm_upgrade_test.go | 14 +-
e2e/knative/default.go | 9 +-
e2e/knative/knative_platform_test.go | 4 +-
e2e/knative/support/startup_test.go | 51 --
e2e/knative/support/teardown_test.go | 40 --
e2e/support/test_support.go | 80 ++-
e2e/support/test_util.go | 19 +-
e2e/support/util/dump.go | 2 +-
e2e/telemetry/telemetry_test.go | 4 +-
pkg/cmd/install.go | 2 +-
pkg/cmd/uninstall.go | 2 +-
pkg/platform/platform.go | 4 +-
pkg/util/olm/available.go | 4 +-
script/Makefile | 8 +-
105 files changed, 4097 insertions(+), 3905 deletions(-)
diff --git a/.github/actions/e2e-common/exec-tests.sh b/.github/actions/e2e-common/exec-tests.sh
index 3a412782c..3f68f0572 100755
--- a/.github/actions/e2e-common/exec-tests.sh
+++ b/.github/actions/e2e-common/exec-tests.sh
@@ -137,6 +137,8 @@ else
export CAMEL_K_GLOBAL_OPERATOR_NS="default"
fi
+export CAMEL_K_E2E_FAST_SETUP="true"
+
# Then run all integration tests rather than ending on first failure
set -e
exit_code=0
diff --git a/e2e/advanced/build_order_strategy_test.go b/e2e/advanced/build_order_strategy_test.go
index 1f5debb4c..5dd64120d 100644
--- a/e2e/advanced/build_order_strategy_test.go
+++ b/e2e/advanced/build_order_strategy_test.go
@@ -38,6 +38,7 @@ func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-build-order-deps"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns,
"--max-running-pipelines", "4",
"--build-order-strategy", string(v1.BuildOrderStrategyDependencies)).Execute()).To(Succeed())
@@ -124,6 +125,7 @@ func TestRunBuildOrderStrategyFIFO(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-build-order-fifo"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns, "--build-order-strategy", string(v1.BuildOrderStrategyFIFO)).Execute()).To(Succeed())
Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/builder_test.go b/e2e/advanced/builder_test.go
index b79651cfd..78867b16e 100644
--- a/e2e/advanced/builder_test.go
+++ b/e2e/advanced/builder_test.go
@@ -39,6 +39,7 @@ func TestBuilderTimeout(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(OperatorPod(ns)).ShouldNot(BeNil())
Eventually(Platform(ns)).ShouldNot(BeNil())
diff --git a/e2e/advanced/catalog_builder_test.go b/e2e/advanced/catalog_builder_test.go
index 2917b1030..d67cfacd9 100644
--- a/e2e/advanced/catalog_builder_test.go
+++ b/e2e/advanced/catalog_builder_test.go
@@ -40,6 +40,7 @@ func TestCamelCatalogBuilder(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(OperatorPod(ns)).ShouldNot(BeNil())
Eventually(Platform(ns)).ShouldNot(BeNil())
diff --git a/e2e/advanced/debug_test.go b/e2e/advanced/debug_test.go
index 1a0fb8bc8..38c422cee 100644
--- a/e2e/advanced/debug_test.go
+++ b/e2e/advanced/debug_test.go
@@ -42,6 +42,7 @@ func TestKamelCLIDebug(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/deployment_test.go b/e2e/advanced/deployment_test.go
index cd8acc44d..4d489e2dd 100644
--- a/e2e/advanced/deployment_test.go
+++ b/e2e/advanced/deployment_test.go
@@ -38,6 +38,7 @@ func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
operatorID := "camel-k-failing-deploy"
nsRestr := "restr"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns, "--global", "--force").Execute()).To(Succeed())
// Create restricted namespace
ExpectExecSucceed(t,
diff --git a/e2e/advanced/dump_test.go b/e2e/advanced/dump_test.go
index 587c8116d..31a31825e 100644
--- a/e2e/advanced/dump_test.go
+++ b/e2e/advanced/dump_test.go
@@ -48,6 +48,7 @@ func TestKamelCLIDump(t *testing.T) {
t.Run("dump non-empty namespace", func(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/environment_test.go b/e2e/advanced/environment_test.go
index 4bfffb429..2befe92fe 100644
--- a/e2e/advanced/environment_test.go
+++ b/e2e/advanced/environment_test.go
@@ -50,7 +50,7 @@ func TestEnvironmentTrait(t *testing.T) {
}
// Retrieve the Kubernetes Service ClusterIPs to populate the NO_PROXY environment variable
- svc := Service("default", "kubernetes")()
+ svc := Service(TestDefaultNamespace, "kubernetes")()
Expect(svc).NotTo(BeNil())
noProxy = append(noProxy, svc.Spec.ClusterIPs...)
@@ -66,6 +66,7 @@ func TestEnvironmentTrait(t *testing.T) {
// Install Camel K with the HTTP proxy environment variable
operatorID := "camel-k-trait-environment"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=%s", httpProxy),
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","),
diff --git a/e2e/advanced/incremental_build_test.go b/e2e/advanced/incremental_build_test.go
index dc7bcf16e..a28510e78 100644
--- a/e2e/advanced/incremental_build_test.go
+++ b/e2e/advanced/incremental_build_test.go
@@ -39,6 +39,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-incremental-build"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/kamelet_repo_test.go b/e2e/advanced/kamelet_repo_test.go
index 04ee0be25..08a9ad3d5 100644
--- a/e2e/advanced/kamelet_repo_test.go
+++ b/e2e/advanced/kamelet_repo_test.go
@@ -39,6 +39,7 @@ func TestKameletFromCustomRepository(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/local_platform_test.go b/e2e/advanced/local_platform_test.go
index e896dcaaa..64516768e 100644
--- a/e2e/advanced/local_platform_test.go
+++ b/e2e/advanced/local_platform_test.go
@@ -37,6 +37,7 @@ func TestLocalPlatform(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-platform-local"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns, "--global", "--force").Execute()).To(Succeed())
Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/main_test.go b/e2e/advanced/main_test.go
new file mode 100644
index 000000000..d403140de
--- /dev/null
+++ b/e2e/advanced/main_test.go
@@ -0,0 +1,68 @@
+//go:build integration
+// +build integration
+
+// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
+
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package advanced
+
+import (
+ "fmt"
+ "os"
+ "testing"
+
+ . "github.com/onsi/gomega"
+
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+
+ corev1 "k8s.io/api/core/v1"
+)
+
+func TestMain(m *testing.M) {
+ fastSetup := GetEnvOrDefault("CAMEL_K_E2E_FAST_SETUP", "false")
+ if fastSetup != "true" {
+ os.Exit(m.Run())
+ }
+
+ operatorID := platform.DefaultPlatformName
+ ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+
+ g := NewGomega(func(message string, callerSkip ...int) {
+ fmt.Printf("Test fast setup failed! - %s\n", message)
+ })
+
+ g.Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ g.Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ g.Expect(KamelRunWithID(operatorID, ns, "files/timer-source.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(ns, "timer-source"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(ns, "timer-source", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(ns, "timer-source"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ os.Exit(m.Run())
+}
diff --git a/e2e/advanced/maven_http_proxy_test.go b/e2e/advanced/maven_http_proxy_test.go
index ef092942d..358e7ca17 100644
--- a/e2e/advanced/maven_http_proxy_test.go
+++ b/e2e/advanced/maven_http_proxy_test.go
@@ -135,7 +135,7 @@ func TestMavenProxy(t *testing.T) {
}),
))
- svc := Service("default", "kubernetes")()
+ svc := Service(TestDefaultNamespace, "kubernetes")()
Expect(svc).NotTo(BeNil())
// It may be needed to populate the values from the cluster, machine and service network CIDRs
@@ -149,7 +149,8 @@ func TestMavenProxy(t *testing.T) {
// Install Camel K with the HTTP proxy
operatorID := "camel-k-maven-proxy"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- olm, olmErr := olm.IsAPIAvailable(TestContext, TestClient(), ns)
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
+ olm, olmErr := olm.IsAPIAvailable(TestClient())
installed, inErr := kubernetes.IsAPIResourceInstalled(TestClient(), configv1.GroupVersion.String(), reflect.TypeOf(configv1.Proxy{}).Name())
permission, pErr := kubernetes.CheckPermission(TestContext, TestClient(), configv1.GroupName, reflect.TypeOf(configv1.Proxy{}).Name(), "", "cluster", "edit")
olmInstall := pErr == nil && olmErr == nil && inErr == nil && olm && installed && permission
diff --git a/e2e/advanced/operator_id_filtering_test.go b/e2e/advanced/operator_id_filtering_test.go
index 5305722ca..970dd229d 100644
--- a/e2e/advanced/operator_id_filtering_test.go
+++ b/e2e/advanced/operator_id_filtering_test.go
@@ -50,12 +50,14 @@ func TestOperatorIDFiltering(t *testing.T) {
WithNewTestNamespace(t, func(nsop1 string) {
operator1 := "operator-1"
Expect(CopyCamelCatalog(nsop1, operator1)).To(Succeed())
+ Expect(CopyIntegrationKits(nsop1, operator1)).To(Succeed())
Expect(KamelInstallWithIDAndKameletCatalog(operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
Eventually(PlatformPhase(nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
WithNewTestNamespace(t, func(nsop2 string) {
operator2 := "operator-2"
Expect(CopyCamelCatalog(nsop2, operator2)).To(Succeed())
+ Expect(CopyIntegrationKits(nsop2, operator2)).To(Succeed())
Expect(KamelInstallWithIDAndKameletCatalog(operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
Eventually(PlatformPhase(nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/platform_traits_test.go b/e2e/advanced/platform_traits_test.go
index ca5d1a920..0e0ef5d16 100644
--- a/e2e/advanced/platform_traits_test.go
+++ b/e2e/advanced/platform_traits_test.go
@@ -39,6 +39,7 @@ func TestTraitOnIntegrationPlatform(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-platform-trait-test"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
containerTestName := "testname"
diff --git a/e2e/advanced/promote_test.go b/e2e/advanced/promote_test.go
index 15580920a..40b4124c8 100644
--- a/e2e/advanced/promote_test.go
+++ b/e2e/advanced/promote_test.go
@@ -40,6 +40,7 @@ func TestKamelCLIPromote(t *testing.T) {
WithNewTestNamespace(t, func(nsDev string) {
operatorDevID := "camel-k-cli-promote-dev"
Expect(CopyCamelCatalog(nsDev, operatorDevID)).To(Succeed())
+ Expect(CopyIntegrationKits(nsDev, operatorDevID)).To(Succeed())
Expect(KamelInstallWithID(operatorDevID, nsDev).Execute()).To(Succeed())
Eventually(SelectedPlatformPhase(nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -82,6 +83,7 @@ func TestKamelCLIPromote(t *testing.T) {
WithNewTestNamespace(t, func(nsProd string) {
operatorProdID := "camel-k-cli-promote-prod"
Expect(CopyCamelCatalog(nsProd, operatorProdID)).To(Succeed())
+ Expect(CopyIntegrationKits(nsProd, operatorProdID)).To(Succeed())
Expect(KamelInstallWithID(operatorProdID, nsProd).Execute()).To(Succeed())
Eventually(PlatformPhase(nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/reset_test.go b/e2e/advanced/reset_test.go
index 3ab367410..4768ec0f7 100644
--- a/e2e/advanced/reset_test.go
+++ b/e2e/advanced/reset_test.go
@@ -36,6 +36,7 @@ func TestKamelReset(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-cli-reset"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/synthetic_test.go b/e2e/advanced/synthetic_test.go
index 67539964f..236a1fae8 100644
--- a/e2e/advanced/synthetic_test.go
+++ b/e2e/advanced/synthetic_test.go
@@ -40,6 +40,7 @@ func TestSyntheticIntegrationOff(t *testing.T) {
// Install Camel K without synthetic Integration feature variable (default)
operatorID := "camel-k-synthetic-env-off"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -62,6 +63,7 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
// Install Camel K with the synthetic Integration feature variable
operatorID := "camel-k-synthetic-env"
Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
Expect(KamelInstallWithID(operatorID, ns,
"--operator-env-vars", "CAMEL_K_SYNTHETIC_INTEGRATIONS=true",
).Execute()).To(Succeed())
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index f9a526311..e888bf597 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -33,33 +33,34 @@ import (
)
func TestKamelCLIBind(t *testing.T) {
- RegisterTestingT(t)
-
- kameletName := "test-timer-source"
- Expect(CreateTimerKamelet(ns, kameletName)()).To(Succeed())
-
- t.Run("bind timer to log", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
- Expect(KamelBindWithID(operatorID, ns, "test-timer-source", "log:info", "-p", "source.message=newText").Execute()).To(Succeed())
- Eventually(IntegrationLogs(ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
+ WithNewTestNamespace(t, func(ns string) {
+ kameletName := "test-timer-source"
+ Expect(CreateTimerKamelet(ns, kameletName)()).To(Succeed())
+
+ t.Run("bind timer to log", func(t *testing.T) {
+ Expect(KamelBindWithID(operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
+ Expect(KamelBindWithID(operatorID, ns, "test-timer-source", "log:info", "-p", "source.message=newText").Execute()).To(Succeed())
+ Eventually(IntegrationLogs(ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
+ })
+
+ t.Run("unsuccessful binding, no property", func(t *testing.T) {
+ opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+ Expect(KamelBindWithID(operatorID, ns, opns+"/timer-source", "log:info").Execute()).NotTo(Succeed())
+ })
+
+ t.Run("bind uris", func(t *testing.T) {
+ Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "timer-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "timer-to-log")).Should(ContainSubstring("Body is null"))
+ })
+
+ t.Run("bind with custom SA", func(t *testing.T) {
+ Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar", "--service-account", "my-service-account").Execute()).To(Succeed())
+ Eventually(IntegrationSpecSA(ns, "timer-to-log")).Should(Equal("my-service-account"))
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("unsuccessful binding, no property", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns, "timer-source", "log:info").Execute()).NotTo(Succeed())
- })
-
- t.Run("bind uris", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "timer-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "timer-to-log")).Should(ContainSubstring("Body is null"))
- })
-
- t.Run("bind with custom SA", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar", "--service-account", "my-service-account").Execute()).To(Succeed())
- Eventually(IntegrationSpecSA(ns, "timer-to-log")).Should(Equal("my-service-account"))
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/cli/config_test.go b/e2e/common/cli/config_test.go
index 184aba58f..20390ee89 100644
--- a/e2e/common/cli/config_test.go
+++ b/e2e/common/cli/config_test.go
@@ -39,30 +39,30 @@ import (
)
func TestKamelCLIConfig(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("check default namespace", func(t *testing.T) {
+ _, err := os.Stat(cmd.DefaultConfigLocation)
+ assert.True(t, os.IsNotExist(err), "No file at "+cmd.DefaultConfigLocation+" was expected")
+ t.Cleanup(func() { os.Remove(cmd.DefaultConfigLocation) })
+ Expect(Kamel("config", "--default-namespace", ns).Execute()).To(Succeed())
+ _, err = os.Stat(cmd.DefaultConfigLocation)
+ require.NoError(t, err, "A file at "+cmd.DefaultConfigLocation+" was expected")
+ Expect(Kamel("run", "--operator-id", operatorID, "files/yaml.yaml").Execute()).To(Succeed())
- t.Run("check default namespace", func(t *testing.T) {
- _, err := os.Stat(cmd.DefaultConfigLocation)
- assert.True(t, os.IsNotExist(err), "No file at "+cmd.DefaultConfigLocation+" was expected")
- t.Cleanup(func() { os.Remove(cmd.DefaultConfigLocation) })
- Expect(Kamel("config", "--default-namespace", ns).Execute()).To(Succeed())
- _, err = os.Stat(cmd.DefaultConfigLocation)
- require.NoError(t, err, "A file at "+cmd.DefaultConfigLocation+" was expected")
- Expect(Kamel("run", "--operator-id", operatorID, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // first line of the integration logs
+ logs := strings.Split(IntegrationLogs(ns, "yaml")(), "\n")[0]
+ podName := IntegrationPod(ns, "yaml")().Name
- // first line of the integration logs
- logs := strings.Split(IntegrationLogs(ns, "yaml")(), "\n")[0]
- podName := IntegrationPod(ns, "yaml")().Name
+ logsCLI := GetOutputStringAsync(Kamel("log", "yaml"))
+ Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ Eventually(logsCLI).Should(ContainSubstring(logs))
+ })
- logsCLI := GetOutputStringAsync(Kamel("log", "yaml"))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(logs))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all").Execute()).To(Succeed())
}
diff --git a/e2e/common/cli/default.go b/e2e/common/cli/default.go
index dbd4ae0b2..74e73354d 100644
--- a/e2e/common/cli/default.go
+++ b/e2e/common/cli/default.go
@@ -20,7 +20,10 @@ limitations under the License.
package cli
-import "github.com/apache/camel-k/v2/e2e/support"
+import (
+ "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/platform"
+)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.GetCIProcessID())
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", support.GetCIProcessID())
+var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
+var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/common/cli/delete_test.go b/e2e/common/cli/delete_test.go
index ea69bde92..01935ea56 100644
--- a/e2e/common/cli/delete_test.go
+++ b/e2e/common/cli/delete_test.go
@@ -33,47 +33,47 @@ import (
)
func TestKamelCLIDelete(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("delete running integration", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ })
- t.Run("delete running integration", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
- })
+ t.Run("delete building integration", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ })
- t.Run("delete building integration", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
- })
+ t.Run("delete several integrations", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ Expect(Kamel("delete", "java", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, "java")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "java"), TestTimeoutLong).Should(BeNil())
+ })
- t.Run("delete several integrations", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
- Expect(Kamel("delete", "java", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(ns, "java"), TestTimeoutLong).Should(BeNil())
- })
+ t.Run("delete all integrations", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ Eventually(Integration(ns, "java")).Should(BeNil())
+ Eventually(IntegrationPod(ns, "java"), TestTimeoutLong).Should(BeNil())
+ })
- t.Run("delete all integrations", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
- Eventually(Integration(ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(ns, "java"), TestTimeoutLong).Should(BeNil())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index 567801a55..ce7cb7a28 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -36,49 +36,52 @@ import (
)
func TestKamelCliDescribe(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- t.Run("Test kamel describe integration", func(t *testing.T) {
- integration := GetOutputString(Kamel("describe", "integration", "yaml", "-n", ns))
- r, _ := regexp.Compile("(?sm).*Name:\\s+yaml.*")
- Expect(integration).To(MatchRegexp(r.String()))
+ t.Run("Test kamel describe integration", func(t *testing.T) {
+ integration := GetOutputString(Kamel("describe", "integration", "yaml", "-n", ns))
+ r, _ := regexp.Compile("(?sm).*Name:\\s+yaml.*")
+ Expect(integration).To(MatchRegexp(r.String()))
- r, _ = regexp.Compile("(?sm).*Phase:\\s+Running.*")
- Expect(integration).To(MatchRegexp(r.String()))
+ r, _ = regexp.Compile("(?sm).*Phase:\\s+Running.*")
+ Expect(integration).To(MatchRegexp(r.String()))
- Expect(integration).To(ContainSubstring("Dependencies:"))
- Expect(integration).To(ContainSubstring("Conditions:"))
- })
+ Expect(integration).To(ContainSubstring("Dependencies:"))
+ Expect(integration).To(ContainSubstring("Conditions:"))
+ })
- t.Run("Test kamel describe integration kit", func(t *testing.T) {
- kitName := Integration(ns, "yaml")().Status.IntegrationKit.Name
- kit := GetOutputString(Kamel("describe", "kit", kitName, "-n", ns))
+ t.Run("Test kamel describe integration kit", func(t *testing.T) {
+ kitName := Integration(ns, "yaml")().Status.IntegrationKit.Name
+ kitNamespace := Integration(ns, "yaml")().Status.IntegrationKit.Namespace
+ kit := GetOutputString(Kamel("describe", "kit", kitName, "-n", kitNamespace))
- r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + ns + ".*")
- Expect(kit).To(MatchRegexp(r.String()))
+ r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + kitNamespace + ".*")
+ Expect(kit).To(MatchRegexp(r.String()))
- r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
- Expect(kit).To(MatchRegexp(r.String()))
+ r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
+ Expect(kit).To(MatchRegexp(r.String()))
- Expect(kit).To(ContainSubstring("camel-quarkus-core"))
+ Expect(kit).To(ContainSubstring("camel-quarkus-core"))
- Expect(kit).To(ContainSubstring("Artifacts:"))
- Expect(kit).To(ContainSubstring("Dependencies:"))
- })
+ Expect(kit).To(ContainSubstring("Artifacts:"))
+ Expect(kit).To(ContainSubstring("Dependencies:"))
+ })
- t.Run("Test kamel describe integration platform", func(t *testing.T) {
- platform := GetOutputString(Kamel("describe", "platform", operatorID, "-n", ns))
- Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
+ t.Run("Test kamel describe integration platform", func(t *testing.T) {
+ opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+ platform := GetOutputString(Kamel("describe", "platform", operatorID, "-n", opns))
+ Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
- r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + ns + ".*")
- Expect(platform).To(MatchRegexp(r.String()))
+ r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + opns + ".*")
+ Expect(platform).To(MatchRegexp(r.String()))
- r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
- Expect(platform).To(MatchRegexp(r.String()))
- })
+ r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
+ Expect(platform).To(MatchRegexp(r.String()))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go
index f617bf7a5..bc0a67636 100644
--- a/e2e/common/cli/dev_mode_test.go
+++ b/e2e/common/cli/dev_mode_test.go
@@ -37,120 +37,120 @@ import (
)
func TestRunDevMode(t *testing.T) {
- RegisterTestingT(t)
-
- /*
- * TODO
- * The changing of the yaml file constant from "string" to "magic" is not being
- * picked up when deploying on OCP4 and so the test is failing.
- *
- * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment.
- */
- if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
- t.Skip("WARNING: Test marked as problematic ... skipping")
- }
-
- t.Run("run yaml dev mode", func(t *testing.T) {
- RegisterTestingT(t)
- ctx, cancel := context.WithCancel(TestContext)
- defer cancel()
- piper, pipew := io.Pipe()
- defer pipew.Close()
- defer piper.Close()
-
- file := util.MakeTempCopy(t, "files/yaml.yaml")
- name := RandomizedSuffixName("yaml")
-
- kamelRun := KamelRunWithContext(ctx, operatorID, ns, file, "--name", name, "--dev")
- kamelRun.SetOut(pipew)
-
- logScanner := util.NewLogScanner(ctx, piper, `integration "`+name+`" in phase Running`, "Magicstring!", "Magicjordan!")
-
- args := os.Args
- defer func() { os.Args = args }()
-
- os.Args = []string{"kamel", "run", "-n", ns, "--operator-id", operatorID, file, "--name", name, "--dev"}
- go kamelRun.Execute()
-
- Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), TestTimeoutMedium).Should(BeTrue())
- Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
- Expect(logScanner.IsFound("Magicjordan!")()).To(BeFalse())
-
- util.ReplaceInFile(t, file, "string!", "jordan!")
- Eventually(logScanner.IsFound("Magicjordan!"), TestTimeoutMedium).Should(BeTrue())
- })
+ WithNewTestNamespace(t, func(ns string) {
+ /*
+ * TODO
+ * The changing of the yaml file constant from "string" to "magic" is not being
+ * picked up when deploying on OCP4 and so the test is failing.
+ *
+ * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment.
+ */
+ if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
+ t.Skip("WARNING: Test marked as problematic ... skipping")
+ }
+
+ t.Run("run yaml dev mode", func(t *testing.T) {
+ RegisterTestingT(t)
+ ctx, cancel := context.WithCancel(TestContext)
+ defer cancel()
+ piper, pipew := io.Pipe()
+ defer pipew.Close()
+ defer piper.Close()
- t.Run("run yaml remote dev mode", func(t *testing.T) {
- RegisterTestingT(t)
- ctx, cancel := context.WithCancel(TestContext)
- defer cancel()
- piper, pipew := io.Pipe()
- defer pipew.Close()
- defer piper.Close()
+ file := util.MakeTempCopy(t, "files/yaml.yaml")
+ name := RandomizedSuffixName("yaml")
- remoteFile := "https://raw.githubusercontent.com/apache/camel-k/b29333f0a878d5d09fb3965be8fe586d77dd95d0/e2e/common/files/yaml.yaml"
- name := RandomizedSuffixName("yaml")
- kamelRun := KamelRunWithContext(ctx, operatorID, ns, remoteFile, "--name", name, "--dev")
- kamelRun.SetOut(pipew)
+ kamelRun := KamelRunWithContext(ctx, operatorID, ns, file, "--name", name, "--dev")
+ kamelRun.SetOut(pipew)
- logScanner := util.NewLogScanner(ctx, piper, "Magicstring!")
+ logScanner := util.NewLogScanner(ctx, piper, `integration "`+name+`" in phase Running`, "Magicstring!", "Magicjordan!")
- args := os.Args
- defer func() { os.Args = args }()
+ args := os.Args
+ defer func() { os.Args = args }()
- os.Args = []string{"kamel", "run", "-n", ns, "--operator-id", operatorID, remoteFile, "--name", name, "--dev"}
+ os.Args = []string{"kamel", "run", "-n", ns, "--operator-id", operatorID, file, "--name", name, "--dev"}
+ go kamelRun.Execute()
- go kamelRun.Execute()
+ Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), TestTimeoutMedium).Should(BeTrue())
+ Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
+ Expect(logScanner.IsFound("Magicjordan!")()).To(BeFalse())
- Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
- })
+ util.ReplaceInFile(t, file, "string!", "jordan!")
+ Eventually(logScanner.IsFound("Magicjordan!"), TestTimeoutMedium).Should(BeTrue())
+ })
- // This test makes sure that `kamel run --dev` runs in seconds after initial build is
- // already done for the same integration.
- t.Run("dev mode rebuild in seconds", func(t *testing.T) {
- /*
- * !!! NOTE !!!
- * If you find this test flaky, instead of thinking it as simply unstable, investigate
- * why it does not finish in a few seconds and remove the bottlenecks which are lagging
- * the integration startup.
- */
- RegisterTestingT(t)
- name := RandomizedSuffixName("yaml")
+ t.Run("run yaml remote dev mode", func(t *testing.T) {
+ RegisterTestingT(t)
+ ctx, cancel := context.WithCancel(TestContext)
+ defer cancel()
+ piper, pipew := io.Pipe()
+ defer pipew.Close()
+ defer piper.Close()
- // First run (warm up)
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name)).Should(BeNil())
- Eventually(IntegrationPod(ns, name), TestTimeoutMedium).Should(BeNil())
+ remoteFile := "https://raw.githubusercontent.com/apache/camel-k/b29333f0a878d5d09fb3965be8fe586d77dd95d0/e2e/common/files/yaml.yaml"
+ name := RandomizedSuffixName("yaml")
+ kamelRun := KamelRunWithContext(ctx, operatorID, ns, remoteFile, "--name", name, "--dev")
+ kamelRun.SetOut(pipew)
- // Second run (rebuild)
- ctx, cancel := context.WithCancel(TestContext)
- defer cancel()
- piper, pipew := io.Pipe()
- defer pipew.Close()
- defer piper.Close()
+ logScanner := util.NewLogScanner(ctx, piper, "Magicstring!")
- file := util.MakeTempCopy(t, "files/yaml.yaml")
+ args := os.Args
+ defer func() { os.Args = args }()
- kamelRun := KamelRunWithContext(ctx, operatorID, ns, file, "--name", name, "--dev")
- kamelRun.SetOut(pipew)
+ os.Args = []string{"kamel", "run", "-n", ns, "--operator-id", operatorID, remoteFile, "--name", name, "--dev"}
- logScanner := util.NewLogScanner(ctx, piper, `integration "`+name+`" in phase Running`, "Magicstring!")
+ go kamelRun.Execute()
- args := os.Args
- defer func() { os.Args = args }()
+ Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
+ })
- os.Args = []string{"kamel", "run", "-n", ns, "--operator-id", operatorID, file, "--name", name, "--dev"}
+ // This test makes sure that `kamel run --dev` runs in seconds after initial build is
+ // already done for the same integration.
+ t.Run("dev mode rebuild in seconds", func(t *testing.T) {
+ /*
+ * !!! NOTE !!!
+ * If you find this test flaky, instead of thinking it as simply unstable, investigate
+ * why it does not finish in a few seconds and remove the bottlenecks which are lagging
+ * the integration startup.
+ */
+ RegisterTestingT(t)
+ name := RandomizedSuffixName("yaml")
- go kamelRun.Execute()
+ // First run (warm up)
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name)).Should(BeNil())
+ Eventually(IntegrationPod(ns, name), TestTimeoutMedium).Should(BeNil())
- // Second run should start up within a few seconds
- timeout := 10 * time.Second
- Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), timeout).Should(BeTrue())
- Eventually(logScanner.IsFound("Magicstring!"), timeout).Should(BeTrue())
- })
+ // Second run (rebuild)
+ ctx, cancel := context.WithCancel(TestContext)
+ defer cancel()
+ piper, pipew := io.Pipe()
+ defer pipew.Close()
+ defer piper.Close()
+
+ file := util.MakeTempCopy(t, "files/yaml.yaml")
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ kamelRun := KamelRunWithContext(ctx, operatorID, ns, file, "--name", name, "--dev")
+ kamelRun.SetOut(pipew)
+
+ logScanner := util.NewLogScanner(ctx, piper, `integration "`+name+`" in phase Running`, "Magicstring!")
+
+ args := os.Args
+ defer func() { os.Args = args }()
+
+ os.Args = []string{"kamel", "run", "-n", ns, "--operator-id", operatorID, file, "--name", name, "--dev"}
+
+ go kamelRun.Execute()
+
+ // Second run should start up within a few seconds
+ timeout := 10 * time.Second
+ Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), timeout).Should(BeTrue())
+ Eventually(logScanner.IsFound("Magicstring!"), timeout).Should(BeTrue())
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/cli/get_test.go b/e2e/common/cli/get_test.go
index e1a461b3b..88cdffda2 100644
--- a/e2e/common/cli/get_test.go
+++ b/e2e/common/cli/get_test.go
@@ -34,42 +34,46 @@ import (
)
func TestKamelCLIGet(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("get integration", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- // regex is used for the compatibility of tests between OC and vanilla K8
- // kamel get may have different output depending on the platform
- Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
- kitName := IntegrationKit(ns, "yaml")()
- regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*yaml\tRunning\t(%s/%s|%s)", ns, kitName, kitName)
- Expect(GetOutputString(Kamel("get", "-n", ns))).To(MatchRegexp(regex))
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("get integration", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ // regex is used for the compatibility of tests between OC and vanilla K8
+ // kamel get may have different output depending on the platform
+ Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
+ kitName := IntegrationKit(ns, "yaml")()
+ kitNamespace := IntegrationKitNamespace(ns, "yaml")()
+ regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*yaml\tRunning\t(%s/%s|%s)", kitNamespace, kitName, kitName)
+ Expect(GetOutputString(Kamel("get", "-n", ns))).To(MatchRegexp(regex))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("get several integrations", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ Eventually(IntegrationKit(ns, "java")).ShouldNot(Equal(""))
+ Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
+ kitName1 := IntegrationKit(ns, "java")()
+ kitName2 := IntegrationKit(ns, "yaml")()
+ kitNamespace1 := IntegrationKitNamespace(ns, "java")()
+ kitNamespace2 := IntegrationKitNamespace(ns, "yaml")()
+ regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*java\tRunning\t"+
+ "(%s/%s|%s)\n\\s*yaml\tRunning\t(%s/%s|%s)\n", kitNamespace1, kitName1, kitName1, kitNamespace2, kitName2, kitName2)
+ Expect(GetOutputString(Kamel("get", "-n", ns))).To(MatchRegexp(regex))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("get no integrations", func(t *testing.T) {
+ Expect(GetOutputString(Kamel("get", "-n", ns))).NotTo(ContainSubstring("Running"))
+ Expect(GetOutputString(Kamel("get", "-n", ns))).NotTo(ContainSubstring("Building Kit"))
+ })
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("get several integrations", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- Eventually(IntegrationKit(ns, "java")).ShouldNot(Equal(""))
- Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
- kitName1 := IntegrationKit(ns, "java")()
- kitName2 := IntegrationKit(ns, "yaml")()
- regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*java\tRunning\t"+
- "(%s/%s|%s)\n\\s*yaml\tRunning\t(%s/%s|%s)\n", ns, kitName1, kitName1, ns, kitName2, kitName2)
- Expect(GetOutputString(Kamel("get", "-n", ns))).To(MatchRegexp(regex))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("get no integrations", func(t *testing.T) {
- Expect(GetOutputString(Kamel("get", "-n", ns))).NotTo(ContainSubstring("Running"))
- Expect(GetOutputString(Kamel("get", "-n", ns))).NotTo(ContainSubstring("Building Kit"))
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/cli/log_test.go b/e2e/common/cli/log_test.go
index 3396948db..093872822 100644
--- a/e2e/common/cli/log_test.go
+++ b/e2e/common/cli/log_test.go
@@ -32,24 +32,26 @@ import (
)
func TestKamelCLILog(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("check integration log", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "log-yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- // first line of the integration logs
- firstLine := strings.Split(IntegrationLogs(ns, "log-yaml")(), "\n")[0]
- podName := IntegrationPod(ns, "log-yaml")().Name
-
- logsCLI := GetOutputStringAsync(Kamel("log", "log-yaml", "-n", ns))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(firstLine))
-
- logs := strings.Split(IntegrationLogs(ns, "log-yaml")(), "\n")
- lastLine := logs[len(logs)-1]
-
- logsCLI = GetOutputStringAsync(Kamel("log", "log-yaml", "-n", ns, "--tail", "5"))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(lastLine))
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("check integration log", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "log-yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ // first line of the integration logs
+ firstLine := strings.Split(IntegrationLogs(ns, "log-yaml")(), "\n")[0]
+ podName := IntegrationPod(ns, "log-yaml")().Name
+
+ logsCLI := GetOutputStringAsync(Kamel("log", "log-yaml", "-n", ns))
+ Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ Eventually(logsCLI).Should(ContainSubstring(firstLine))
+
+ logs := strings.Split(IntegrationLogs(ns, "log-yaml")(), "\n")
+ lastLine := logs[len(logs)-1]
+
+ logsCLI = GetOutputStringAsync(Kamel("log", "log-yaml", "-n", ns, "--tail", "5"))
+ Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ Eventually(logsCLI).Should(ContainSubstring(lastLine))
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index 81ccbd330..692b4a20f 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -39,183 +39,196 @@ import (
var sampleJar = "https://raw.githubusercontent.com/apache/camel-k/main/e2e/common/traits/files/jvm/sample-1.0.jar"
func TestKamelCLIRun(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Examples from GitHub", func(t *testing.T) {
- t.Run("Java", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
- "github:apache/camel-k-examples/generic-examples/languages/Sample.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
- })
-
- t.Run("Java (RAW)", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
- "https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java").Execute()).
- To(Succeed())
- Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
- })
-
- t.Run("Java (branch)", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
- "github:apache/camel-k-examples/generic-examples/languages/Sample.java?branch=main").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Examples from GitHub", func(t *testing.T) {
+ t.Run("Java", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
+ "github:apache/camel-k-examples/generic-examples/languages/Sample.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
+
+ t.Run("Java (RAW)", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
+ "https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java").Execute()).
+ To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
+
+ t.Run("Java (branch)", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
+ "github:apache/camel-k-examples/generic-examples/languages/Sample.java?branch=main").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
+
+ // GIST does not like GITHUB_TOKEN apparently, we must temporarily remove it
+ os.Setenv("GITHUB_TOKEN_TMP", os.Getenv("GITHUB_TOKEN"))
+ os.Unsetenv("GITHUB_TOKEN")
+
+ t.Run("Gist (ID)", func(t *testing.T) {
+ name := RandomizedSuffixName("github-gist-id")
+ Expect(KamelRunWithID(operatorID, ns, "--name", name,
+ "gist:e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
+
+ t.Run("Gist (URL)", func(t *testing.T) {
+ name := RandomizedSuffixName("github-gist-url")
+ Expect(KamelRunWithID(operatorID, ns, "--name", name,
+ "https://gist.github.com/lburgazzoli/e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
+
+ // Revert GITHUB TOKEN
+ os.Setenv("GITHUB_TOKEN", os.Getenv("GITHUB_TOKEN_TMP"))
+ os.Unsetenv("GITHUB_TOKEN_TMP")
+
+ // Clean up
Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
})
- // GIST does not like GITHUB_TOKEN apparently, we must temporary remove it
- os.Setenv("GITHUB_TOKEN_TMP", os.Getenv("GITHUB_TOKEN"))
- os.Unsetenv("GITHUB_TOKEN")
-
- t.Run("Gist (ID)", func(t *testing.T) {
- name := RandomizedSuffixName("github-gist-id")
- Expect(KamelRunWithID(operatorID, ns, "--name", name,
- "gist:e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
- })
-
- t.Run("Gist (URL)", func(t *testing.T) {
- name := RandomizedSuffixName("github-gist-url")
- Expect(KamelRunWithID(operatorID, ns, "--name", name,
- "https://gist.github.com/lburgazzoli/e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
+ t.Run("Run and update", func(t *testing.T) {
+ name := RandomizedSuffixName("run")
+ Expect(KamelRunWithID(operatorID, ns, "files/run.yaml", "--name", name).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
- })
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magic default"))
- // Revert GITHUB TOKEN
- os.Setenv("GITHUB_TOKEN", os.Getenv("GITHUB_TOKEN_TMP"))
- os.Unsetenv("GITHUB_TOKEN_TMP")
+ // Re-run the Integration with an updated configuration
+ Expect(KamelRunWithID(operatorID, ns, "files/run.yaml", "--name", name, "-p", "property=value").Execute()).
+ To(Succeed())
- // Clean up
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
- })
+ // Check the Deployment has progressed successfully
+ Eventually(DeploymentCondition(ns, name, appsv1.DeploymentProgressing), TestTimeoutShort).
+ Should(MatchFields(IgnoreExtras, Fields{
+ "Status": Equal(corev1.ConditionTrue),
+ "Reason": Equal("NewReplicaSetAvailable"),
+ }))
- t.Run("Run and update", func(t *testing.T) {
- name := RandomizedSuffixName("run")
- Expect(KamelRunWithID(operatorID, ns, "files/run.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magic default"))
-
- // Re-run the Integration with an updated configuration
- Expect(KamelRunWithID(operatorID, ns, "files/run.yaml", "--name", name, "-p", "property=value").Execute()).
- To(Succeed())
-
- // Check the Deployment has progressed successfully
- Eventually(DeploymentCondition(ns, name, appsv1.DeploymentProgressing), TestTimeoutShort).
- Should(MatchFields(IgnoreExtras, Fields{
- "Status": Equal(corev1.ConditionTrue),
- "Reason": Equal("NewReplicaSetAvailable"),
- }))
-
- // Check the new configuration is taken into account
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magic value"))
-
- // Clean up
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
- })
-
- t.Run("Run with glob patterns", func(t *testing.T) {
- t.Run("YAML", func(t *testing.T) {
- name := RandomizedSuffixName("run")
- Expect(KamelRunWithID(operatorID, ns, "files/glob/run*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ // Check the new configuration is taken into account
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magic value"))
+
+ // Clean up
Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
})
- t.Run("Java", func(t *testing.T) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/glob/Java*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ t.Run("Run with glob patterns", func(t *testing.T) {
+ t.Run("YAML", func(t *testing.T) {
+ name := RandomizedSuffixName("run")
+ Expect(KamelRunWithID(operatorID, ns, "files/glob/run*", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
+
+ t.Run("Java", func(t *testing.T) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/glob/Java*", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
+
+ t.Run("All", func(t *testing.T) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/glob/*", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
+
+ // Clean up
Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
})
+ })
- t.Run("All", func(t *testing.T) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/glob/*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ WithNewTestNamespace(t, func(ns string) {
+ /*
+ * TODO
+ * The dependency cannot be read by maven while building. See #3708
+ *
+ * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment.
+ */
+ t.Run("Run with http dependency", func(t *testing.T) {
+ if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
+ t.Skip("WARNING: Test marked as problematic ... skipping")
+ }
+ // Requires a local integration platform in order to resolve the insecure registry
+ // Install platform (use the installer to get staging if present)
+ Expect(KamelInstallWithID("local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
+
+ Expect(KamelRunWithID(operatorID, ns, "../traits/files/jvm/Classpath.java",
+ "-d", sampleJar,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
})
-
- // Clean up
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
})
- /*
- * TODO
- * The dependency cannot be read by maven while building. See #3708
- *
- * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment.
- */
- t.Run("Run with http dependency", func(t *testing.T) {
- if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
- t.Skip("WARNING: Test marked as problematic ... skipping")
- }
- Expect(KamelRunWithID(operatorID, ns, "../traits/files/jvm/Classpath.java",
- "-d", sampleJar,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
- })
+ WithNewTestNamespace(t, func(ns string) {
+ /*
+ * TODO
+ * The dependency cannot be read by maven while building. See #3708
+ *
+ * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment.
+ */
+ t.Run("Run with http dependency using options", func(t *testing.T) {
+ if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
+ t.Skip("WARNING: Test marked as problematic ... skipping")
+ }
+ // Requires a local integration platform in order to resolve the insecure registry
+ // Install platform (use the installer to get staging if present)
+ Expect(KamelInstallWithID("local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
+
+ Expect(KamelRunWithID(operatorID, ns, "../traits/files/jvm/Classpath.java",
+ "-d", sampleJar,
+ "-d", "https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java|targetPath=/tmp/foo",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
+ Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ })
- /*
- * TODO
- * The dependency cannot be read by maven while building. See #3708
- *
- * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment.
- */
- t.Run("Run with http dependency using options", func(t *testing.T) {
- if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
- t.Skip("WARNING: Test marked as problematic ... skipping")
- }
- Expect(KamelRunWithID(operatorID, ns, "../traits/files/jvm/Classpath.java",
- "-d", sampleJar,
- "-d", "https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java|targetPath=/tmp/foo",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/config/config_reload_test.go b/e2e/common/config/config_reload_test.go
index 94a18a86b..b8e3dd33b 100644
--- a/e2e/common/config/config_reload_test.go
+++ b/e2e/common/config/config_reload_test.go
@@ -35,86 +35,89 @@ import (
)
func TestConfigmapHotReload(t *testing.T) {
- RegisterTestingT(t)
-
- name := RandomizedSuffixName("config-configmap-route")
-
- var cmData = make(map[string]string)
- cmData["my-configmap-key"] = "my configmap content"
- CreatePlainTextConfigmapWithLabels(ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
-
- Expect(KamelRunWithID(operatorID, ns,
- "./files/config-configmap-route.groovy",
- "--config",
- "configmap:my-hot-cm",
- "-t",
- "mount.hot-reload=true",
- "--name",
- name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
-
- cmData["my-configmap-key"] = "my configmap content updated"
- UpdatePlainTextConfigmapWithLabels(ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+
+ name := RandomizedSuffixName("config-configmap-route")
+
+ var cmData = make(map[string]string)
+ cmData["my-configmap-key"] = "my configmap content"
+ CreatePlainTextConfigmapWithLabels(ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
+
+ Expect(KamelRunWithID(operatorID, ns,
+ "./files/config-configmap-route.groovy",
+ "--config",
+ "configmap:my-hot-cm",
+ "-t",
+ "mount.hot-reload=true",
+ "--name",
+ name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+
+ cmData["my-configmap-key"] = "my configmap content updated"
+ UpdatePlainTextConfigmapWithLabels(ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func TestConfigmapHotReloadDefault(t *testing.T) {
- RegisterTestingT(t)
-
- name := RandomizedSuffixName("config-configmap-route")
-
- var cmData = make(map[string]string)
- cmData["my-configmap-key"] = "my configmap content"
- CreatePlainTextConfigmapWithLabels(ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
-
- Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy",
- "--config",
- "configmap:my-hot-cm-2",
- "--name",
- name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
-
- cmData["my-configmap-key"] = "my configmap content updated"
- UpdatePlainTextConfigmapWithLabels(ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+
+ name := RandomizedSuffixName("config-configmap-route")
+
+ var cmData = make(map[string]string)
+ cmData["my-configmap-key"] = "my configmap content"
+ CreatePlainTextConfigmapWithLabels(ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy",
+ "--config",
+ "configmap:my-hot-cm-2",
+ "--name",
+ name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+
+ cmData["my-configmap-key"] = "my configmap content updated"
+ UpdatePlainTextConfigmapWithLabels(ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func TestSecretHotReload(t *testing.T) {
- RegisterTestingT(t)
-
- name := RandomizedSuffixName("config-secret-route")
-
- var secData = make(map[string]string)
- secData["my-secret-key"] = "very top secret"
- CreatePlainTextSecretWithLabels(ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
-
- Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-route.groovy",
- "--config",
- "secret:my-hot-sec",
- "-t",
- "mount.hot-reload=true",
- "--name",
- name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret"))
-
- secData["my-secret-key"] = "very top secret updated"
- UpdatePlainTextSecretWithLabels(ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+
+ name := RandomizedSuffixName("config-secret-route")
+
+ var secData = make(map[string]string)
+ secData["my-secret-key"] = "very top secret"
+ CreatePlainTextSecretWithLabels(ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-route.groovy",
+ "--config",
+ "secret:my-hot-sec",
+ "-t",
+ "mount.hot-reload=true",
+ "--name",
+ name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret"))
+
+ secData["my-secret-key"] = "very top secret updated"
+ UpdatePlainTextSecretWithLabels(ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func TestConfigmapWithOwnerRefHotReloadDefault(t *testing.T) {
@@ -126,31 +129,32 @@ func TestConfigmapWithOwnerRefHotReload(t *testing.T) {
}
func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
- RegisterTestingT(t)
- name := RandomizedSuffixName("config-configmap-route")
- cmName := RandomizedSuffixName("my-hot-cm-")
- Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy",
- "--config",
- "configmap:"+cmName,
- "--name",
- name,
- "-t",
- "mount.hot-reload="+strconv.FormatBool(hotreload),
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- var cmData = make(map[string]string)
- cmData["my-configmap-key"] = "my configmap content"
- CreatePlainTextConfigmapWithOwnerRefWithLabels(ns, cmName, cmData, name, Integration(ns, name)().UID, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content"))
- cmData["my-configmap-key"] = "my configmap content updated"
- UpdatePlainTextConfigmapWithLabels(ns, cmName, cmData, map[string]string{"camel.apache.org/integration": "test"})
- if hotreload {
- Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content updated"))
- } else {
- Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(Not(ContainSubstring("my configmap content updated")))
- }
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- DeleteConfigmap(ns, cmName)
+ WithNewTestNamespace(t, func(ns string) {
+
+ name := RandomizedSuffixName("config-configmap-route")
+ cmName := RandomizedSuffixName("my-hot-cm-")
+ Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy",
+ "--config",
+ "configmap:"+cmName,
+ "--name",
+ name,
+ "-t",
+ "mount.hot-reload="+strconv.FormatBool(hotreload),
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ var cmData = make(map[string]string)
+ cmData["my-configmap-key"] = "my configmap content"
+ CreatePlainTextConfigmapWithOwnerRefWithLabels(ns, cmName, cmData, name, Integration(ns, name)().UID, map[string]string{"camel.apache.org/integration": "test"})
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content"))
+ cmData["my-configmap-key"] = "my configmap content updated"
+ UpdatePlainTextConfigmapWithLabels(ns, cmName, cmData, map[string]string{"camel.apache.org/integration": "test"})
+ if hotreload {
+ Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content updated"))
+ } else {
+ Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(Not(ContainSubstring("my configmap content updated")))
+ }
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index ef178e3c9..a799063e5 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -35,303 +35,291 @@ import (
)
func TestRunConfigExamples(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Simple property", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
- Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Property file", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/property-file-route.groovy", "--property", "file:./files/my.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
- Expect(Kamel("delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Property precedence", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/property-file-route.groovy", "-p", "my.key.2=universe", "-p", "file:./files/my.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello universe"))
- Expect(Kamel("delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Property from ConfigMap", func(t *testing.T) {
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Simple property", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
+ Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Property file", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/property-file-route.groovy", "--property", "file:./files/my.properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
+ Expect(Kamel("delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Property precedence", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/property-file-route.groovy", "-p", "my.key.2=universe", "-p", "file:./files/my.properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello universe"))
+ Expect(Kamel("delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Property from ConfigMap", func(t *testing.T) {
+ var cmData = make(map[string]string)
+ cmData["my.message"] = "my-configmap-property-value"
+ CreatePlainTextConfigmap(ns, "my-cm-test-property", cmData)
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
+ Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Property from ConfigMap as property file", func(t *testing.T) {
+ var cmData = make(map[string]string)
+ cmData["my.properties"] = "my.message=my-configmap-property-entry"
+ CreatePlainTextConfigmap(ns, "my-cm-test-properties", cmData)
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-entry"))
+ Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Property from Secret", func(t *testing.T) {
+ var secData = make(map[string]string)
+ secData["my.message"] = "my-secret-property-value"
+ CreatePlainTextSecret(ns, "my-sec-test-property", secData)
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
+ Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Property from Secret as property file", func(t *testing.T) {
+ var secData = make(map[string]string)
+ secData["my.properties"] = "my.message=my-secret-property-entry"
+ CreatePlainTextSecret(ns, "my-sec-test-properties", secData)
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-entry"))
+ })
+
+ t.Run("Property from Secret inlined", func(t *testing.T) {
+ var secData = make(map[string]string)
+ secData["my-message"] = "my-secret-external-value"
+ CreatePlainTextSecret(ns, "my-sec-inlined", secData)
+
+ // TODO: remove jvm.options trait as soon as CAMEL-20054 gets fixed
+ Expect(KamelRunWithID(operatorID, ns, "./files/property-secret-route.groovy",
+ "-t", "mount.configs=secret:my-sec-inlined",
+ "-t", "jvm.options=-Dcamel.k.mount-path.secrets=/etc/camel/conf.d/_secrets",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, "property-secret-route")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, "property-secret-route")()
+ mountTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "mount")
+ Expect(mountTrait).ToNot(BeNil())
+ Expect(len(mountTrait)).To(Equal(1))
+ Expect(mountTrait["configs"]).ToNot(BeNil())
+
+ Expect(Kamel("delete", "property-secret-route", "-n", ns).Execute()).To(Succeed())
+
+ })
+
+ // Configmap
+
+ // Store a configmap on the cluster
var cmData = make(map[string]string)
- cmData["my.message"] = "my-configmap-property-value"
- CreatePlainTextConfigmap(ns, "my-cm-test-property", cmData)
-
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
- Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Property from ConfigMap as property file", func(t *testing.T) {
- var cmData = make(map[string]string)
- cmData["my.properties"] = "my.message=my-configmap-property-entry"
- CreatePlainTextConfigmap(ns, "my-cm-test-properties", cmData)
-
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-entry"))
- Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Property from Secret", func(t *testing.T) {
+ cmData["my-configmap-key"] = "my-configmap-content"
+ CreatePlainTextConfigmap(ns, "my-cm", cmData)
+
+ // Store a configmap with multiple values
+ var cmDataMulti = make(map[string]string)
+ cmDataMulti["my-configmap-key"] = "should-not-see-it"
+ cmDataMulti["my-configmap-key-2"] = "my-configmap-content-2"
+ CreatePlainTextConfigmap(ns, "my-cm-multi", cmDataMulti)
+
+ t.Run("Config configmap", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "config-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "config-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ })
+
+ t.Run("Resource configmap", func(t *testing.T) {
+ // We can reuse the configmap created previously
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-route.groovy", "--resource", "configmap:my-cm").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "resource-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "resource-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ })
+
+ t.Run("Resource configmap with destination", func(t *testing.T) {
+ // We can reuse the configmap created previously
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-location-route.groovy", "--resource", "configmap:my-cm@/tmp/app").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "resource-configmap-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "resource-configmap-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "resource-configmap-location-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ })
+
+ t.Run("Resource configmap with filtered key and destination", func(t *testing.T) {
+ // We'll use the configmap contaning 2 values filtering only 1 key
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-key-location-route.groovy", "--resource", "configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "resource-configmap-key-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "resource-configmap-key-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "resource-configmap-key-location-route"), TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
+ Eventually(IntegrationLogs(ns, "resource-configmap-key-location-route"), TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
+ })
+
+ // Store a configmap as property file
+ var cmDataProps = make(map[string]string)
+ cmDataProps["my.properties"] = "my.key.1=hello\nmy.key.2=world"
+ CreatePlainTextConfigmap(ns, "my-cm-properties", cmDataProps)
+
+ t.Run("Config configmap as property file", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-properties-route.groovy", "--config", "configmap:my-cm-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "config-configmap-properties-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "config-configmap-properties-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "config-configmap-properties-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
+ })
+
+ // Secret
+
+ // Store a secret on the cluster
var secData = make(map[string]string)
- secData["my.message"] = "my-secret-property-value"
- CreatePlainTextSecret(ns, "my-sec-test-property", secData)
-
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
- Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Property from Secret as property file", func(t *testing.T) {
- var secData = make(map[string]string)
- secData["my.properties"] = "my.message=my-secret-property-entry"
- CreatePlainTextSecret(ns, "my-sec-test-properties", secData)
-
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-entry"))
- })
-
- t.Run("Property from Secret inlined", func(t *testing.T) {
- var secData = make(map[string]string)
- secData["my-message"] = "my-secret-external-value"
- CreatePlainTextSecret(ns, "my-sec-inlined", secData)
-
- // TODO: remove jvm.options trait as soon as CAMEL-20054 gets fixed
- Expect(KamelRunWithID(operatorID, ns, "./files/property-secret-route.groovy",
- "-t", "mount.configs=secret:my-sec-inlined",
- "-t", "jvm.options=-Dcamel.k.mount-path.secrets=/etc/camel/conf.d/_secrets",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "property-secret-route")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "property-secret-route")()
- mountTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "mount")
- Expect(mountTrait).ToNot(BeNil())
- Expect(len(mountTrait)).To(Equal(1))
- Expect(mountTrait["configs"]).ToNot(BeNil())
-
- Expect(Kamel("delete", "property-secret-route", "-n", ns).Execute()).To(Succeed())
-
- })
-
- // Configmap
-
- // Store a configmap on the cluster
- var cmData = make(map[string]string)
- cmData["my-configmap-key"] = "my-configmap-content"
- CreatePlainTextConfigmap(ns, "my-cm", cmData)
-
- // Store a configmap with multiple values
- var cmDataMulti = make(map[string]string)
- cmDataMulti["my-configmap-key"] = "should-not-see-it"
- cmDataMulti["my-configmap-key-2"] = "my-configmap-content-2"
- CreatePlainTextConfigmap(ns, "my-cm-multi", cmDataMulti)
-
- t.Run("Config configmap", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
- })
-
- t.Run("Resource configmap", func(t *testing.T) {
- // We can reuse the configmap created previously
-
- Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-route.groovy", "--resource", "configmap:my-cm").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "resource-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "resource-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
- })
-
- t.Run("Resource configmap with destination", func(t *testing.T) {
- // We can reuse the configmap created previously
-
- Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-location-route.groovy", "--resource", "configmap:my-cm@/tmp/app").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "resource-configmap-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "resource-configmap-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "resource-configmap-location-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
- })
-
- t.Run("Resource configmap with filtered key and destination", func(t *testing.T) {
- // We'll use the configmap contaning 2 values filtering only 1 key
-
- Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-key-location-route.groovy", "--resource", "configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "resource-configmap-key-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "resource-configmap-key-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "resource-configmap-key-location-route"), TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
- Eventually(IntegrationLogs(ns, "resource-configmap-key-location-route"), TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
- })
-
- // Store a configmap as property file
- var cmDataProps = make(map[string]string)
- cmDataProps["my.properties"] = "my.key.1=hello\nmy.key.2=world"
- CreatePlainTextConfigmap(ns, "my-cm-properties", cmDataProps)
-
- t.Run("Config configmap as property file", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-properties-route.groovy", "--config", "configmap:my-cm-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-configmap-properties-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-configmap-properties-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-configmap-properties-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
- })
+ secData["my-secret-key"] = "very top secret"
+ CreatePlainTextSecret(ns, "my-sec", secData)
+
+ // Store a secret with multi values
+ var secDataMulti = make(map[string]string)
+ secDataMulti["my-secret-key"] = "very top secret"
+ secDataMulti["my-secret-key-2"] = "even more secret"
+ CreatePlainTextSecret(ns, "my-sec-multi", secDataMulti)
+
+ t.Run("Config secret", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "config-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "config-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ })
+
+ t.Run("Resource secret", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/resource-secret-route.groovy", "--resource", "secret:my-sec").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "resource-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "resource-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Secret with filtered key", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-key-route.groovy", "--config", "secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "config-secret-key-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "config-secret-key-route"), TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
+ Eventually(IntegrationLogs(ns, "config-secret-key-route"), TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ // Build-Properties
+ t.Run("Build time property", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/build-property-route.groovy", "--build-property", "quarkus.application.name=my-super-application").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "build-property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "build-property-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ // Don't delete - we need it for next test execution
+ })
+
+ // We need to check also that the property (which is available in the IntegrationKit) is correctly replaced and we don't reuse the same kit
+ t.Run("Build time property updated", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/build-property-route.groovy", "--name", "build-property-route-updated",
+ "--build-property", "quarkus.application.name=my-super-application-updated").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "build-property-route-updated"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
+ // Verify the integration kits are different
+ Eventually(IntegrationKit(ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(ns, "build-property-route")()))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ // Build-Properties file
+ t.Run("Build time property file", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Build time property file with precedence", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "quarkus.application.name=my-overridden-application", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutMedium).Should(ContainSubstring("my-overridden-application"))
+ Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Build time property from ConfigMap", func(t *testing.T) {
+ var cmData = make(map[string]string)
+ cmData["quarkus.application.name"] = "my-cool-application"
+ CreatePlainTextConfigmap(ns, "my-cm-test-build-property", cmData)
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutLong).Should(ContainSubstring("my-cool-application"))
+ Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Build time property from ConfigMap as property file", func(t *testing.T) {
+ var cmData = make(map[string]string)
+ cmData["my.properties"] = "quarkus.application.name=my-super-cool-application"
+ CreatePlainTextConfigmap(ns, "my-cm-test-build-properties", cmData)
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
+ Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+
+ })
+
+ t.Run("Build time property from Secret", func(t *testing.T) {
+ var secData = make(map[string]string)
+ secData["quarkus.application.name"] = "my-great-application"
+ CreatePlainTextSecret(ns, "my-sec-test-build-property", secData)
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-great-application"))
+ Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+
+ })
+
+ t.Run("Build time property from Secret as property file", func(t *testing.T) {
+ var secData = make(map[string]string)
+ secData["my.properties"] = "quarkus.application.name=my-awsome-application"
+ CreatePlainTextSecret(ns, "my-sec-test-build-properties", secData)
+
+ Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-awsome-application"))
+ Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+
+ })
- // Secret
-
- // Store a secret on the cluster
- var secData = make(map[string]string)
- secData["my-secret-key"] = "very top secret"
- CreatePlainTextSecret(ns, "my-sec", secData)
-
- // Store a secret with multi values
- var secDataMulti = make(map[string]string)
- secDataMulti["my-secret-key"] = "very top secret"
- secDataMulti["my-secret-key-2"] = "even more secret"
- CreatePlainTextSecret(ns, "my-sec-multi", secDataMulti)
-
- t.Run("Config secret", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
- })
-
- t.Run("Resource secret", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/resource-secret-route.groovy", "--resource", "secret:my-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "resource-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "resource-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Secret with filtered key", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-key-route.groovy", "--config", "secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-secret-key-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-secret-key-route"), TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
- Eventually(IntegrationLogs(ns, "config-secret-key-route"), TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- // Build-Properties
- t.Run("Build time property", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-route.groovy", "--build-property", "quarkus.application.name=my-super-application").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
- // Don't delete - we need it for next test execution
- })
-
- // We need to check also that the property (which is available in the IntegrationKit) is correctly replaced and we don't reuse the same kit
- t.Run("Build time property updated", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-route.groovy", "--name", "build-property-route-updated",
- "--build-property", "quarkus.application.name=my-super-application-updated").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-route-updated"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
- // Verify the integration kits are different
- Eventually(IntegrationKit(ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(ns, "build-property-route")()))
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- // Build-Properties file
- t.Run("Build time property file", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Build time property file with precedence", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "quarkus.application.name=my-overridden-application", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutMedium).Should(ContainSubstring("my-overridden-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Build time property from ConfigMap", func(t *testing.T) {
- var cmData = make(map[string]string)
- cmData["quarkus.application.name"] = "my-cool-application"
- CreatePlainTextConfigmap(ns, "my-cm-test-build-property", cmData)
-
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutLong).Should(ContainSubstring("my-cool-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Build time property from ConfigMap as property file", func(t *testing.T) {
- var cmData = make(map[string]string)
- cmData["my.properties"] = "quarkus.application.name=my-super-cool-application"
- CreatePlainTextConfigmap(ns, "my-cm-test-build-properties", cmData)
-
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
-
- })
-
- t.Run("Build time property from Secret", func(t *testing.T) {
- var secData = make(map[string]string)
- secData["quarkus.application.name"] = "my-great-application"
- CreatePlainTextSecret(ns, "my-sec-test-build-property", secData)
-
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-great-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
-
- })
-
- t.Run("Build time property from Secret as property file", func(t *testing.T) {
- var secData = make(map[string]string)
- secData["my.properties"] = "quarkus.application.name=my-awsome-application"
- CreatePlainTextSecret(ns, "my-sec-test-build-properties", secData)
-
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-awsome-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
-
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(ns, "my-cm")).To(Succeed())
- Expect(DeleteConfigmap(ns, "my-cm-multi")).To(Succeed())
- Expect(DeleteConfigmap(ns, "my-cm-properties")).To(Succeed())
- Expect(DeleteConfigmap(ns, "my-cm-test-build-property")).To(Succeed())
- Expect(DeleteConfigmap(ns, "my-cm-test-build-properties")).To(Succeed())
- Expect(DeleteConfigmap(ns, "my-cm-test-property")).To(Succeed())
- Expect(DeleteConfigmap(ns, "my-cm-test-properties")).To(Succeed())
- Expect(DeleteSecret(ns, "my-sec-test-build-property")).To(Succeed())
- Expect(DeleteSecret(ns, "my-sec-test-build-properties")).To(Succeed())
- Expect(DeleteSecret(ns, "my-sec-test-property")).To(Succeed())
- Expect(DeleteSecret(ns, "my-sec-test-properties")).To(Succeed())
- Expect(DeleteSecret(ns, "my-sec")).To(Succeed())
- Expect(DeleteSecret(ns, "my-sec-multi")).To(Succeed())
}
diff --git a/e2e/common/config/default.go b/e2e/common/config/default.go
index 4a5ced9e0..13e78b4f1 100644
--- a/e2e/common/config/default.go
+++ b/e2e/common/config/default.go
@@ -20,7 +20,10 @@ limitations under the License.
package config
-import "github.com/apache/camel-k/v2/e2e/support"
+import (
+ "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/platform"
+)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.GetCIProcessID())
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", support.GetCIProcessID())
+var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
+var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go
index 0ef8ec99e..931300bdc 100644
--- a/e2e/common/config/kamelet_config_test.go
+++ b/e2e/common/config/kamelet_config_test.go
@@ -35,260 +35,259 @@ import (
//
// without having to change the integration code.
func TestKameletImplicitConfigDefaultUserPropery(t *testing.T) {
- RegisterTestingT(t)
- t.Run("run test default config using properties", func(t *testing.T) {
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("run test default config using properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig01-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(ns, "iconfig01-timer-source")()).To(Succeed())
- name := RandomizedSuffixName("iconfig-test-timer-source-int01")
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
- "-p", "camel.kamelet.iconfig01-timer-source.message='Default message 01'",
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("Default message 01"))
+ name := RandomizedSuffixName("iconfig-test-timer-source-int01")
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
+ "-p", "camel.kamelet.iconfig01-timer-source.message='Default message 01'",
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("Default message 01"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig01-timer-source")).To(Succeed())
- })
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(ns, "iconfig01-timer-source")).To(Succeed())
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("run test default config using mounted secret", func(t *testing.T) {
+ t.Run("run test default config using mounted secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig03-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(ns, "iconfig03-timer-source")()).To(Succeed())
- name := RandomizedSuffixName("iconfig-test-timer-source-int3")
- secretName := "my-iconfig-int3-secret"
+ name := RandomizedSuffixName("iconfig-test-timer-source-int3")
+ secretName := "my-iconfig-int3-secret"
- var secData = make(map[string]string)
- secData["camel.kamelet.iconfig03-timer-source.message"] = "very top mounted secret message"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ var secData = make(map[string]string)
+ secData["camel.kamelet.iconfig03-timer-source.message"] = "very top mounted secret message"
+ Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+ Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration03.java",
- "-t", "mount.configs=secret:"+secretName,
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top mounted secret message"))
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration03.java",
+ "-t", "mount.configs=secret:"+secretName,
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top mounted secret message"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig03-timer-source")).To(Succeed())
- })
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(ns, "iconfig03-timer-source")).To(Succeed())
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("run test default config using mounted configmap", func(t *testing.T) {
+ t.Run("run test default config using mounted configmap", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig04-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(ns, "iconfig04-timer-source")()).To(Succeed())
- name := RandomizedSuffixName("iconfig-test-timer-source-int4")
- cmName := "my-iconfig-int4-configmap"
+ name := RandomizedSuffixName("iconfig-test-timer-source-int4")
+ cmName := "my-iconfig-int4-configmap"
- var cmData = make(map[string]string)
- cmData["camel.kamelet.iconfig04-timer-source.message"] = "very top mounted configmap message"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+ var cmData = make(map[string]string)
+ cmData["camel.kamelet.iconfig04-timer-source.message"] = "very top mounted configmap message"
+ Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration04.java",
- "-t", "mount.configs=configmap:"+cmName,
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top mounted configmap message"))
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration04.java",
+ "-t", "mount.configs=configmap:"+cmName,
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top mounted configmap message"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(ns, "iconfig04-timer-source")).To(Succeed())
- })
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
+ Expect(DeleteKamelet(ns, "iconfig04-timer-source")).To(Succeed())
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func TestKameletImplicitConfigNamedUserPropery(t *testing.T) {
- RegisterTestingT(t)
- t.Run("run test named config using properties", func(t *testing.T) {
-
- Expect(CreateTimerKamelet(ns, "iconfig05-timer-source")()).To(Succeed())
-
- name := RandomizedSuffixName("iconfig-test-timer-source-int5")
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
- "-p", "camel.kamelet.iconfig05-timer-source.message='Default message 05'",
- "-p", "camel.kamelet.iconfig05-timer-source.mynamedconfig.message='My Named Config message'",
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My Named Config message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig05-timer-source")).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("run test named config using properties", func(t *testing.T) {
+ Expect(CreateTimerKamelet(ns, "iconfig05-timer-source")()).To(Succeed())
+
+ name := RandomizedSuffixName("iconfig-test-timer-source-int5")
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
+ "-p", "camel.kamelet.iconfig05-timer-source.message='Default message 05'",
+ "-p", "camel.kamelet.iconfig05-timer-source.mynamedconfig.message='My Named Config message'",
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My Named Config message"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(ns, "iconfig05-timer-source")).To(Succeed())
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("run test named config using labeled secret", func(t *testing.T) {
-
- Expect(CreateTimerKamelet(ns, "iconfig06-timer-source")()).To(Succeed())
-
- name := RandomizedSuffixName("iconfig-test-timer-source-int6")
- secretName := "my-iconfig-int6-secret"
-
- var secData = make(map[string]string)
- secData["camel.kamelet.iconfig06-timer-source.mynamedconfig.message"] = "very top named secret message"
- var labels = make(map[string]string)
- labels["camel.apache.org/kamelet"] = "iconfig06-timer-source"
- labels["camel.apache.org/kamelet.configuration"] = "mynamedconfig"
- Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
-
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration06.java",
- "-p", "camel.kamelet.iconfig06-timer-source.message='Default message 06'",
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named secret message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig06-timer-source")).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("run test named config using labeled secret", func(t *testing.T) {
+ Expect(CreateTimerKamelet(ns, "iconfig06-timer-source")()).To(Succeed())
+
+ name := RandomizedSuffixName("iconfig-test-timer-source-int6")
+ secretName := "my-iconfig-int6-secret"
+
+ var secData = make(map[string]string)
+ secData["camel.kamelet.iconfig06-timer-source.mynamedconfig.message"] = "very top named secret message"
+ var labels = make(map[string]string)
+ labels["camel.apache.org/kamelet"] = "iconfig06-timer-source"
+ labels["camel.apache.org/kamelet.configuration"] = "mynamedconfig"
+ Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
+ Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration06.java",
+ "-p", "camel.kamelet.iconfig06-timer-source.message='Default message 06'",
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named secret message"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(ns, "iconfig06-timer-source")).To(Succeed())
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("run test named config using mounted secret", func(t *testing.T) {
-
- Expect(CreateTimerKamelet(ns, "iconfig07-timer-source")()).To(Succeed())
-
- name := RandomizedSuffixName("iconfig-test-timer-source-int7")
- secretName := "my-iconfig-int7-secret"
-
- var secData = make(map[string]string)
- secData["camel.kamelet.iconfig07-timer-source.mynamedconfig.message"] = "very top named mounted secret message"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
-
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration07.java",
- "-p", "camel.kamelet.iconfig07-timer-source.message='Default message 07'",
- "-t", "mount.configs=secret:"+secretName,
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named mounted secret message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig07-timer-source")).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("run test named config using mounted secret", func(t *testing.T) {
+ Expect(CreateTimerKamelet(ns, "iconfig07-timer-source")()).To(Succeed())
+
+ name := RandomizedSuffixName("iconfig-test-timer-source-int7")
+ secretName := "my-iconfig-int7-secret"
+
+ var secData = make(map[string]string)
+ secData["camel.kamelet.iconfig07-timer-source.mynamedconfig.message"] = "very top named mounted secret message"
+ Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+ Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration07.java",
+ "-p", "camel.kamelet.iconfig07-timer-source.message='Default message 07'",
+ "-t", "mount.configs=secret:"+secretName,
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named mounted secret message"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(ns, "iconfig07-timer-source")).To(Succeed())
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("run test named config using mounted configmap", func(t *testing.T) {
-
- Expect(CreateTimerKamelet(ns, "iconfig08-timer-source")()).To(Succeed())
-
- name := RandomizedSuffixName("iconfig-test-timer-source-int8")
- cmName := "my-iconfig-int8-configmap"
-
- var cmData = make(map[string]string)
- cmData["camel.kamelet.iconfig08-timer-source.mynamedconfig.message"] = "very top named mounted configmap message"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
-
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration08.java",
- "-p", "camel.kamelet.iconfig08-timer-source.message='Default message 08'",
- "-t", "mount.configs=configmap:"+cmName,
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named mounted configmap message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(ns, "iconfig08-timer-source")).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("run test named config using mounted configmap", func(t *testing.T) {
+ Expect(CreateTimerKamelet(ns, "iconfig08-timer-source")()).To(Succeed())
+
+ name := RandomizedSuffixName("iconfig-test-timer-source-int8")
+ cmName := "my-iconfig-int8-configmap"
+
+ var cmData = make(map[string]string)
+ cmData["camel.kamelet.iconfig08-timer-source.mynamedconfig.message"] = "very top named mounted configmap message"
+ Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration08.java",
+ "-p", "camel.kamelet.iconfig08-timer-source.message='Default message 08'",
+ "-t", "mount.configs=configmap:"+cmName,
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named mounted configmap message"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
+ Expect(DeleteKamelet(ns, "iconfig08-timer-source")).To(Succeed())
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("run test default config using labeled secret", func(t *testing.T) {
-
- Expect(CreateTimerKamelet(ns, "iconfig09-timer-source")()).To(Succeed())
-
- name := RandomizedSuffixName("iconfig-test-timer-source-int9")
- secretName := "my-iconfig-int9-secret"
-
- var secData = make(map[string]string)
- secData["camel.kamelet.iconfig09-timer-source.message"] = "very top labeled secret message"
- var labels = make(map[string]string)
- labels["camel.apache.org/kamelet"] = "iconfig09-timer-source"
- Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
-
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration09.java",
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top labeled secret message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig09-timer-source")).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("run test default config using labeled secret", func(t *testing.T) {
+ Expect(CreateTimerKamelet(ns, "iconfig09-timer-source")()).To(Succeed())
+
+ name := RandomizedSuffixName("iconfig-test-timer-source-int9")
+ secretName := "my-iconfig-int9-secret"
+
+ var secData = make(map[string]string)
+ secData["camel.kamelet.iconfig09-timer-source.message"] = "very top labeled secret message"
+ var labels = make(map[string]string)
+ labels["camel.apache.org/kamelet"] = "iconfig09-timer-source"
+ Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
+ Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration09.java",
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top labeled secret message"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(ns, "iconfig09-timer-source")).To(Succeed())
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
// Tests on integration with kamelets containing configuration from properties and secrets with parameters inside the integration.
func TestKameletConfigInlinedUserPropery(t *testing.T) {
- RegisterTestingT(t)
- t.Run("run test default config inlined properties", func(t *testing.T) {
-
- Expect(CreateTimerKamelet(ns, "config01-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "config01-log-sink")()).To(Succeed())
-
- name := RandomizedSuffixName("config-test-timer-source-int1")
-
- Expect(KamelRunWithID(operatorID, ns, "files/timer-kamelet-integration-inlined-configuration-01.yaml",
- "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("important message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("integrationLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "config01-timer-source")).To(Succeed())
- Expect(DeleteKamelet(ns, "config01-log-sink")).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("run test default config inlined properties", func(t *testing.T) {
+ Expect(CreateTimerKamelet(ns, "config01-timer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(ns, "config01-log-sink")()).To(Succeed())
+
+ name := RandomizedSuffixName("config-test-timer-source-int1")
+
+ Expect(KamelRunWithID(operatorID, ns, "files/timer-kamelet-integration-inlined-configuration-01.yaml",
+ "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("important message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("integrationLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(ns, "config01-timer-source")).To(Succeed())
+ Expect(DeleteKamelet(ns, "config01-log-sink")).To(Succeed())
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamUserPropery(t *testing.T) {
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index caf93ece9..49ff9b444 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -33,201 +33,200 @@ import (
// Tests on pipe with kamelets containing configuration from properties and secrets.
func TestPipeConfig(t *testing.T) {
- RegisterTestingT(t)
- t.Run("test custom source/sink pipe", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "my-pipe-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "my-pipe-log-sink")()).To(Succeed())
- t.Run("run test default config using properties", func(t *testing.T) {
- name := RandomizedSuffixName("my-pipe-with-properties")
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-pipe-timer-source",
- "my-pipe-log-sink",
- "-p", "source.message=My pipe message",
- "-p", "sink.loggerName=myPipeLogger",
- "--name", name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+ t.Run("test custom source/sink pipe", func(t *testing.T) {
+ Expect(CreateTimerKamelet(ns, "my-pipe-timer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(ns, "my-pipe-log-sink")()).To(Succeed())
+ t.Run("run test default config using properties", func(t *testing.T) {
+ name := RandomizedSuffixName("my-pipe-with-properties")
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-pipe-timer-source",
+ "my-pipe-log-sink",
+ "-p", "source.message=My pipe message",
+ "-p", "sink.loggerName=myPipeLogger",
+ "--name", name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("run test implicit default config using labeled secret", func(t *testing.T) {
+ name := RandomizedSuffixName("my-pipe-with-default-implicit-secret")
+ secretName := "my-pipe-default-implicit-secret"
+
+ var secData = make(map[string]string)
+ secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
+ var labels = make(map[string]string)
+ labels["camel.apache.org/kamelet"] = "my-pipe-timer-source"
+ Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-pipe-timer-source",
+ "my-pipe-log-sink",
+ "-p", "sink.loggerName=myDefaultLogger",
+ "--name", name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe secret message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myDefaultLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ })
+
+ t.Run("run test implicit default config using mounted secret", func(t *testing.T) {
+ name := RandomizedSuffixName("my-pipe-with-default-implicit-secret")
+ secretName := "my-pipe-default-implicit-secret"
+
+ var secData = make(map[string]string)
+ secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
+ secData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeSecretLogger"
+ Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-pipe-timer-source",
+ "my-pipe-log-sink",
+ "-t", "mount.configs=secret:"+secretName,
+ "--name", name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe secret message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSecretLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ })
+
+ t.Run("run test implicit default config using mounted configmap", func(t *testing.T) {
+ name := RandomizedSuffixName("my-pipe-with-default-implicit-configmap")
+ cmName := "my-pipe-default-implicit-configmap"
+
+ var cmData = make(map[string]string)
+ cmData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe configmap message"
+ cmData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeConfigmapLogger"
+ Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-pipe-timer-source",
+ "my-pipe-log-sink",
+ "-t", "mount.configs=configmap:"+cmName,
+ "--name", name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe configmap message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeConfigmapLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
+ })
+
+ t.Run("run test implicit named config using mounted secret", func(t *testing.T) {
+ name := RandomizedSuffixName("my-pipe-with-named-implicit-secret")
+ secretName := "my-pipe-named-implicit-secret"
+
+ var secData = make(map[string]string)
+ secData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named secret message"
+ secData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedSecretLogger"
+ Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-pipe-timer-source",
+ "my-pipe-log-sink",
+ "-t", "mount.configs=secret:"+secretName,
+ "-p", "source.message={{mynamedconfig.message}}",
+ "-p", "sink.loggerName={{mynamedconfig.loggerName}}",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe named secret message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeNamedSecretLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ })
+
+ t.Run("run test implicit named config using mounted configmap", func(t *testing.T) {
+ name := RandomizedSuffixName("my-pipe-with-named-implicit-configmap")
+ cmName := "my-pipe-named-implicit-configmap"
+
+ var cmData = make(map[string]string)
+ cmData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named configmap message"
+ cmData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedConfigmapLogger"
+ Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-pipe-timer-source",
+ "my-pipe-log-sink",
+ "-t", "mount.configs=configmap:"+cmName,
+ "-p", "source.message={{mynamedconfig.message}}",
+ "-p", "sink.loggerName={{mynamedconfig.loggerName}}",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe named configmap message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeNamedConfigmapLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
+ })
+ t.Run("run test implicit specific config using mounted secret", func(t *testing.T) {
+ name := RandomizedSuffixName("my-pipe-with-specific-secret")
+ secretName := "my-pipe-specific-secret"
+
+ var secData = make(map[string]string)
+ secData["mynamedconfig.message"] = "My pipe specific secret message"
+ secData["mynamedconfig.loggerName"] = "myPipeSpecificSecretLogger"
+ Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-pipe-timer-source",
+ "my-pipe-log-sink",
+ "-t", "mount.configs=secret:"+secretName,
+ "-p", "source.message={{mynamedconfig.message}}",
+ "-p", "sink.loggerName={{mynamedconfig.loggerName}}",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe specific secret message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSpecificSecretLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ })
+ t.Run("run test implicit specific config using mounted configmap", func(t *testing.T) {
+ name := RandomizedSuffixName("my-pipe-with-specific-configmap")
+ cmName := "my-pipe-specific-configmap"
+
+ var cmData = make(map[string]string)
+ cmData["mynamedconfig.message"] = "My pipe specific configmap message"
+ cmData["mynamedconfig.loggerName"] = "myPipeSpecificConfgmapLogger"
+ Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-pipe-timer-source",
+ "my-pipe-log-sink",
+ "-t", "mount.configs=configmap:"+cmName,
+ "-p", "source.message={{mynamedconfig.message}}",
+ "-p", "sink.loggerName={{mynamedconfig.loggerName}}",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe specific configmap message"))
+ Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSpecificConfgmapLogger"))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
+ })
})
- t.Run("run test implicit default config using labeled secret", func(t *testing.T) {
- name := RandomizedSuffixName("my-pipe-with-default-implicit-secret")
- secretName := "my-pipe-default-implicit-secret"
-
- var secData = make(map[string]string)
- secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
- var labels = make(map[string]string)
- labels["camel.apache.org/kamelet"] = "my-pipe-timer-source"
- Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-pipe-timer-source",
- "my-pipe-log-sink",
- "-p", "sink.loggerName=myDefaultLogger",
- "--name", name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe secret message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myDefaultLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- })
-
- t.Run("run test implicit default config using mounted secret", func(t *testing.T) {
- name := RandomizedSuffixName("my-pipe-with-default-implicit-secret")
- secretName := "my-pipe-default-implicit-secret"
-
- var secData = make(map[string]string)
- secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
- secData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeSecretLogger"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-pipe-timer-source",
- "my-pipe-log-sink",
- "-t", "mount.configs=secret:"+secretName,
- "--name", name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe secret message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSecretLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- })
-
- t.Run("run test implicit default config using mounted configmap", func(t *testing.T) {
- name := RandomizedSuffixName("my-pipe-with-default-implicit-configmap")
- cmName := "my-pipe-default-implicit-configmap"
-
- var cmData = make(map[string]string)
- cmData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe configmap message"
- cmData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeConfigmapLogger"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-pipe-timer-source",
- "my-pipe-log-sink",
- "-t", "mount.configs=configmap:"+cmName,
- "--name", name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe configmap message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeConfigmapLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
- })
-
- t.Run("run test implicit named config using mounted secret", func(t *testing.T) {
- name := RandomizedSuffixName("my-pipe-with-named-implicit-secret")
- secretName := "my-pipe-named-implicit-secret"
-
- var secData = make(map[string]string)
- secData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named secret message"
- secData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedSecretLogger"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-pipe-timer-source",
- "my-pipe-log-sink",
- "-t", "mount.configs=secret:"+secretName,
- "-p", "source.message={{mynamedconfig.message}}",
- "-p", "sink.loggerName={{mynamedconfig.loggerName}}",
- "--name", name,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe named secret message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeNamedSecretLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- })
-
- t.Run("run test implicit named config using mounted configmap", func(t *testing.T) {
- name := RandomizedSuffixName("my-pipe-with-named-implicit-configmap")
- cmName := "my-pipe-named-implicit-configmap"
-
- var cmData = make(map[string]string)
- cmData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named configmap message"
- cmData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedConfigmapLogger"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-pipe-timer-source",
- "my-pipe-log-sink",
- "-t", "mount.configs=configmap:"+cmName,
- "-p", "source.message={{mynamedconfig.message}}",
- "-p", "sink.loggerName={{mynamedconfig.loggerName}}",
- "--name", name,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe named configmap message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeNamedConfigmapLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
- })
- t.Run("run test implicit specific config using mounted secret", func(t *testing.T) {
- name := RandomizedSuffixName("my-pipe-with-specific-secret")
- secretName := "my-pipe-specific-secret"
-
- var secData = make(map[string]string)
- secData["mynamedconfig.message"] = "My pipe specific secret message"
- secData["mynamedconfig.loggerName"] = "myPipeSpecificSecretLogger"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-pipe-timer-source",
- "my-pipe-log-sink",
- "-t", "mount.configs=secret:"+secretName,
- "-p", "source.message={{mynamedconfig.message}}",
- "-p", "sink.loggerName={{mynamedconfig.loggerName}}",
- "--name", name,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe specific secret message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSpecificSecretLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- })
- t.Run("run test implicit specific config using mounted configmap", func(t *testing.T) {
- name := RandomizedSuffixName("my-pipe-with-specific-configmap")
- cmName := "my-pipe-specific-configmap"
-
- var cmData = make(map[string]string)
- cmData["mynamedconfig.message"] = "My pipe specific configmap message"
- cmData["mynamedconfig.loggerName"] = "myPipeSpecificConfgmapLogger"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-pipe-timer-source",
- "my-pipe-log-sink",
- "-t", "mount.configs=configmap:"+cmName,
- "-p", "source.message={{mynamedconfig.message}}",
- "-p", "sink.loggerName={{mynamedconfig.loggerName}}",
- "--name", name,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe specific configmap message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSpecificConfgmapLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
- })
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(DeleteKamelet(ns, "my-pipe-timer-source")).To(Succeed())
- Expect(DeleteKamelet(ns, "my-pipe-log-sink")).To(Succeed())
}
diff --git a/e2e/common/languages/default.go b/e2e/common/languages/default.go
index 433ca1e6f..63569d2b2 100644
--- a/e2e/common/languages/default.go
+++ b/e2e/common/languages/default.go
@@ -20,7 +20,10 @@ limitations under the License.
package languages
-import "github.com/apache/camel-k/v2/e2e/support"
+import (
+ "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/platform"
+)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.GetCIProcessID())
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", support.GetCIProcessID())
+var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
+var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go
index 253081bef..a86db06e7 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -34,14 +34,15 @@ import (
)
func TestRunSimpleGroovyExamples(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("run groovy", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- })
+ t.Run("run groovy", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go
index 903fd083b..c361bc072 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -34,14 +34,15 @@ import (
)
func TestRunSimpleJavaExamples(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("run java", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- })
+ t.Run("run java", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index 8bf0c4295..9cf92e27f 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -34,14 +34,15 @@ import (
)
func TestRunSimpleJavaScriptExamples(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("run js", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/js.js").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- })
+ t.Run("run js", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/js.js").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index da210afc2..e252fd0f0 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -34,14 +34,15 @@ import (
)
func TestRunSimpleKotlinExamples(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("run kotlin", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- })
+ t.Run("run kotlin", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go
index b441d4102..8009c9fc2 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -34,15 +34,16 @@ import (
)
func TestRunPolyglotExamples(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("run polyglot", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
- Eventually(IntegrationLogs(ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
- })
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("run polyglot", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
+ Eventually(IntegrationLogs(ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index 1ea6f8dd5..4e5cc3ff7 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -34,14 +34,15 @@ import (
)
func TestRunSimpleXmlExamples(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("run xml", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- })
+ t.Run("run xml", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go
index 7e3dba1a4..82f150b21 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -34,14 +34,15 @@ import (
)
func TestRunSimpleYamlExamples(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("run yaml", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- })
+ t.Run("run yaml", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/misc/client_test.go b/e2e/common/misc/client_test.go
index 6c8a94366..5bddeac36 100644
--- a/e2e/common/misc/client_test.go
+++ b/e2e/common/misc/client_test.go
@@ -39,31 +39,32 @@ import (
)
func TestClientFunctionalities(t *testing.T) {
- RegisterTestingT(t)
-
- cfg, err := config.GetConfig()
- require.NoError(t, err)
- camel, err := versioned.NewForConfig(cfg)
- require.NoError(t, err)
-
- lst, err := camel.CamelV1().Integrations(ns).List(TestContext, metav1.ListOptions{})
- require.NoError(t, err)
- assert.Empty(t, lst.Items)
-
- integration, err := camel.CamelV1().Integrations(ns).Create(TestContext, &v1.Integration{
- ObjectMeta: metav1.ObjectMeta{
- Name: "dummy",
- },
- }, metav1.CreateOptions{})
- require.NoError(t, err)
-
- lst, err = camel.CamelV1().Integrations(ns).List(TestContext, metav1.ListOptions{})
- require.NoError(t, err)
- assert.NotEmpty(t, lst.Items)
- assert.Equal(t, lst.Items[0].Name, integration.Name)
-
- err = camel.CamelV1().Integrations(ns).Delete(TestContext, "dummy", metav1.DeleteOptions{})
- require.NoError(t, err)
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+
+ cfg, err := config.GetConfig()
+ require.NoError(t, err)
+ camel, err := versioned.NewForConfig(cfg)
+ require.NoError(t, err)
+
+ lst, err := camel.CamelV1().Integrations(ns).List(TestContext, metav1.ListOptions{})
+ require.NoError(t, err)
+ assert.Empty(t, lst.Items)
+
+ integration, err := camel.CamelV1().Integrations(ns).Create(TestContext, &v1.Integration{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "dummy",
+ },
+ }, metav1.CreateOptions{})
+ require.NoError(t, err)
+
+ lst, err = camel.CamelV1().Integrations(ns).List(TestContext, metav1.ListOptions{})
+ require.NoError(t, err)
+ assert.NotEmpty(t, lst.Items)
+ assert.Equal(t, lst.Items[0].Name, integration.Name)
+
+ err = camel.CamelV1().Integrations(ns).Delete(TestContext, "dummy", metav1.DeleteOptions{})
+ require.NoError(t, err)
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index 9368108c4..efcd0e948 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -34,42 +34,43 @@ import (
)
func TestRunCronExample(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("cron", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
- })
-
- t.Run("cron-yaml", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
- })
-
- t.Run("cron-timer", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("cron", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationCronJob(ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(IntegrationConditionStatus(ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ })
+
+ t.Run("cron-yaml", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationCronJob(ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(IntegrationConditionStatus(ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ })
+
+ t.Run("cron-timer", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationCronJob(ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(IntegrationConditionStatus(ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ })
+
+ t.Run("cron-fallback", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/cron-fallback.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "cron-fallback"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "cron-fallback", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "cron-fallback"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ })
+
+ t.Run("cron-quartz", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/cron-quartz.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "cron-quartz"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "cron-quartz", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "cron-quartz"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("cron-fallback", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron-fallback.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "cron-fallback"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "cron-fallback", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron-fallback"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- })
-
- t.Run("cron-quartz", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron-quartz.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "cron-quartz"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "cron-quartz", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron-quartz"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/default.go b/e2e/common/misc/default.go
index 76b897333..794d34d8e 100644
--- a/e2e/common/misc/default.go
+++ b/e2e/common/misc/default.go
@@ -20,7 +20,10 @@ limitations under the License.
package misc
-import "github.com/apache/camel-k/v2/e2e/support"
+import (
+ "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/platform"
+)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.GetCIProcessID())
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", support.GetCIProcessID())
+var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
+var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go
index 58d98f6d1..4165358cf 100644
--- a/e2e/common/misc/integration_fail_test.go
+++ b/e2e/common/misc/integration_fail_test.go
@@ -35,151 +35,152 @@ import (
)
func TestBadRouteIntegration(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("run bad java route", func(t *testing.T) {
- name := RandomizedSuffixName("bad-route")
- Expect(KamelRunWithID(operatorID, ns, "files/BadRoute.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionFalse))
-
- // Make sure the Integration can be scaled
- Expect(ScaleIntegration(ns, name, 2)).To(Succeed())
- // Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
- // Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 2)))
- // Check the Integration stays in error phase
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
-
- // Kit valid
- kitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("run bad java route", func(t *testing.T) {
+ name := RandomizedSuffixName("bad-route")
+ Expect(KamelRunWithID(operatorID, ns, "files/BadRoute.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionFalse))
+
+ // Make sure the Integration can be scaled
+ Expect(ScaleIntegration(ns, name, 2)).To(Succeed())
+ // Check the scale cascades into the Deployment scale
+ Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
+ // Check it also cascades into the Integration scale subresource Status field
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 2)))
+ // Check the Integration stays in error phase
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+
+ // Kit valid
+ kitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ })
+
+ t.Run("run missing dependency java route", func(t *testing.T) {
+ name := RandomizedSuffixName("java-route")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ "-d", "mvn:com.example:nonexistent:1.0").Execute()).To(Succeed())
+ // Integration in error
+ Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionKitAvailableReason)))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
+ WithTransform(IntegrationConditionMessage, ContainSubstring("is in state \"Error\"")))
+ // Kit in error
+ kitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError))
+ //Build in error with 5 attempts
+ build := Build(integrationKitNamespace, kitName)()
+ Eventually(build.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseError))
+ Eventually(build.Status.Failure.Recovery.Attempt, TestTimeoutShort).Should(Equal(5))
+
+ // Fixing the route should reconcile the Integration
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning))
+ // New Kit success
+ kitRecoveryName := IntegrationKit(ns, name)()
+ integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
+ Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ Expect(kitRecoveryName).NotTo(Equal(kitName))
+ // New Build success
+ buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
+ Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+
+ })
+
+ t.Run("run invalid dependency java route", func(t *testing.T) {
+ name := RandomizedSuffixName("invalid-dependency")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ "-d", "camel:non-existent").Execute()).To(Succeed())
+ // Integration in error with Initialization Failed condition
+ Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
+ WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
+ ))
+ // Kit shouldn't be created
+ Consistently(IntegrationKit(ns, name), 10*time.Second).Should(BeEmpty())
+
+ // Fixing the route should reconcile the Integration in Initialization Failed condition to Running
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // New Kit success
+ kitRecoveryName := IntegrationKit(ns, name)()
+ integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
+ Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ // New Build success
+ buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
+ Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+ })
+
+ t.Run("run unresolvable component java route", func(t *testing.T) {
+ name := RandomizedSuffixName("unresolvable-route")
+ Expect(KamelRunWithID(operatorID, ns, "files/Unresolvable.java", "--name", name).Execute()).To(Succeed())
+ // Integration in error with Initialization Failed condition
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
+ WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
+ ))
+ // Kit shouldn't be created
+ Consistently(IntegrationKit(ns, name), 10*time.Second).Should(BeEmpty())
+
+ // Fixing the route should reconcile the Integration in Initialization Failed condition to Running
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // New Kit success
+ kitRecoveryName := IntegrationKit(ns, name)()
+ integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
+ Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ // New Build success
+ buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
+ Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+ })
+
+ t.Run("run invalid java route", func(t *testing.T) {
+ name := RandomizedSuffixName("invalid-java-route")
+ Expect(KamelRunWithID(operatorID, ns, "files/InvalidJava.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error"))
+
+ // Kit valid
+ kitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+
+ // Fixing the route should reconcile the Integration in Initialization Failed condition to Running
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ // Kit should not have changed
+ kitRecoveryName := IntegrationKit(ns, name)()
+ Expect(kitRecoveryName).To(Equal(kitName))
+
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("run missing dependency java route", func(t *testing.T) {
- name := RandomizedSuffixName("java-route")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
- "-d", "mvn:com.example:nonexistent:1.0").Execute()).To(Succeed())
- // Integration in error
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionKitAvailableReason)))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
- WithTransform(IntegrationConditionMessage, ContainSubstring("is in state \"Error\"")))
- // Kit in error
- kitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError))
- //Build in error with 5 attempts
- build := Build(integrationKitNamespace, kitName)()
- Eventually(build.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseError))
- Eventually(build.Status.Failure.Recovery.Attempt, TestTimeoutShort).Should(Equal(5))
-
- // Fixing the route should reconcile the Integration
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning))
- // New Kit success
- kitRecoveryName := IntegrationKit(ns, name)()
- integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
- Expect(kitRecoveryName).NotTo(Equal(kitName))
- // New Build success
- buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
-
- })
-
- t.Run("run invalid dependency java route", func(t *testing.T) {
- name := RandomizedSuffixName("invalid-dependency")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
- "-d", "camel:non-existent").Execute()).To(Succeed())
- // Integration in error with Initialization Failed condition
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
- WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
- ))
- // Kit shouldn't be created
- Consistently(IntegrationKit(ns, name), 10*time.Second).Should(BeEmpty())
-
- // Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- // New Kit success
- kitRecoveryName := IntegrationKit(ns, name)()
- integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
- // New Build success
- buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
- })
-
- t.Run("run unresolvable component java route", func(t *testing.T) {
- name := RandomizedSuffixName("unresolvable-route")
- Expect(KamelRunWithID(operatorID, ns, "files/Unresolvable.java", "--name", name).Execute()).To(Succeed())
- // Integration in error with Initialization Failed condition
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
- WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
- ))
- // Kit shouldn't be created
- Consistently(IntegrationKit(ns, name), 10*time.Second).Should(BeEmpty())
-
- // Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- // New Kit success
- kitRecoveryName := IntegrationKit(ns, name)()
- integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
- // New Build success
- buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
- })
-
- t.Run("run invalid java route", func(t *testing.T) {
- name := RandomizedSuffixName("invalid-java-route")
- Expect(KamelRunWithID(operatorID, ns, "files/InvalidJava.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error"))
-
- // Kit valid
- kitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
-
- // Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- // Kit should not have changed
- kitRecoveryName := IntegrationKit(ns, name)()
- Expect(kitRecoveryName).To(Equal(kitName))
-
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/integration_trait_update_test.go b/e2e/common/misc/integration_trait_update_test.go
index 132d62862..681a2a70d 100644
--- a/e2e/common/misc/integration_trait_update_test.go
+++ b/e2e/common/misc/integration_trait_update_test.go
@@ -34,20 +34,21 @@ import (
)
func TestTraitUpdates(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("run and update trait", func(t *testing.T) {
- name := RandomizedSuffixName("yaml-route")
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- var numberOfPods = func(pods *int32) bool {
- return *pods >= 1 && *pods <= 2
- }
- // Adding a property will change the camel trait
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name, "-p", "hello=world").Execute()).To(Succeed())
- Consistently(IntegrationPodsNumbers(ns, name), TestTimeoutShort, 1*time.Second).Should(Satisfy(numberOfPods))
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("run and update trait", func(t *testing.T) {
+ name := RandomizedSuffixName("yaml-route")
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ var numberOfPods = func(pods *int32) bool {
+ return *pods >= 1 && *pods <= 2
+ }
+ // Adding a property will change the camel trait
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name, "-p", "hello=world").Execute()).To(Succeed())
+ Consistently(IntegrationPodsNumbers(ns, name), TestTimeoutShort, 1*time.Second).Should(Satisfy(numberOfPods))
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index 66c8c3839..ee6559396 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -33,11 +33,11 @@ import (
)
func TestKameletClasspathLoading(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- // Store a configmap on the cluster
- var cmData = make(map[string]string)
- cmData["my-timer-source.kamelet.yaml"] = `
+ // Store a configmap on the cluster
+ var cmData = make(map[string]string)
+ cmData["my-timer-source.kamelet.yaml"] = `
# ---------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -108,27 +108,28 @@ spec:
constant: "{{contentType}}"
- to: kamelet:sink
`
- CreatePlainTextConfigmap(ns, "my-kamelet-cm", cmData)
+ CreatePlainTextConfigmap(ns, "my-kamelet-cm", cmData)
- // Basic
- t.Run("test basic case", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
- "--resource", "configmap:my-kamelet-cm@/kamelets",
- "-p camel.component.kamelet.location=file:/kamelets",
- "-d", "camel:yaml-dsl",
- // kamelet dependencies
- "-d", "camel:timer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "timer-kamelet-integration")).Should(ContainSubstring("important message"))
+ // Basic
+ t.Run("test basic case", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
+ "--resource", "configmap:my-kamelet-cm@/kamelets",
+ "-p camel.component.kamelet.location=file:/kamelets",
+ "-d", "camel:yaml-dsl",
+ // kamelet dependencies
+ "-d", "camel:timer").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "timer-kamelet-integration")).Should(ContainSubstring("important message"))
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "timer-kamelet-integration")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "timer-kamelet-integration")()
- kameletsTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "kamelets")
- Expect(kameletsTrait).ToNot(BeNil())
- Expect(len(kameletsTrait)).To(Equal(1))
- Expect(kameletsTrait["enabled"]).To(Equal(false))
- })
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, "timer-kamelet-integration")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, "timer-kamelet-integration")()
+ kameletsTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "kamelets")
+ Expect(kameletsTrait).ToNot(BeNil())
+ Expect(len(kameletsTrait)).To(Equal(1))
+ Expect(kameletsTrait["enabled"]).To(Equal(false))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index e0f1228c9..70202e1ce 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -35,17 +35,18 @@ import (
const customLabel = "custom-label"
func TestBundleKameletUpdate(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- Expect(createBundleKamelet(ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
- Expect(createUserKamelet(ns, "user-sink")()).To(Succeed()) // Left intact by the operator
+ Expect(createBundleKamelet(ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
+ Expect(createUserKamelet(ns, "user-sink")()).To(Succeed()) // Left intact by the operator
- Eventually(Kamelet("my-http-sink", ns)).
- Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
- Consistently(Kamelet("user-sink", ns), 5*time.Second, 1*time.Second).
- Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
+ Eventually(Kamelet("my-http-sink", ns)).
+ Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
+ Consistently(Kamelet("user-sink", ns), 5*time.Second, 1*time.Second).
+ Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func createBundleKamelet(ns string, name string) func() error {
diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go
index 066a1d1ee..0d8d47438 100644
--- a/e2e/common/misc/maven_repository_test.go
+++ b/e2e/common/misc/maven_repository_test.go
@@ -34,21 +34,22 @@ import (
)
func TestRunExtraRepository(t *testing.T) {
- RegisterTestingT(t)
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--maven-repository", "https://maven.repository.redhat.com/ga@id=redhat",
- "--dependency", "mvn:org.jolokia:jolokia-core:1.7.1.redhat-00001",
- "--name", name,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Integration(ns, name)).Should(WithTransform(IntegrationSpec, And(
- HaveExistingField("Repositories"),
- HaveField("Repositories", ContainElements("https://maven.repository.redhat.com/ga@id=redhat")),
- )))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--maven-repository", "https://maven.repository.redhat.com/ga@id=redhat",
+ "--dependency", "mvn:org.jolokia:jolokia-core:1.7.1.redhat-00001",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Integration(ns, name)).Should(WithTransform(IntegrationSpec, And(
+ HaveExistingField("Repositories"),
+ HaveField("Repositories", ContainElements("https://maven.repository.redhat.com/ga@id=redhat")),
+ )))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go
index 2dcb5e3e8..4692e500c 100644
--- a/e2e/common/misc/pipe_test.go
+++ b/e2e/common/misc/pipe_test.go
@@ -35,88 +35,89 @@ import (
)
func TestPipe(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
+
+ // Error Handler testing
+ t.Run("test error handler", func(t *testing.T) {
+ Expect(createErrorProducerKamelet(ns, "my-own-error-producer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(ns, "my-own-log-sink")()).To(Succeed())
+
+ t.Run("throw error test", func(t *testing.T) {
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-own-error-producer-source",
+ "my-own-log-sink",
+ "--error-handler", "sink:my-own-log-sink",
+ "-p", "source.message=throw Error",
+ "-p", "sink.loggerName=integrationLogger",
+ "-p", "error-handler.loggerName=kameletErrorHandler",
+ // Needed in the test to make sure to do the right string comparison later
+ "-t", "logging.color=false",
+ "--name", "throw-error-binding",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, "throw-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "throw-error-binding"), TestTimeoutShort).Should(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
+ Eventually(IntegrationLogs(ns, "throw-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
+
+ })
+
+ t.Run("don't throw error test", func(t *testing.T) {
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-own-error-producer-source",
+ "my-own-log-sink",
+ "--error-handler", "sink:my-own-log-sink",
+ "-p", "source.message=true",
+ "-p", "sink.loggerName=integrationLogger",
+ "-p", "error-handler.loggerName=kameletErrorHandler",
+ // Needed in the test to make sure to do the right string comparison later
+ "-t", "logging.color=false",
+ "--name", "no-error-binding",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, "no-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "no-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
+ Eventually(IntegrationLogs(ns, "no-error-binding"), TestTimeoutShort).Should(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
+
+ })
+ })
- // Error Handler testing
- t.Run("test error handler", func(t *testing.T) {
- Expect(createErrorProducerKamelet(ns, "my-own-error-producer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "my-own-log-sink")()).To(Succeed())
+ //Pipe with traits testing
+ t.Run("test Pipe with trait", func(t *testing.T) {
+ Expect(CreateTimerKamelet(ns, "my-own-timer-source")()).To(Succeed())
+ // Log sink kamelet exists from previous test
- t.Run("throw error test", func(t *testing.T) {
Expect(KamelBindWithID(operatorID, ns,
- "my-own-error-producer-source",
+ "my-own-timer-source",
"my-own-log-sink",
- "--error-handler", "sink:my-own-log-sink",
- "-p", "source.message=throw Error",
+ "-p", "source.message=hello from test",
"-p", "sink.loggerName=integrationLogger",
- "-p", "error-handler.loggerName=kameletErrorHandler",
- // Needed in the test to make sure to do the right string comparison later
- "-t", "logging.color=false",
- "--name", "throw-error-binding",
+ "--annotation", "trait.camel.apache.org/camel.properties=[\"camel.prop1=a\",\"camel.prop2=b\"]",
+ "--name", "kb-with-traits",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "throw-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "throw-error-binding"), TestTimeoutShort).Should(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
- Eventually(IntegrationLogs(ns, "throw-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
-
+ Eventually(IntegrationPodPhase(ns, "kb-with-traits"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("hello from test"))
+ Eventually(IntegrationLogs(ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
})
- t.Run("don't throw error test", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns,
- "my-own-error-producer-source",
- "my-own-log-sink",
- "--error-handler", "sink:my-own-log-sink",
- "-p", "source.message=true",
- "-p", "sink.loggerName=integrationLogger",
- "-p", "error-handler.loggerName=kameletErrorHandler",
- // Needed in the test to make sure to do the right string comparison later
- "-t", "logging.color=false",
- "--name", "no-error-binding",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, "no-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "no-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
- Eventually(IntegrationLogs(ns, "no-error-binding"), TestTimeoutShort).Should(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
-
+ // Pipe with wrong spec
+ t.Run("test Pipe with wrong spec", func(t *testing.T) {
+ name := RandomizedSuffixName("bad-klb")
+ kb := v1.NewPipe(ns, name)
+ kb.Spec = v1.PipeSpec{}
+ _, err := kubernetes.ReplaceResource(TestContext, TestClient(), &kb)
+ Eventually(err).Should(BeNil())
+ Eventually(PipePhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
+ Eventually(PipeCondition(ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
+ WithTransform(PipeConditionMessage, And(
+ ContainSubstring("could not determine source URI"),
+ ContainSubstring("no ref or URI specified in endpoint"),
+ )))
})
- })
- //Pipe with traits testing
- t.Run("test Pipe with trait", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "my-own-timer-source")()).To(Succeed())
- // Log sink kamelet exists from previous test
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-own-timer-source",
- "my-own-log-sink",
- "-p", "source.message=hello from test",
- "-p", "sink.loggerName=integrationLogger",
- "--annotation", "trait.camel.apache.org/camel.properties=[\"camel.prop1=a\",\"camel.prop2=b\"]",
- "--name", "kb-with-traits",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, "kb-with-traits"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("hello from test"))
- Eventually(IntegrationLogs(ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- // Pipe with wrong spec
- t.Run("test Pipe with wrong spec", func(t *testing.T) {
- name := RandomizedSuffixName("bad-klb")
- kb := v1.NewPipe(ns, name)
- kb.Spec = v1.PipeSpec{}
- _, err := kubernetes.ReplaceResource(TestContext, TestClient(), &kb)
- Eventually(err).Should(BeNil())
- Eventually(PipePhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
- Eventually(PipeCondition(ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
- WithTransform(PipeConditionMessage, And(
- ContainSubstring("could not determine source URI"),
- ContainSubstring("no ref or URI specified in endpoint"),
- )))
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func createErrorProducerKamelet(ns string, name string) func() error {
diff --git a/e2e/common/misc/pipe_with_image_test.go b/e2e/common/misc/pipe_with_image_test.go
index d34e67d39..6c9de10aa 100644
--- a/e2e/common/misc/pipe_with_image_test.go
+++ b/e2e/common/misc/pipe_with_image_test.go
@@ -34,64 +34,65 @@ import (
)
func TestPipeWithImage(t *testing.T) {
- RegisterTestingT(t)
-
- bindingID := "with-image-binding"
-
- t.Run("run with initial image", func(t *testing.T) {
- expectedImage := "docker.io/jmalloc/echo-server:0.3.2"
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-own-timer-source",
- "my-own-log-sink",
- "--annotation", "trait.camel.apache.org/container.image="+expectedImage,
- "--annotation", "trait.camel.apache.org/jvm.enabled=false",
- "--annotation", "trait.camel.apache.org/kamelets.enabled=false",
- "--annotation", "trait.camel.apache.org/dependencies.enabled=false",
- "--annotation", "test=1",
- "--name", bindingID,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationGeneration(ns, bindingID)).
- Should(gstruct.PointTo(BeNumerically("==", 1)))
- Eventually(Integration(ns, bindingID)).Should(WithTransform(Annotations, And(
- HaveKeyWithValue("test", "1"),
- HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
- )))
- Eventually(IntegrationStatusImage(ns, bindingID)).
- Should(Equal(expectedImage))
- Eventually(IntegrationPodPhase(ns, bindingID), TestTimeoutLong).
- Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodImage(ns, bindingID)).
- Should(Equal(expectedImage))
+ WithNewTestNamespace(t, func(ns string) {
+
+ bindingID := "with-image-binding"
+
+ t.Run("run with initial image", func(t *testing.T) {
+ expectedImage := "docker.io/jmalloc/echo-server:0.3.2"
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-own-timer-source",
+ "my-own-log-sink",
+ "--annotation", "trait.camel.apache.org/container.image="+expectedImage,
+ "--annotation", "trait.camel.apache.org/jvm.enabled=false",
+ "--annotation", "trait.camel.apache.org/kamelets.enabled=false",
+ "--annotation", "trait.camel.apache.org/dependencies.enabled=false",
+ "--annotation", "test=1",
+ "--name", bindingID,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationGeneration(ns, bindingID)).
+ Should(gstruct.PointTo(BeNumerically("==", 1)))
+ Eventually(Integration(ns, bindingID)).Should(WithTransform(Annotations, And(
+ HaveKeyWithValue("test", "1"),
+ HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
+ )))
+ Eventually(IntegrationStatusImage(ns, bindingID)).
+ Should(Equal(expectedImage))
+ Eventually(IntegrationPodPhase(ns, bindingID), TestTimeoutLong).
+ Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodImage(ns, bindingID)).
+ Should(Equal(expectedImage))
+ })
+
+ t.Run("run with new image", func(t *testing.T) {
+ expectedImage := "docker.io/jmalloc/echo-server:0.3.3"
+
+ Expect(KamelBindWithID(operatorID, ns,
+ "my-own-timer-source",
+ "my-own-log-sink",
+ "--annotation", "trait.camel.apache.org/container.image="+expectedImage,
+ "--annotation", "trait.camel.apache.org/jvm.enabled=false",
+ "--annotation", "trait.camel.apache.org/kamelets.enabled=false",
+ "--annotation", "trait.camel.apache.org/dependencies.enabled=false",
+ "--annotation", "test=2",
+ "--name", bindingID,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationGeneration(ns, bindingID)).
+ Should(gstruct.PointTo(BeNumerically("==", 1)))
+ Eventually(Integration(ns, bindingID)).Should(WithTransform(Annotations, And(
+ HaveKeyWithValue("test", "2"),
+ HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
+ )))
+ Eventually(IntegrationStatusImage(ns, bindingID)).
+ Should(Equal(expectedImage))
+ Eventually(IntegrationPodPhase(ns, bindingID), TestTimeoutLong).
+ Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodImage(ns, bindingID)).
+ Should(Equal(expectedImage))
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("run with new image", func(t *testing.T) {
- expectedImage := "docker.io/jmalloc/echo-server:0.3.3"
-
- Expect(KamelBindWithID(operatorID, ns,
- "my-own-timer-source",
- "my-own-log-sink",
- "--annotation", "trait.camel.apache.org/container.image="+expectedImage,
- "--annotation", "trait.camel.apache.org/jvm.enabled=false",
- "--annotation", "trait.camel.apache.org/kamelets.enabled=false",
- "--annotation", "trait.camel.apache.org/dependencies.enabled=false",
- "--annotation", "test=2",
- "--name", bindingID,
- ).Execute()).To(Succeed())
- Eventually(IntegrationGeneration(ns, bindingID)).
- Should(gstruct.PointTo(BeNumerically("==", 1)))
- Eventually(Integration(ns, bindingID)).Should(WithTransform(Annotations, And(
- HaveKeyWithValue("test", "2"),
- HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
- )))
- Eventually(IntegrationStatusImage(ns, bindingID)).
- Should(Equal(expectedImage))
- Eventually(IntegrationPodPhase(ns, bindingID), TestTimeoutLong).
- Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodImage(ns, bindingID)).
- Should(Equal(expectedImage))
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index 5a0cb74bc..9b4003536 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -38,7 +38,6 @@ import (
)
func TestImageRegistryIsAMavenRepository(t *testing.T) {
- RegisterTestingT(t)
ocp, err := openshift.IsOpenShift(TestClient())
require.NoError(t, err)
if ocp {
@@ -124,6 +123,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
+
t.Run("dependency can be used at build time", func(t *testing.T) {
// Create integration that should run an Xslt transformation whose template needs to be present at build time
name := RandomizedSuffixName("xslt")
diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go
index 2719f2180..8c1a7b9c8 100644
--- a/e2e/common/misc/rest_test.go
+++ b/e2e/common/misc/rest_test.go
@@ -38,37 +38,38 @@ import (
)
func TestRunRest(t *testing.T) {
- RegisterTestingT(t)
-
- ocp, err := openshift.IsOpenShift(TestClient())
- require.NoError(t, err)
-
- Expect(KamelRunWithID(operatorID, ns, "files/rest-consumer.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "rest-consumer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- t.Run("Service works", func(t *testing.T) {
- name := RandomizedSuffixName("John")
- service := Service(ns, "rest-consumer")
- Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
- Expect(KamelRunWithID(operatorID, ns, "files/rest-producer.yaml", "-p", "serviceName=rest-consumer", "-p", "name="+name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "rest-producer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
- Eventually(IntegrationLogs(ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
- })
-
- if ocp {
- t.Run("Route works", func(t *testing.T) {
- name := RandomizedSuffixName("Peter")
- route := Route(ns, "rest-consumer")
- Eventually(route, TestTimeoutShort).ShouldNot(BeNil())
- Eventually(RouteStatus(ns, "rest-consumer"), TestTimeoutMedium).Should(Equal("True"))
- url := fmt.Sprintf("http://%s/customers/%s", route().Spec.Host, name)
- Eventually(httpRequest(url), TestTimeoutMedium).Should(Equal(fmt.Sprintf("%s Doe", name)))
- Eventually(IntegrationLogs(ns, "rest-consumer"), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ WithNewTestNamespace(t, func(ns string) {
+
+ ocp, err := openshift.IsOpenShift(TestClient())
+ require.NoError(t, err)
+
+ Expect(KamelRunWithID(operatorID, ns, "files/rest-consumer.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "rest-consumer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ t.Run("Service works", func(t *testing.T) {
+ name := RandomizedSuffixName("John")
+ service := Service(ns, "rest-consumer")
+ Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
+ Expect(KamelRunWithID(operatorID, ns, "files/rest-producer.yaml", "-p", "serviceName=rest-consumer", "-p", "name="+name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "rest-producer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ Eventually(IntegrationLogs(ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
})
- }
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ if ocp {
+ t.Run("Route works", func(t *testing.T) {
+ name := RandomizedSuffixName("Peter")
+ route := Route(ns, "rest-consumer")
+ Eventually(route, TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(RouteStatus(ns, "rest-consumer"), TestTimeoutMedium).Should(Equal("True"))
+ url := fmt.Sprintf("http://%s/customers/%s", route().Spec.Host, name)
+ Eventually(httpRequest(url), TestTimeoutMedium).Should(Equal(fmt.Sprintf("%s Doe", name)))
+ Eventually(IntegrationLogs(ns, "rest-consumer"), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ })
+ }
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func httpRequest(url string) func() (string, error) {
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index 36ab04c15..b4501767d 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -40,93 +40,94 @@ import (
)
func TestPipeScale(t *testing.T) {
- RegisterTestingT(t)
-
- ocp, err := openshift.IsOpenShift(TestClient())
- require.NoError(t, err)
- if ocp {
- t.Skip("TODO: Temporarily disabled as this test is flaky on OpenShift 3")
- return
- }
-
- name := RandomizedSuffixName("timer2log")
- Expect(KamelBindWithID(operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
-
- t.Run("Update Pipe scale spec", func(t *testing.T) {
- Expect(ScalePipe(ns, name, 3)).To(Succeed())
- // Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
- // Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 3)))
- // Check it also cascades into the Pipe scale subresource Status field
- Eventually(PipeStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 3)))
- // Check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- // Finally check the readiness condition becomes truthy back onPipe
- Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ WithNewTestNamespace(t, func(ns string) {
+
+ ocp, err := openshift.IsOpenShift(TestClient())
+ require.NoError(t, err)
+ if ocp {
+ t.Skip("TODO: Temporarily disabled as this test is flaky on OpenShift 3")
+ return
+ }
+
+ name := RandomizedSuffixName("timer2log")
+ Expect(KamelBindWithID(operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
+
+ t.Run("Update Pipe scale spec", func(t *testing.T) {
+ Expect(ScalePipe(ns, name, 3)).To(Succeed())
+ // Check the scale cascades into the Deployment scale
+ Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
+ // Check it also cascades into the Integration scale subresource Status field
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 3)))
+ // Check it also cascades into the Pipe scale subresource Status field
+ Eventually(PipeStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 3)))
+ // Check the readiness condition becomes truthy back
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ // Finally check the readiness condition becomes truthy back onPipe
+ Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ })
+
+ t.Run("ScalePipe with polymorphic client", func(t *testing.T) {
+ scaleClient, err := TestClient().ScalesClient()
+ Expect(err).To(BeNil())
+
+ // Patch the integration scale subresource
+ patch := "{\"spec\":{\"replicas\":2}}"
+ _, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("Pipes"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
+ Expect(err).To(BeNil())
+
+ // Check the readiness condition is still truthy as down-scaling
+ Expect(PipeConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ // Check the Integration scale subresource Spec field
+ Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 2)))
+ // Then check it cascades into the Deployment scale
+ Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
+ // Check it cascades into the Integration scale subresource Status field
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 2)))
+ // Finally check it cascades into the Pipe scale subresource Status field
+ Eventually(PipeStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 2)))
+ })
+
+ t.Run("ScalePipe with Camel K client", func(t *testing.T) {
+ camel, err := versioned.NewForConfig(TestClient().GetConfig())
+ Expect(err).To(BeNil())
+
+ // Getter
+ PipeScale, err := camel.CamelV1().Pipes(ns).GetScale(TestContext, name, metav1.GetOptions{})
+ Expect(err).To(BeNil())
+ Expect(PipeScale.Spec.Replicas).To(BeNumerically("==", 2))
+ Expect(PipeScale.Status.Replicas).To(BeNumerically("==", 2))
+
+ // Setter
+ PipeScale.Spec.Replicas = 1
+ _, err = camel.CamelV1().Pipes(ns).UpdateScale(TestContext, name, PipeScale, metav1.UpdateOptions{})
+ Expect(err).To(BeNil())
+
+ // Check the readiness condition is still truthy as down-scaling inPipe
+ Expect(PipeConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ // Check the Pipe scale subresource Spec field
+ Eventually(PipeSpecReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 1)))
+ // Check the readiness condition is still truthy as down-scaling
+ Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ // Check the Integration scale subresource Spec field
+ Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 1)))
+ // Then check it cascades into the Deployment scale
+ Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(1))
+ // Finally check it cascades into the Integration scale subresource Status field
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 1)))
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("ScalePipe with polymorphic client", func(t *testing.T) {
- scaleClient, err := TestClient().ScalesClient()
- Expect(err).To(BeNil())
-
- // Patch the integration scale subresource
- patch := "{\"spec\":{\"replicas\":2}}"
- _, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("Pipes"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
- Expect(err).To(BeNil())
-
- // Check the readiness condition is still truthy as down-scaling
- Expect(PipeConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
- // Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 2)))
- // Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
- // Check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 2)))
- // Finally check it cascades into the Pipe scale subresource Status field
- Eventually(PipeStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 2)))
- })
-
- t.Run("ScalePipe with Camel K client", func(t *testing.T) {
- camel, err := versioned.NewForConfig(TestClient().GetConfig())
- Expect(err).To(BeNil())
-
- // Getter
- PipeScale, err := camel.CamelV1().Pipes(ns).GetScale(TestContext, name, metav1.GetOptions{})
- Expect(err).To(BeNil())
- Expect(PipeScale.Spec.Replicas).To(BeNumerically("==", 2))
- Expect(PipeScale.Status.Replicas).To(BeNumerically("==", 2))
-
- // Setter
- PipeScale.Spec.Replicas = 1
- _, err = camel.CamelV1().Pipes(ns).UpdateScale(TestContext, name, PipeScale, metav1.UpdateOptions{})
- Expect(err).To(BeNil())
-
- // Check the readiness condition is still truthy as down-scaling inPipe
- Expect(PipeConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
- // Check the Pipe scale subresource Spec field
- Eventually(PipeSpecReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 1)))
- // Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
- // Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 1)))
- // Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(1))
- // Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 1)))
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go
index 422adfa59..0b38946ed 100644
--- a/e2e/common/misc/scale_integration_test.go
+++ b/e2e/common/misc/scale_integration_test.go
@@ -39,93 +39,94 @@ import (
)
func TestIntegrationScale(t *testing.T) {
- RegisterTestingT(t)
-
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- t.Run("Update integration scale spec", func(t *testing.T) {
- RegisterTestingT(t)
- Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
- // Check the readiness condition becomes falsy
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- // Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
- // Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 3)))
- // Finally check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ WithNewTestNamespace(t, func(ns string) {
+
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ t.Run("Update integration scale spec", func(t *testing.T) {
+ RegisterTestingT(t)
+ Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
+ // Check the readiness condition becomes falsy
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ // Check the scale cascades into the Deployment scale
+ Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
+ // Check it also cascades into the Integration scale subresource Status field
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 3)))
+ // Finally check the readiness condition becomes truthy back
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ })
+
+ t.Run("Scale integration with polymorphic client", func(t *testing.T) {
+ scaleClient, err := TestClient().ScalesClient()
+ Expect(err).To(BeNil())
+
+ // Patch the integration scale subresource
+ patch := "{\"spec\":{\"replicas\":2}}"
+ _, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("integrations"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
+ Expect(err).To(BeNil())
+
+ // Check the readiness condition is still truthy as down-scaling
+ Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ // Check the Integration scale subresource Spec field
+ Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 2)))
+ // Then check it cascades into the Deployment scale
+ Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
+ // Finally check it cascades into the Integration scale subresource Status field
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 2)))
+ })
+
+ t.Run("Scale integration with Camel K client", func(t *testing.T) {
+ camel, err := versioned.NewForConfig(TestClient().GetConfig())
+ Expect(err).To(BeNil())
+
+ // Getter
+ integrationScale, err := camel.CamelV1().Integrations(ns).GetScale(TestContext, name, metav1.GetOptions{})
+ Expect(err).To(BeNil())
+ Expect(integrationScale.Spec.Replicas).To(BeNumerically("==", 2))
+ Expect(integrationScale.Status.Replicas).To(BeNumerically("==", 2))
+
+ // Setter
+ integrationScale.Spec.Replicas = 1
+ integrationScale, err = camel.CamelV1().Integrations(ns).UpdateScale(TestContext, name, integrationScale, metav1.UpdateOptions{})
+ Expect(err).To(BeNil())
+
+ // Check the readiness condition is still truthy as down-scaling
+ Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ // Check the Integration scale subresource Spec field
+ Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 1)))
+ // Then check it cascades into the Deployment scale
+ Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(1))
+ // Finally check it cascades into the Integration scale subresource Status field
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 1)))
+ })
+
+ t.Run("Scale integration with external image", func(t *testing.T) {
+ image := IntegrationPodImage(ns, name)()
+ Expect(image).NotTo(BeEmpty())
+ // Save resources by deleting the integration
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
+ Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(ScaleIntegration(ns, "pre-built", 0)).To(Succeed())
+ Eventually(IntegrationPod(ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
+ Expect(ScaleIntegration(ns, "pre-built", 1)).To(Succeed())
+ Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ Expect(Kamel("delete", "pre-built", "-n", ns).Execute()).To(Succeed())
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("Scale integration with polymorphic client", func(t *testing.T) {
- scaleClient, err := TestClient().ScalesClient()
- Expect(err).To(BeNil())
-
- // Patch the integration scale subresource
- patch := "{\"spec\":{\"replicas\":2}}"
- _, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("integrations"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
- Expect(err).To(BeNil())
-
- // Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
- // Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 2)))
- // Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
- // Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 2)))
- })
-
- t.Run("Scale integration with Camel K client", func(t *testing.T) {
- camel, err := versioned.NewForConfig(TestClient().GetConfig())
- Expect(err).To(BeNil())
-
- // Getter
- integrationScale, err := camel.CamelV1().Integrations(ns).GetScale(TestContext, name, metav1.GetOptions{})
- Expect(err).To(BeNil())
- Expect(integrationScale.Spec.Replicas).To(BeNumerically("==", 2))
- Expect(integrationScale.Status.Replicas).To(BeNumerically("==", 2))
-
- // Setter
- integrationScale.Spec.Replicas = 1
- integrationScale, err = camel.CamelV1().Integrations(ns).UpdateScale(TestContext, name, integrationScale, metav1.UpdateOptions{})
- Expect(err).To(BeNil())
-
- // Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
- // Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 1)))
- // Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(1))
- // Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 1)))
- })
-
- t.Run("Scale integration with external image", func(t *testing.T) {
- image := IntegrationPodImage(ns, name)()
- Expect(image).NotTo(BeEmpty())
- // Save resources by deleting the integration
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
-
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(ScaleIntegration(ns, "pre-built", 0)).To(Succeed())
- Eventually(IntegrationPod(ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
- Expect(ScaleIntegration(ns, "pre-built", 1)).To(Succeed())
- Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- Expect(Kamel("delete", "pre-built", "-n", ns).Execute()).To(Succeed())
- })
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index a78561618..e011a1ae5 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -35,31 +35,33 @@ import (
)
func TestStructuredLogs(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "logging.format=json").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "logging.format=json").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- pod := OperatorPod(ns)()
- Expect(pod).NotTo(BeNil())
+ opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+ pod := OperatorPod(opns)()
+ Expect(pod).NotTo(BeNil())
- // pod.Namespace could be different from ns if using global operator
- fmt.Printf("Fetching logs for operator pod %s in namespace %s", pod.Name, pod.Namespace)
- logOptions := &corev1.PodLogOptions{
- Container: "camel-k-operator",
- }
- logs, err := StructuredLogs(pod.Namespace, pod.Name, logOptions, false)
- Expect(err).To(BeNil())
- Expect(logs).NotTo(BeEmpty())
+ // pod.Namespace could be different from ns if using global operator
+ fmt.Printf("Fetching logs for operator pod %s in namespace %s", pod.Name, pod.Namespace)
+ logOptions := &corev1.PodLogOptions{
+ Container: "camel-k-operator",
+ }
+ logs, err := StructuredLogs(pod.Namespace, pod.Name, logOptions, false)
+ Expect(err).To(BeNil())
+ Expect(logs).NotTo(BeEmpty())
- it := Integration(ns, name)()
- Expect(it).NotTo(BeNil())
- build := Build(IntegrationKitNamespace(ns, name)(), IntegrationKit(ns, name)())()
- Expect(build).NotTo(BeNil())
+ it := Integration(ns, name)()
+ Expect(it).NotTo(BeNil())
+ build := Build(IntegrationKitNamespace(ns, name)(), IntegrationKit(ns, name)())()
+ Expect(build).NotTo(BeNil())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/runtimes/default.go b/e2e/common/runtimes/default.go
index 1cc41c3f9..dec3b52c7 100644
--- a/e2e/common/runtimes/default.go
+++ b/e2e/common/runtimes/default.go
@@ -20,7 +20,10 @@ limitations under the License.
package runtimes
-import "github.com/apache/camel-k/v2/e2e/support"
+import (
+ "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/platform"
+)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.GetCIProcessID())
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", support.GetCIProcessID())
+var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
+var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go
index 87f6394e1..0e53eb022 100644
--- a/e2e/common/runtimes/runtimes_test.go
+++ b/e2e/common/runtimes/runtimes_test.go
@@ -34,40 +34,41 @@ import (
)
func TestSourceLessIntegrations(t *testing.T) {
- RegisterTestingT(t)
- var cmData = make(map[string]string)
- cmData["my-file.txt"] = "Hello World!"
- CreatePlainTextConfigmap(ns, "my-cm-sourceless", cmData)
+ WithNewTestNamespace(t, func(ns string) {
+ var cmData = make(map[string]string)
+ cmData["my-file.txt"] = "Hello World!"
+ CreatePlainTextConfigmap(ns, "my-cm-sourceless", cmData)
- t.Run("Camel Main", func(t *testing.T) {
- itName := "my-camel-main-v1"
- Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)"))
- })
+ t.Run("Camel Main", func(t *testing.T) {
+ itName := "my-camel-main-v1"
+ Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)"))
+ })
- t.Run("Camel Spring Boot", func(t *testing.T) {
- itName := "my-camel-sb-v1"
- Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("Spring Boot"))
- })
+ t.Run("Camel Spring Boot", func(t *testing.T) {
+ itName := "my-camel-sb-v1"
+ Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("Spring Boot"))
+ })
- t.Run("Camel Quarkus", func(t *testing.T) {
- itName := "my-camel-quarkus-v1"
- Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-quarkus:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
- })
+ t.Run("Camel Quarkus", func(t *testing.T) {
+ itName := "my-camel-quarkus-v1"
+ Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-quarkus:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/setup/main_test.go b/e2e/common/setup/main_test.go
new file mode 100644
index 000000000..ed301d2cd
--- /dev/null
+++ b/e2e/common/setup/main_test.go
@@ -0,0 +1,63 @@
+//go:build integration
+// +build integration
+
+// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
+
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package setup
+
+import (
+ "fmt"
+ "os"
+ "testing"
+
+ . "github.com/onsi/gomega"
+
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+
+ corev1 "k8s.io/api/core/v1"
+)
+
+func TestMain(m *testing.M) {
+ fastSetup := GetEnvOrDefault("CAMEL_K_E2E_FAST_SETUP", "false")
+ if fastSetup != "true" {
+ os.Exit(m.Run())
+ }
+
+ operatorID := platform.DefaultPlatformName
+ ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+
+ g := NewGomega(func(message string, callerSkip ...int) {
+ fmt.Printf("Test fast setup failed! - %s\n", message)
+ })
+
+ g.Expect(KamelRunWithID(operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ g.Expect(KamelRunWithID(operatorID, ns, "testdata/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ os.Exit(m.Run())
+}
diff --git a/e2e/common/setup/testdata/Java.java b/e2e/common/setup/testdata/Java.java
new file mode 100644
index 000000000..66fef5fe8
--- /dev/null
+++ b/e2e/common/setup/testdata/Java.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class Java extends RouteBuilder {
+ @Override
+ public void configure() throws Exception {
+ from("timer:tick")
+ .setHeader("m").constant("string!")
+ .setBody().simple("Magic${header.m}")
+ .log("${body}");
+ }
+}
diff --git a/e2e/common/setup/testdata/yaml.yaml b/e2e/common/setup/testdata/yaml.yaml
new file mode 100644
index 000000000..8877c8557
--- /dev/null
+++ b/e2e/common/setup/testdata/yaml.yaml
@@ -0,0 +1,28 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+- from:
+ uri: "timer:yaml"
+ parameters:
+ period: "5000"
+ steps:
+ - setHeader:
+ name: "m"
+ constant: "string!"
+ - setBody:
+ simple: "Magic${header.m}"
+ - to: "log:info"
diff --git a/e2e/common/support/startup_test.go b/e2e/common/support/startup_test.go
deleted file mode 100644
index 27ed31f49..000000000
--- a/e2e/common/support/startup_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-//go:build integration
-// +build integration
-
-// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package support
-
-import (
- "testing"
-
- . "github.com/onsi/gomega"
- corev1 "k8s.io/api/core/v1"
-
- . "github.com/apache/camel-k/v2/e2e/support"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
-)
-
-func TestCommonCamelKInstallStartup(t *testing.T) {
- RegisterTestingT(t)
-
- ns := NewTestNamespace(false)
- Expect(ns).ShouldNot(BeNil())
- // the namespace is dynamic if there is some collision
- // we store this value as it will be used for cleaning in the teardown process
- SaveCIProcessID(ns.GetName())
- // fail fast if something did not work writing the resource
- Expect(GetCIProcessID()).ShouldNot(Equal(""))
-
- Expect(KamelInstallWithIDAndKameletCatalog(ns.GetName(), ns.GetName()).Execute()).To(Succeed())
- Eventually(OperatorPod(ns.GetName())).ShouldNot(BeNil())
- Eventually(Platform(ns.GetName())).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(ns.GetName(), v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
-}
diff --git a/e2e/common/support/teardown_test.go b/e2e/common/support/teardown_test.go
deleted file mode 100644
index 78546c7f7..000000000
--- a/e2e/common/support/teardown_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-//go:build integration
-// +build integration
-
-// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package support
-
-import (
- "testing"
-
- . "github.com/onsi/gomega"
-
- . "github.com/apache/camel-k/v2/e2e/support"
-)
-
-func TestCommonCamelKInstallTeardown(t *testing.T) {
- RegisterTestingT(t)
-
- ns := GetCIProcessID()
- Expect(ns).ShouldNot(Equal(""))
- Expect(DeleteNamespace(t, ns)).To(Succeed())
- DeleteCIProcessID()
-}
diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go
index 7ce8a20eb..1c3cadff6 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -37,85 +37,86 @@ import (
)
func TestAffinityTrait(t *testing.T) {
- RegisterTestingT(t)
-
- var hostname string
- if node, err := selectSchedulableNode(); err == nil {
- hostname = node.Labels["kubernetes.io/hostname"]
- } else {
- // if 'get nodes' is not allowed, just skip tests for node affinity
- hostname = ""
- }
+ WithNewTestNamespace(t, func(ns string) {
+
+ var hostname string
+ if node, err := selectSchedulableNode(); err == nil {
+ hostname = node.Labels["kubernetes.io/hostname"]
+ } else {
+ // if 'get nodes' is not allowed, just skip tests for node affinity
+ hostname = ""
+ }
- if hostname != "" {
- t.Run("Run Java with node affinity", func(t *testing.T) {
- name1 := RandomizedSuffixName("java1")
+ if hostname != "" {
+ t.Run("Run Java with node affinity", func(t *testing.T) {
+ name1 := RandomizedSuffixName("java1")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name1,
+ "-t", "affinity.enabled=true",
+ "-t", fmt.Sprintf("affinity.node-affinity-labels=kubernetes.io/hostname in(%s)", hostname)).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ pod := IntegrationPod(ns, name1)()
+ Expect(pod.Spec.Affinity).NotTo(BeNil())
+ Expect(pod.Spec.Affinity.NodeAffinity).To(Equal(&corev1.NodeAffinity{
+ RequiredDuringSchedulingIgnoredDuringExecution: nodeSelector("kubernetes.io/hostname", corev1.NodeSelectorOpIn, hostname),
+ }))
+ Expect(pod.Spec.NodeName).To(Equal(hostname))
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name1)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name1)()
+ affinityTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "affinity")
+ Expect(affinityTrait).NotTo(BeNil())
+ Expect(len(affinityTrait)).To(Equal(2))
+ Expect(affinityTrait["enabled"]).To(Equal(true))
+ Expect(affinityTrait["nodeAffinityLabels"]).NotTo(BeNil())
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+ }
+
+ t.Run("Run Java with pod affinity", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name1,
+ "--name", "java2",
"-t", "affinity.enabled=true",
- "-t", fmt.Sprintf("affinity.node-affinity-labels=kubernetes.io/hostname in(%s)", hostname)).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ "-t", "affinity.pod-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "java2"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "java2", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "java2"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name1)()
+ pod := IntegrationPod(ns, "java2")()
Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.NodeAffinity).To(Equal(&corev1.NodeAffinity{
- RequiredDuringSchedulingIgnoredDuringExecution: nodeSelector("kubernetes.io/hostname", corev1.NodeSelectorOpIn, hostname),
+ Expect(pod.Spec.Affinity.PodAffinity).To(Equal(&corev1.PodAffinity{
+ RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
+ podAffinityTerm("camel.apache.org/integration", metav1.LabelSelectorOpExists, "kubernetes.io/hostname"),
+ },
}))
- Expect(pod.Spec.NodeName).To(Equal(hostname))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name1)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name1)()
- affinityTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "affinity")
- Expect(affinityTrait).NotTo(BeNil())
- Expect(len(affinityTrait)).To(Equal(2))
- Expect(affinityTrait["enabled"]).To(Equal(true))
- Expect(affinityTrait["nodeAffinityLabels"]).NotTo(BeNil())
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
- }
-
- t.Run("Run Java with pod affinity", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", "java2",
- "-t", "affinity.enabled=true",
- "-t", "affinity.pod-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java2"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java2", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java2"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- pod := IntegrationPod(ns, "java2")()
- Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.PodAffinity).To(Equal(&corev1.PodAffinity{
- RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
- podAffinityTerm("camel.apache.org/integration", metav1.LabelSelectorOpExists, "kubernetes.io/hostname"),
- },
- }))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
+ t.Run("Run Java with pod anti affinity", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", "java3",
+ "-t", "affinity.enabled=true",
+ "-t", "affinity.pod-anti-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "java3"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "java3", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "java3"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- t.Run("Run Java with pod anti affinity", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", "java3",
- "-t", "affinity.enabled=true",
- "-t", "affinity.pod-anti-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java3"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java3", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java3"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- pod := IntegrationPod(ns, "java3")()
- Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.PodAntiAffinity).To(Equal(&corev1.PodAntiAffinity{
- RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
- podAffinityTerm("camel.apache.org/integration", metav1.LabelSelectorOpExists, "kubernetes.io/hostname"),
- },
- }))
+ pod := IntegrationPod(ns, "java3")()
+ Expect(pod.Spec.Affinity).NotTo(BeNil())
+ Expect(pod.Spec.Affinity.PodAntiAffinity).To(Equal(&corev1.PodAntiAffinity{
+ RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
+ podAffinityTerm("camel.apache.org/integration", metav1.LabelSelectorOpExists, "kubernetes.io/hostname"),
+ },
+ }))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
})
}
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index dea284e83..2fb24bcaf 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -37,249 +37,249 @@ import (
)
func TestBuilderTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Run build strategy routine", func(t *testing.T) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "builder.strategy=routine").Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
- // Default resource CPU Check
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
-
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
-
- // We need to remove the kit as well
- Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Run build order strategy dependencies", func(t *testing.T) {
- name := RandomizedSuffixName("java-dependencies-strategy")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "builder.order-strategy=dependencies").Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
- // Default resource CPU Check
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
-
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
- builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "builder")
- Expect(builderTrait).NotTo(BeNil())
- Expect(len(builderTrait)).To(Equal(1))
- Expect(builderTrait["orderStrategy"]).To(Equal("dependencies"))
-
- // We need to remove the kit as well
- Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Run build order strategy fifo", func(t *testing.T) {
- name := RandomizedSuffixName("java-fifo-strategy")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "builder.order-strategy=fifo").Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO))
- // Default resource CPU Check
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
-
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
-
- // We need to remove the kit as well
- Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Run build resources configuration", func(t *testing.T) {
- name := RandomizedSuffixName("java-resource-config")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "builder.tasks-request-cpu=builder:500m",
- "-t", "builder.tasks-limit-cpu=builder:1000m",
- "-t", "builder.tasks-request-memory=builder:2Gi",
- "-t", "builder.tasks-limit-memory=builder:3Gi",
- "-t", "builder.strategy=pod",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
-
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m"))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m"))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi"))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi"))
-
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- // Let's assert we set the resources on the builder container
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi"))
-
- Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Run custom pipeline task", func(t *testing.T) {
- name := RandomizedSuffixName("java-pipeline")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "builder.tasks=custom1;alpine;tree",
- "-t", "builder.tasks=custom2;alpine;cat maven/pom.xml",
- "-t", "builder.strategy=pod",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(len(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(4))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2"))
-
- // Check containers conditions
- Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
- Build(
- integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
- TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
- Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
- TestTimeoutShort).Should(ContainSubstring("generated-bytecode.jar"))
- Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
- Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Status,
- TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
- Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Message,
- TestTimeoutShort).Should(ContainSubstring("</project>"))
-
- // Check logs
- Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
- Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Run custom pipeline task error", func(t *testing.T) {
- name := RandomizedSuffixName("java-error")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "builder.tasks=custom1;alpine;cat missingfile.txt",
- "-t", "builder.strategy=pod",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPhase(ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- // Check containers conditions
- Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(BuildConditions(integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded")), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(
- BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Status,
- TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(
- BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Message,
- TestTimeoutShort).Should(ContainSubstring("No such file or directory"))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Run maven profile", func(t *testing.T) {
- name := RandomizedSuffixName("java-maven-profile")
-
- mavenProfile1Cm := newMavenProfileConfigMap(ns, "maven-profile-owasp", "owasp-profile")
- Expect(TestClient().Create(TestContext, mavenProfile1Cm)).To(Succeed())
- mavenProfile2Cm := newMavenProfileConfigMap(ns, "maven-profile-dependency", "dependency-profile")
- Expect(TestClient().Create(TestContext, mavenProfile2Cm)).To(Succeed())
-
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "builder.maven-profiles=configmap:maven-profile-owasp/owasp-profile",
- "-t", "builder.maven-profiles=configmap:maven-profile-dependency/dependency-profile",
- "-t", "builder.tasks=custom1;alpine;cat maven/pom.xml",
- "-t", "builder.strategy=pod",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- integrationKitName := IntegrationKit(ns, name)()
- builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPod(ns, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(len(BuilderPod(ns, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3))
- Eventually(BuilderPod(ns, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(ns, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
- Eventually(BuilderPod(ns, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("package"))
-
- // Check containers conditions
- Eventually(Build(ns, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
- Build(ns, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
- TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
- Build(ns, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
- TestTimeoutShort).Should(ContainSubstring("</project>"))
-
- // Check logs
- Eventually(Logs(ns, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
- Eventually(Logs(ns, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient().Delete(TestContext, mavenProfile1Cm)).To(Succeed())
- Expect(TestClient().Delete(TestContext, mavenProfile2Cm)).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Run build strategy routine", func(t *testing.T) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "builder.strategy=routine").Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ integrationKitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
+ // Default resource CPU Check
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Run build order strategy dependencies", func(t *testing.T) {
+ name := RandomizedSuffixName("java-dependencies-strategy")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "builder.order-strategy=dependencies").Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ integrationKitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
+ // Default resource CPU Check
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "builder")
+ Expect(builderTrait).NotTo(BeNil())
+ Expect(len(builderTrait)).To(Equal(1))
+ Expect(builderTrait["orderStrategy"]).To(Equal("dependencies"))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Run build order strategy fifo", func(t *testing.T) {
+ name := RandomizedSuffixName("java-fifo-strategy")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "builder.order-strategy=fifo").Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ integrationKitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO))
+ // Default resource CPU Check
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Run build resources configuration", func(t *testing.T) {
+ name := RandomizedSuffixName("java-resource-config")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "builder.tasks-request-cpu=builder:500m",
+ "-t", "builder.tasks-limit-cpu=builder:1000m",
+ "-t", "builder.tasks-request-memory=builder:2Gi",
+ "-t", "builder.tasks-limit-memory=builder:3Gi",
+ "-t", "builder.strategy=pod",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ integrationKitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
+
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m"))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m"))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi"))
+ Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi"))
+
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ // Let's assert we set the resources on the builder container
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m"))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1"))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi"))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi"))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Run custom pipeline task", func(t *testing.T) {
+ name := RandomizedSuffixName("java-pipeline")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "builder.tasks=custom1;alpine;tree",
+ "-t", "builder.tasks=custom2;alpine;cat maven/pom.xml",
+ "-t", "builder.strategy=pod",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ integrationKitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(len(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(4))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2"))
+
+ // Check containers conditions
+ Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(
+ Build(
+ integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
+ TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(
+ Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
+ TestTimeoutShort).Should(ContainSubstring("generated-bytecode.jar"))
+ Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(
+ Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Status,
+ TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(
+ Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Message,
+ TestTimeoutShort).Should(ContainSubstring("</project>"))
+
+ // Check logs
+ Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
+ Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Run custom pipeline task error", func(t *testing.T) {
+ name := RandomizedSuffixName("java-error")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "builder.tasks=custom1;alpine;cat missingfile.txt",
+ "-t", "builder.strategy=pod",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPhase(ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ integrationKitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ // Check containers conditions
+ Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
+ Eventually(BuildConditions(integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
+ Eventually(BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded")), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(
+ BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Status,
+ TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(
+ BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Message,
+ TestTimeoutShort).Should(ContainSubstring("No such file or directory"))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Run maven profile", func(t *testing.T) {
+ name := RandomizedSuffixName("java-maven-profile")
+
+ opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+ mavenProfile1Cm := newMavenProfileConfigMap(opns, "maven-profile-owasp", "owasp-profile")
+ Expect(TestClient().Create(TestContext, mavenProfile1Cm)).To(Succeed())
+ mavenProfile2Cm := newMavenProfileConfigMap(opns, "maven-profile-dependency", "dependency-profile")
+ Expect(TestClient().Create(TestContext, mavenProfile2Cm)).To(Succeed())
+
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "builder.maven-profiles=configmap:maven-profile-owasp/owasp-profile",
+ "-t", "builder.maven-profiles=configmap:maven-profile-dependency/dependency-profile",
+ "-t", "builder.tasks=custom1;alpine;cat maven/pom.xml",
+ "-t", "builder.strategy=pod",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ integrationKitName := IntegrationKit(ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(len(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
+ Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("package"))
+
+ // Check containers conditions
+ Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(
+ Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
+ TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(
+ Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
+ TestTimeoutShort).Should(ContainSubstring("</project>"))
+
+ // Check logs
+ Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
+ Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(TestClient().Delete(TestContext, mavenProfile1Cm)).To(Succeed())
+ Expect(TestClient().Delete(TestContext, mavenProfile2Cm)).To(Succeed())
+ })
})
}
diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go
index f431b5b58..1cce0aa5b 100644
--- a/e2e/common/traits/camel_test.go
+++ b/e2e/common/traits/camel_test.go
@@ -34,36 +34,37 @@ import (
)
func TestCamelTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("properties changes should not rebuild", func(t *testing.T) {
-
- Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
-
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- ).Execute()).To(Succeed())
-
- // checking the integration status
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKit := IntegrationKit(ns, name)()
-
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-p", "a=1",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationKit(ns, name)).Should(Equal(integrationKit))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("properties changes should not rebuild", func(t *testing.T) {
+
+ Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
+
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ // checking the integration status
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationKit := IntegrationKit(ns, name)()
+
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-p", "a=1",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationKit(ns, name)).Should(Equal(integrationKit))
+
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ })
+
+ // Clean-up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- // Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go
index 6bd6ba4ec..8fa216fe8 100644
--- a/e2e/common/traits/container_test.go
+++ b/e2e/common/traits/container_test.go
@@ -35,75 +35,76 @@ import (
)
func TestContainerTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Container image pull policy and resources configuration", func(t *testing.T) {
- name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "-t", "container.image-pull-policy=Always",
- "-t", "container.request-cpu=0.005",
- "-t", "container.request-memory=100Mi",
- "-t", "container.limit-cpu=200m",
- "-t", "container.limit-memory=500Mi",
- "--name", name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
- if len(pod.Spec.Containers) != 1 {
- return false
- }
- imagePullPolicy := pod.Spec.Containers[0].ImagePullPolicy
- return imagePullPolicy == "Always"
- }), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
- if len(pod.Spec.Containers) != 1 {
- return false
- }
- limitsCpu := pod.Spec.Containers[0].Resources.Limits.Cpu()
- requestsCpu := pod.Spec.Containers[0].Resources.Requests.Cpu()
- return limitsCpu != nil && limitsCpu.String() == "200m" && requestsCpu != nil && requestsCpu.String() == "5m"
- }), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
- if len(pod.Spec.Containers) != 1 {
- return false
- }
- limitsMemory := pod.Spec.Containers[0].Resources.Limits.Memory()
- requestsMemory := pod.Spec.Containers[0].Resources.Requests.Memory()
- return limitsMemory != nil && limitsMemory.String() == "500Mi" && requestsMemory != nil && requestsMemory.String() == "100Mi"
- }), TestTimeoutShort).Should(BeTrue())
-
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Container image pull policy and resources configuration", func(t *testing.T) {
+ name := RandomizedSuffixName("java1")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "-t", "container.image-pull-policy=Always",
+ "-t", "container.request-cpu=0.005",
+ "-t", "container.request-memory=100Mi",
+ "-t", "container.limit-cpu=200m",
+ "-t", "container.limit-memory=500Mi",
+ "--name", name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ if len(pod.Spec.Containers) != 1 {
+ return false
+ }
+ imagePullPolicy := pod.Spec.Containers[0].ImagePullPolicy
+ return imagePullPolicy == "Always"
+ }), TestTimeoutShort).Should(BeTrue())
+ Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ if len(pod.Spec.Containers) != 1 {
+ return false
+ }
+ limitsCpu := pod.Spec.Containers[0].Resources.Limits.Cpu()
+ requestsCpu := pod.Spec.Containers[0].Resources.Requests.Cpu()
+ return limitsCpu != nil && limitsCpu.String() == "200m" && requestsCpu != nil && requestsCpu.String() == "5m"
+ }), TestTimeoutShort).Should(BeTrue())
+ Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ if len(pod.Spec.Containers) != 1 {
+ return false
+ }
+ limitsMemory := pod.Spec.Containers[0].Resources.Limits.Memory()
+ requestsMemory := pod.Spec.Containers[0].Resources.Requests.Memory()
+ return limitsMemory != nil && limitsMemory.String() == "500Mi" && requestsMemory != nil && requestsMemory.String() == "100Mi"
+ }), TestTimeoutShort).Should(BeTrue())
+
+ })
+
+ t.Run("Container name", func(t *testing.T) {
+ name := RandomizedSuffixName("java2")
+ containerName := "my-container-name"
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "-t", "container.name="+containerName,
+ "--name", name,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ if len(pod.Spec.Containers) != 1 {
+ return false
+ }
+ podContainerName := pod.Spec.Containers[0].Name
+ return podContainerName == containerName
+ }), TestTimeoutShort).Should(BeTrue())
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ containerTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "container")
+ Expect(containerTrait).ToNot(BeNil())
+ Expect(len(containerTrait)).To(Equal(1))
+ Expect(containerTrait["name"]).To(Equal(containerName))
+
+ })
+
+ // Clean-up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("Container name", func(t *testing.T) {
- name := RandomizedSuffixName("java2")
- containerName := "my-container-name"
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "-t", "container.name="+containerName,
- "--name", name,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
- if len(pod.Spec.Containers) != 1 {
- return false
- }
- podContainerName := pod.Spec.Containers[0].Name
- return podContainerName == containerName
- }), TestTimeoutShort).Should(BeTrue())
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
- containerTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "container")
- Expect(containerTrait).ToNot(BeNil())
- Expect(len(containerTrait)).To(Equal(1))
- Expect(containerTrait["name"]).To(Equal(containerName))
-
- })
-
- // Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/traits/default.go b/e2e/common/traits/default.go
index 59a520c86..bc4034843 100644
--- a/e2e/common/traits/default.go
+++ b/e2e/common/traits/default.go
@@ -20,7 +20,10 @@ limitations under the License.
package traits
-import "github.com/apache/camel-k/v2/e2e/support"
+import (
+ "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/platform"
+)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.GetCIProcessID())
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", support.GetCIProcessID())
+var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
+var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index 08a589e5e..9a5e24117 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -38,68 +38,70 @@ import (
)
func TestRecreateDeploymentStrategyTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Run with Recreate Deployment Strategy", func(t *testing.T) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "deployment.strategy="+string(appsv1.RecreateDeploymentStrategyType)).
- Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- Eventually(Deployment(ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
- Fields{
- "Spec": MatchFields(IgnoreExtras,
- Fields{
- "Strategy": MatchFields(IgnoreExtras,
- Fields{
- "Type": Equal(appsv1.RecreateDeploymentStrategyType),
- }),
- }),
- }),
- ))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
- deploymentTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "deployment")
- Expect(deploymentTrait).ToNot(BeNil())
- Expect(len(deploymentTrait)).To(Equal(1))
- Expect(deploymentTrait["strategy"]).To(Equal(string(appsv1.RecreateDeploymentStrategyType)))
-
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Run with Recreate Deployment Strategy", func(t *testing.T) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "deployment.strategy="+string(appsv1.RecreateDeploymentStrategyType)).
+ Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ Eventually(Deployment(ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ Fields{
+ "Spec": MatchFields(IgnoreExtras,
+ Fields{
+ "Strategy": MatchFields(IgnoreExtras,
+ Fields{
+ "Type": Equal(appsv1.RecreateDeploymentStrategyType),
+ }),
+ }),
+ }),
+ ))
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ deploymentTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "deployment")
+ Expect(deploymentTrait).ToNot(BeNil())
+ Expect(len(deploymentTrait)).To(Equal(1))
+ Expect(deploymentTrait["strategy"]).To(Equal(string(appsv1.RecreateDeploymentStrategyType)))
+
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Run with RollingUpdate Deployment Strategy", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "-t", "deployment.strategy="+string(appsv1.RollingUpdateDeploymentStrategyType)).
- Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- Eventually(Deployment(ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
- Fields{
- "Spec": MatchFields(IgnoreExtras,
- Fields{
- "Strategy": MatchFields(IgnoreExtras,
- Fields{
- "Type": Equal(appsv1.RollingUpdateDeploymentStrategyType),
- }),
- }),
- }),
- ))
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Run with RollingUpdate Deployment Strategy", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "-t", "deployment.strategy="+string(appsv1.RollingUpdateDeploymentStrategyType)).
+ Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ Eventually(Deployment(ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ Fields{
+ "Spec": MatchFields(IgnoreExtras,
+ Fields{
+ "Strategy": MatchFields(IgnoreExtras,
+ Fields{
+ "Type": Equal(appsv1.RollingUpdateDeploymentStrategyType),
+ }),
+ }),
+ }),
+ ))
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go
index 081a9f542..68f0c0cb0 100644
--- a/e2e/common/traits/error_handler_test.go
+++ b/e2e/common/traits/error_handler_test.go
@@ -34,20 +34,21 @@ import (
)
func TestErrorHandlerTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Run errored integration with error handler", func(t *testing.T) {
- name := RandomizedSuffixName("error-handler")
- Expect(KamelRunWithID(operatorID, ns, "files/ErroredRoute.java",
- "--name", name,
- "-t", "error-handler.enabled=true",
- "-t", "error-handler.ref=defaultErrorHandler",
- "-p", "camel.beans.defaultErrorHandler=#class:org.apache.camel.builder.DeadLetterChannelBuilder",
- "-p", "camel.beans.defaultErrorHandler.deadLetterUri=log:my-special-error-handler-in-place?level=ERROR&showCaughtException=false&showBody=false&showBodyType=false&showExchangePattern=false",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).ShouldNot(ContainSubstring("InvalidPayloadException"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my-special-error-handler-in-place"))
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Run errored integration with error handler", func(t *testing.T) {
+ name := RandomizedSuffixName("error-handler")
+ Expect(KamelRunWithID(operatorID, ns, "files/ErroredRoute.java",
+ "--name", name,
+ "-t", "error-handler.enabled=true",
+ "-t", "error-handler.ref=defaultErrorHandler",
+ "-p", "camel.beans.defaultErrorHandler=#class:org.apache.camel.builder.DeadLetterChannelBuilder",
+ "-p", "camel.beans.defaultErrorHandler.deadLetterUri=log:my-special-error-handler-in-place?level=ERROR&showCaughtException=false&showBody=false&showBodyType=false&showExchangePattern=false",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).ShouldNot(ContainSubstring("InvalidPayloadException"))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my-special-error-handler-in-place"))
+ })
})
}
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 80cb6a4de..3a01aace1 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -34,45 +34,46 @@ import (
)
func TestErroredTrait(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("Integration trait should fail", func(t *testing.T) {
- name := RandomizedSuffixName("it-errored")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "kamelets.list=missing",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
- WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
- ))
- })
+ t.Run("Integration trait should fail", func(t *testing.T) {
+ name := RandomizedSuffixName("it-errored")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "kamelets.list=missing",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
+ WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
+ ))
+ })
- t.Run("Pipe trait should fail", func(t *testing.T) {
- name := RandomizedSuffixName("kb-errored")
- Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar",
- "--name", name,
- "-t", "kamelets.list=missing",
- ).Execute()).To(Succeed())
- // Pipe
- Eventually(PipePhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(PipeCondition(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
- WithTransform(PipeConditionMessage, And(
- ContainSubstring("error during trait customization"),
- ContainSubstring("[missing] not found"),
- )))
- // Integration related
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
- WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
- ))
- })
+ t.Run("Pipe trait should fail", func(t *testing.T) {
+ name := RandomizedSuffixName("kb-errored")
+ Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar",
+ "--name", name,
+ "-t", "kamelets.list=missing",
+ ).Execute()).To(Succeed())
+ // Pipe
+ Eventually(PipePhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(PipeCondition(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
+ WithTransform(PipeConditionMessage, And(
+ ContainSubstring("error during trait customization"),
+ ContainSubstring("[missing] not found"),
+ )))
+ // Integration related
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
+ WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
+ ))
+ })
- // Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ // Clean up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 6cbdefb36..69a61c73f 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -43,47 +43,133 @@ import (
)
func TestHealthTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Readiness condition with stopped route scaled", func(t *testing.T) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "-t", "health.enabled=true",
- // Enable Jolokia for the test to stop the Camel route
- "-t", "jolokia.enabled=true",
- "-t", "jolokia.use-ssl-client-authentication=false",
- "-t", "jolokia.protocol=http",
- "--name", name,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
- // Check the readiness condition becomes falsy
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- // Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
- // Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(gstruct.PointTo(BeNumerically("==", 3)))
- // Finally check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
- healthTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "health")
- Expect(healthTrait).ToNot(BeNil())
- Expect(len(healthTrait)).To(Equal(1))
- Expect(healthTrait["enabled"]).To(Equal(true))
-
- pods := IntegrationPods(ns, name)()
-
- for i, pod := range pods {
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Readiness condition with stopped route scaled", func(t *testing.T) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "-t", "health.enabled=true",
+ // Enable Jolokia for the test to stop the Camel route
+ "-t", "jolokia.enabled=true",
+ "-t", "jolokia.use-ssl-client-authentication=false",
+ "-t", "jolokia.protocol=http",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
+ // Check the readiness condition becomes falsy
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ // Check the scale cascades into the Deployment scale
+ Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
+ // Check it also cascades into the Integration scale subresource Status field
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(gstruct.PointTo(BeNumerically("==", 3)))
+ // Finally check the readiness condition becomes truthy back
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ healthTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "health")
+ Expect(healthTrait).ToNot(BeNil())
+ Expect(len(healthTrait)).To(Equal(1))
+ Expect(healthTrait["enabled"]).To(Equal(true))
+
+ pods := IntegrationPods(ns, name)()
+
+ for i, pod := range pods {
+ // Stop the Camel route
+ request := map[string]string{
+ "type": "exec",
+ "mbean": "org.apache.camel:context=camel-1,name=\"route1\",type=routes",
+ "operation": "stop()",
+ }
+ body, err := json.Marshal(request)
+ Expect(err).To(BeNil())
+
+ response, err := TestClient().CoreV1().RESTClient().Post().
+ AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
+ Body(body).
+ DoRaw(TestContext)
+ Expect(err).To(BeNil())
+ Expect(response).To(ContainSubstring(`"status":200`))
+
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionFalse))
+
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
+ WithTransform(IntegrationConditionMessage, Equal(fmt.Sprintf("%d/3 pods are not ready", i+1)))))
+ }
+
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *v1.IntegrationCondition) bool {
+ if c.Status != corev1.ConditionFalse {
+ return false
+ }
+ if len(c.Pods) != 3 {
+ return false
+ }
+
+ var r *v1.HealthCheckResponse
+
+ for _, pod := range c.Pods {
+ for h := range pod.Health {
+ if pod.Health[h].Name == "camel-routes" {
+ r = &pod.Health[h]
+ }
+ }
+
+ if r == nil {
+ return false
+ }
+
+ if r.Data == nil {
+ return false
+ }
+
+ var data map[string]interface{}
+ if err := json.Unmarshal(r.Data, &data); err != nil {
+ return false
+ }
+ if data["check.kind"].(string) != "READINESS" || data["route.status"].(string) != "Stopped" {
+ return false
+ }
+ }
+ return true
+ }))
+
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+
+ // Clean-up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Readiness condition with stopped route", func(t *testing.T) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "-t", "health.enabled=true",
+ // Enable Jolokia for the test to stop the Camel route
+ "-t", "jolokia.enabled=true",
+ "-t", "jolokia.use-ssl-client-authentication=false",
+ "-t", "jolokia.protocol=http",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ pod := IntegrationPod(ns, name)()
+
// Stop the Camel route
request := map[string]string{
"type": "exec",
@@ -100,29 +186,40 @@ func TestHealthTrait(t *testing.T) {
Expect(err).To(BeNil())
Expect(response).To(ContainSubstring(`"status":200`))
+ // Check the ready condition has turned false
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
-
+ // And it contains details about the runtime state
+
+ //
+ // TODO
+ // Integration has different runtime state reporting on OCP4
+ //
+ // lastProbeTime: null
+ // lastTransitionTime: "2021-12-08T20:12:14Z"
+ // message: 'containers with unready status: [integration]'
+ // reason: ContainersNotReady
+ // status: "False"
+ // type: Ready
+ //
Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
- WithTransform(IntegrationConditionMessage, Equal(fmt.Sprintf("%d/3 pods are not ready", i+1)))))
- }
+ WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *v1.IntegrationCondition) bool {
- if c.Status != corev1.ConditionFalse {
- return false
- }
- if len(c.Pods) != 3 {
- return false
- }
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *v1.IntegrationCondition) bool {
+ if c.Status != corev1.ConditionFalse {
+ return false
+ }
+ if len(c.Pods) != 1 {
+ return false
+ }
- var r *v1.HealthCheckResponse
+ var r *v1.HealthCheckResponse
- for _, pod := range c.Pods {
- for h := range pod.Health {
- if pod.Health[h].Name == "camel-routes" {
- r = &pod.Health[h]
+ for h := range c.Pods[0].Health {
+ if c.Pods[0].Health[h].Name == "camel-routes" {
+ r = &c.Pods[0].Health[h]
}
}
@@ -138,378 +235,282 @@ func TestHealthTrait(t *testing.T) {
if err := json.Unmarshal(r.Data, &data); err != nil {
return false
}
- if data["check.kind"].(string) != "READINESS" || data["route.status"].(string) != "Stopped" {
- return false
- }
- }
- return true
- }))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped"
+ }))
- // Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- t.Run("Readiness condition with stopped route", func(t *testing.T) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "-t", "health.enabled=true",
- // Enable Jolokia for the test to stop the Camel route
- "-t", "jolokia.enabled=true",
- "-t", "jolokia.use-ssl-client-authentication=false",
- "-t", "jolokia.protocol=http",
- "--name", name,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- pod := IntegrationPod(ns, name)()
-
- // Stop the Camel route
- request := map[string]string{
- "type": "exec",
- "mbean": "org.apache.camel:context=camel-1,name=\"route1\",type=routes",
- "operation": "stop()",
- }
- body, err := json.Marshal(request)
- Expect(err).To(BeNil())
-
- response, err := TestClient().CoreV1().RESTClient().Post().
- AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
- Body(body).
- DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
-
- // Check the ready condition has turned false
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionFalse))
- // And it contains details about the runtime state
-
- //
- // TODO
- // Integration has different runtime state reporting on OCP4
- //
- // lastProbeTime: null
- // lastTransitionTime: "2021-12-08T20:12:14Z"
- // message: 'containers with unready status: [integration]'
- // reason: ContainersNotReady
- // status: "False"
- // type: Ready
- //
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
- WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
-
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *v1.IntegrationCondition) bool {
- if c.Status != corev1.ConditionFalse {
- return false
- }
- if len(c.Pods) != 1 {
- return false
- }
+ // Clean-up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
- var r *v1.HealthCheckResponse
+ t.Run("Readiness condition with stopped binding", func(t *testing.T) {
+ name := RandomizedSuffixName("stopped-binding")
+ source := RandomizedSuffixName("my-health-timer-source")
+ sink := RandomizedSuffixName("my-health-log-sink")
+
+ Expect(CreateTimerKamelet(ns, source)()).To(Succeed())
+ Expect(CreateLogKamelet(ns, sink)()).To(Succeed())
+
+ Expect(KamelBindWithID(operatorID, ns,
+ source,
+ sink,
+ "-p", "source.message=Magicstring!",
+ "-p", "sink.loggerName=binding",
+ "--annotation", "trait.camel.apache.org/health.enabled=true",
+ "--annotation", "trait.camel.apache.org/jolokia.enabled=true",
+ "--annotation", "trait.camel.apache.org/jolokia.use-ssl-client-authentication=false",
+ "--annotation", "trait.camel.apache.org/jolokia.protocol=http",
+ "--name", name,
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ pod := IntegrationPod(ns, name)()
- for h := range c.Pods[0].Health {
- if c.Pods[0].Health[h].Name == "camel-routes" {
- r = &c.Pods[0].Health[h]
- }
- }
+ // Stop the Camel route
+ request := map[string]string{
+ "type": "exec",
+ "mbean": "org.apache.camel:context=camel-1,name=\"binding\",type=routes",
+ "operation": "stop()",
+ }
+ body, err := json.Marshal(request)
+ Expect(err).To(BeNil())
- if r == nil {
- return false
- }
+ response, err := TestClient().CoreV1().RESTClient().Post().
+ AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
+ Body(body).
+ DoRaw(TestContext)
- if r.Data == nil {
- return false
- }
+ Expect(err).To(BeNil())
+ Expect(response).To(ContainSubstring(`"status":200`))
- var data map[string]interface{}
- if err := json.Unmarshal(r.Data, &data); err != nil {
- return false
- }
+ // Check the ready condition has turned false
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionFalse))
+ // And it contains details about the runtime state
- return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped"
- }))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
+ WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *v1.IntegrationCondition) bool {
+ if c.Status != corev1.ConditionFalse {
+ return false
+ }
+ if len(c.Pods) != 1 {
+ return false
+ }
- // Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
+ var r *v1.HealthCheckResponse
- t.Run("Readiness condition with stopped binding", func(t *testing.T) {
- name := RandomizedSuffixName("stopped-binding")
- source := RandomizedSuffixName("my-health-timer-source")
- sink := RandomizedSuffixName("my-health-log-sink")
-
- Expect(CreateTimerKamelet(ns, source)()).To(Succeed())
- Expect(CreateLogKamelet(ns, sink)()).To(Succeed())
-
- Expect(KamelBindWithID(operatorID, ns,
- source,
- sink,
- "-p", "source.message=Magicstring!",
- "-p", "sink.loggerName=binding",
- "--annotation", "trait.camel.apache.org/health.enabled=true",
- "--annotation", "trait.camel.apache.org/jolokia.enabled=true",
- "--annotation", "trait.camel.apache.org/jolokia.use-ssl-client-authentication=false",
- "--annotation", "trait.camel.apache.org/jolokia.protocol=http",
- "--name", name,
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- pod := IntegrationPod(ns, name)()
-
- // Stop the Camel route
- request := map[string]string{
- "type": "exec",
- "mbean": "org.apache.camel:context=camel-1,name=\"binding\",type=routes",
- "operation": "stop()",
- }
- body, err := json.Marshal(request)
- Expect(err).To(BeNil())
-
- response, err := TestClient().CoreV1().RESTClient().Post().
- AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
- Body(body).
- DoRaw(TestContext)
-
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
-
- // Check the ready condition has turned false
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
- Should(Equal(corev1.ConditionFalse))
- // And it contains details about the runtime state
-
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
- WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
-
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *v1.IntegrationCondition) bool {
- if c.Status != corev1.ConditionFalse {
- return false
- }
- if len(c.Pods) != 1 {
- return false
- }
+ for h := range c.Pods[0].Health {
+ if c.Pods[0].Health[h].Name == "camel-routes" {
+ r = &c.Pods[0].Health[h]
+ }
+ }
- var r *v1.HealthCheckResponse
+ if r == nil {
+ return false
+ }
- for h := range c.Pods[0].Health {
- if c.Pods[0].Health[h].Name == "camel-routes" {
- r = &c.Pods[0].Health[h]
+ if r.Data == nil {
+ return false
}
- }
- if r == nil {
- return false
- }
+ var data map[string]interface{}
+ if err := json.Unmarshal(r.Data, &data); err != nil {
+ return false
+ }
- if r.Data == nil {
- return false
- }
+ return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
+ }))
- var data map[string]interface{}
- if err := json.Unmarshal(r.Data, &data); err != nil {
- return false
- }
+ Eventually(PipeCondition(ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *camelv1.PipeCondition) bool {
+ if c.Status != corev1.ConditionFalse {
+ return false
+ }
+ if len(c.Pods) != 1 {
+ return false
+ }
- return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
- }))
+ var r *v1.HealthCheckResponse
- Eventually(PipeCondition(ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *camelv1.PipeCondition) bool {
- if c.Status != corev1.ConditionFalse {
- return false
- }
- if len(c.Pods) != 1 {
- return false
- }
+ for h := range c.Pods[0].Health {
+ if c.Pods[0].Health[h].Name == "camel-routes" {
+ r = &c.Pods[0].Health[h]
+ }
+ }
- var r *v1.HealthCheckResponse
+ if r == nil {
+ return false
+ }
- for h := range c.Pods[0].Health {
- if c.Pods[0].Health[h].Name == "camel-routes" {
- r = &c.Pods[0].Health[h]
+ if r.Data == nil {
+ return false
}
- }
- if r == nil {
- return false
- }
+ var data map[string]interface{}
+ if err := json.Unmarshal(r.Data, &data); err != nil {
+ return false
+ }
- if r.Data == nil {
- return false
- }
+ return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
+ }))
- var data map[string]interface{}
- if err := json.Unmarshal(r.Data, &data); err != nil {
- return false
- }
+ // Clean-up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteKamelet(ns, source)).To(Succeed())
+ Expect(DeleteKamelet(ns, sink)).To(Succeed())
+ })
- return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
- }))
+ t.Run("Readiness condition with never ready route", func(t *testing.T) {
+ name := RandomizedSuffixName("never-ready")
- // Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(DeleteKamelet(ns, source)).To(Succeed())
- Expect(DeleteKamelet(ns, sink)).To(Succeed())
- })
+ Expect(KamelRunWithID(operatorID, ns, "files/NeverReady.java",
+ "--name", name,
+ "-t", "health.enabled=true",
+ ).Execute()).To(Succeed())
- t.Run("Readiness condition with never ready route", func(t *testing.T) {
- name := RandomizedSuffixName("never-ready")
-
- Expect(KamelRunWithID(operatorID, ns, "files/NeverReady.java",
- "--name", name,
- "-t", "health.enabled=true",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Consistently(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), 1*time.Minute).
- Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
-
- // Check that the error message is propagated from health checks even if deployment never becomes ready
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
- WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
-
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *v1.IntegrationCondition) bool {
- if c.Status != corev1.ConditionFalse {
- return false
- }
- if len(c.Pods) != 1 {
- return false
- }
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Consistently(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), 1*time.Minute).
+ Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- var r *v1.HealthCheckResponse
+ // Check that the error message is propagated from health checks even if deployment never becomes ready
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
+ WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- for h := range c.Pods[0].Health {
- if c.Pods[0].Health[h].Name == "camel-routes" {
- r = &c.Pods[0].Health[h]
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *v1.IntegrationCondition) bool {
+ if c.Status != corev1.ConditionFalse {
+ return false
+ }
+ if len(c.Pods) != 1 {
+ return false
}
- }
- if r == nil {
- return false
- }
+ var r *v1.HealthCheckResponse
- if r.Data == nil {
- return false
- }
+ for h := range c.Pods[0].Health {
+ if c.Pods[0].Health[h].Name == "camel-routes" {
+ r = &c.Pods[0].Health[h]
+ }
+ }
- var data map[string]interface{}
- if err := json.Unmarshal(r.Data, &data); err != nil {
- return false
- }
+ if r == nil {
+ return false
+ }
- return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "never-ready"
- }))
- })
+ if r.Data == nil {
+ return false
+ }
- t.Run("Startup condition with never ready route", func(t *testing.T) {
- name := RandomizedSuffixName("startup-probe-never-ready-route")
-
- Expect(KamelRunWithID(operatorID, ns, "files/NeverReady.java",
- "--name", name,
- "-t", "health.enabled=true",
- "-t", "health.startup-probe-enabled=true",
- "-t", "health.startup-timeout=60",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Consistently(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), 1*time.Minute).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
-
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
- WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
-
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *v1.IntegrationCondition) bool {
- if c.Status != corev1.ConditionFalse {
- return false
- }
- if len(c.Pods) != 1 {
- return false
- }
+ var data map[string]interface{}
+ if err := json.Unmarshal(r.Data, &data); err != nil {
+ return false
+ }
- var r *v1.HealthCheckResponse
+ return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "never-ready"
+ }))
+ })
+
+ t.Run("Startup condition with never ready route", func(t *testing.T) {
+ name := RandomizedSuffixName("startup-probe-never-ready-route")
+
+ Expect(KamelRunWithID(operatorID, ns, "files/NeverReady.java",
+ "--name", name,
+ "-t", "health.enabled=true",
+ "-t", "health.startup-probe-enabled=true",
+ "-t", "health.startup-timeout=60",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ Consistently(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), 1*time.Minute).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
+ WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- for h := range c.Pods[0].Health {
- if c.Pods[0].Health[h].Name == "camel-routes" && c.Pods[0].Health[h].Status == "DOWN" {
- r = &c.Pods[0].Health[h]
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *v1.IntegrationCondition) bool {
+ if c.Status != corev1.ConditionFalse {
+ return false
+ }
+ if len(c.Pods) != 1 {
+ return false
}
- }
- if r == nil {
- return false
- }
+ var r *v1.HealthCheckResponse
- if r.Data == nil {
- return false
- }
+ for h := range c.Pods[0].Health {
+ if c.Pods[0].Health[h].Name == "camel-routes" && c.Pods[0].Health[h].Status == "DOWN" {
+ r = &c.Pods[0].Health[h]
+ }
+ }
- var data map[string]interface{}
- if err := json.Unmarshal(r.Data, &data); err != nil {
- return false
- }
+ if r == nil {
+ return false
+ }
- return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "never-ready"
- }))
+ if r.Data == nil {
+ return false
+ }
- Satisfy(func(events *corev1.EventList) bool {
- for e := range events.Items {
- if events.Items[e].Type == "Warning" && events.Items[e].Reason == "Unhealthy" && strings.Contains(events.Items[e].Message, "Startup probe failed") {
- return true
+ var data map[string]interface{}
+ if err := json.Unmarshal(r.Data, &data); err != nil {
+ return false
+ }
+
+ return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "never-ready"
+ }))
+
+ Satisfy(func(events *corev1.EventList) bool {
+ for e := range events.Items {
+ if events.Items[e].Type == "Warning" && events.Items[e].Reason == "Unhealthy" && strings.Contains(events.Items[e].Message, "Startup probe failed") {
+ return true
+ }
}
- }
- return false
+ return false
+ })
})
- })
- t.Run("Startup condition with ready route", func(t *testing.T) {
- name := RandomizedSuffixName("startup-probe-ready-route")
+ t.Run("Startup condition with ready route", func(t *testing.T) {
+ name := RandomizedSuffixName("startup-probe-ready-route")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "health.enabled=true",
- "-t", "health.startup-probe-enabled=true",
- "-t", "health.startup-timeout=60",
- ).Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "health.enabled=true",
+ "-t", "health.startup-probe-enabled=true",
+ "-t", "health.startup-timeout=60",
+ ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(And(
- WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
- WithTransform(IntegrationConditionMessage, Equal("1/1 ready replicas"))))
+ Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(And(
+ WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
+ WithTransform(IntegrationConditionMessage, Equal("1/1 ready replicas"))))
+
+ Satisfy(func(is *v1.IntegrationSpec) bool {
+ if *is.Traits.Health.Enabled == true && *is.Traits.Health.StartupProbeEnabled == true && is.Traits.Health.StartupTimeout == 60 {
+ return true
+ }
+ return false
+ })
- Satisfy(func(is *v1.IntegrationSpec) bool {
- if *is.Traits.Health.Enabled == true && *is.Traits.Health.StartupProbeEnabled == true && is.Traits.Health.StartupTimeout == 60 {
- return true
- }
- return false
})
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index 5d507c823..5a0d7567a 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -35,32 +35,33 @@ import (
)
func TestIstioTrait(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("Run Java with Istio", func(t *testing.T) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "istio.enabled=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ t.Run("Run Java with Istio", func(t *testing.T) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "istio.enabled=true").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)()
- Expect(pod.ObjectMeta.Annotations).NotTo(BeNil())
- annotations := pod.ObjectMeta.Annotations
- Expect(annotations["sidecar.istio.io/inject"]).To(Equal("true"))
- Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).To(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"))
+ pod := IntegrationPod(ns, name)()
+ Expect(pod.ObjectMeta.Annotations).NotTo(BeNil())
+ annotations := pod.ObjectMeta.Annotations
+ Expect(annotations["sidecar.istio.io/inject"]).To(Equal("true"))
+ Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).To(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"))
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
- istioTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "istio")
- Expect(istioTrait).ToNot(BeNil())
- Expect(len(istioTrait)).To(Equal(1))
- Expect(istioTrait["enabled"]).To(Equal(true))
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ istioTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "istio")
+ Expect(istioTrait).ToNot(BeNil())
+ Expect(len(istioTrait)).To(Equal(1))
+ Expect(istioTrait["enabled"]).To(Equal(true))
- })
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go
index c06e8d53a..bf9b332d6 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -36,39 +36,39 @@ import (
)
func TestJolokiaTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Run Java with Jolokia", func(t *testing.T) {
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "jolokia.enabled=true",
- "-t", "jolokia.use-ssl-client-authentication=false",
- "-t", "jolokia.protocol=http",
- "-t", "jolokia.extended-client-check=false").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- pod := IntegrationPod(ns, name)
- response, err := TestClient().CoreV1().RESTClient().Get().
- AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod().Name)).DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
- jolokiaTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jolokia")
- Expect(jolokiaTrait).ToNot(BeNil())
- Expect(len(jolokiaTrait)).To(Equal(4))
- Expect(jolokiaTrait["enabled"]).To(Equal(true))
- Expect(jolokiaTrait["useSSLClientAuthentication"]).To(Equal(false))
- Expect(jolokiaTrait["protocol"]).To(Equal("http"))
- Expect(jolokiaTrait["extendedClientCheck"]).To(Equal(false))
-
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Run Java with Jolokia", func(t *testing.T) {
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "jolokia.enabled=true",
+ "-t", "jolokia.use-ssl-client-authentication=false",
+ "-t", "jolokia.protocol=http",
+ "-t", "jolokia.extended-client-check=false").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ pod := IntegrationPod(ns, name)
+ response, err := TestClient().CoreV1().RESTClient().Get().
+ AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod().Name)).DoRaw(TestContext)
+ Expect(err).To(BeNil())
+ Expect(response).To(ContainSubstring(`"status":200`))
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ jolokiaTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jolokia")
+ Expect(jolokiaTrait).ToNot(BeNil())
+ Expect(len(jolokiaTrait)).To(Equal(4))
+ Expect(jolokiaTrait["enabled"]).To(Equal(true))
+ Expect(jolokiaTrait["useSSLClientAuthentication"]).To(Equal(false))
+ Expect(jolokiaTrait["protocol"]).To(Equal("http"))
+ Expect(jolokiaTrait["extendedClientCheck"]).To(Equal(false))
+
+ })
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
-
}
diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go
index 6372516f7..bf2b6638a 100644
--- a/e2e/common/traits/jvm_test.go
+++ b/e2e/common/traits/jvm_test.go
@@ -37,33 +37,34 @@ import (
)
func TestJVMTrait(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- // Store a configmap holding a jar
- var cmData = make(map[string][]byte)
- // We calculate the expected content
- source, err := os.ReadFile("./files/jvm/sample-1.0.jar")
- require.NoError(t, err)
- cmData["sample-1.0.jar"] = source
- err = CreateBinaryConfigmap(ns, "my-deps", cmData)
- require.NoError(t, err)
+ // Store a configmap holding a jar
+ var cmData = make(map[string][]byte)
+ // We calculate the expected content
+ source, err := os.ReadFile("./files/jvm/sample-1.0.jar")
+ require.NoError(t, err)
+ cmData["sample-1.0.jar"] = source
+ err = CreateBinaryConfigmap(ns, "my-deps", cmData)
+ require.NoError(t, err)
- t.Run("JVM trait classpath", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/jvm/Classpath.java",
- "--resource", "configmap:my-deps",
- "-t", "jvm.classpath=/etc/camel/resources/my-deps/sample-1.0.jar",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
+ t.Run("JVM trait classpath", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "./files/jvm/Classpath.java",
+ "--resource", "configmap:my-deps",
+ "-t", "jvm.classpath=/etc/camel/resources/my-deps/sample-1.0.jar",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "classpath")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "classpath")()
- jvmTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jvm")
- Expect(jvmTrait).ToNot(BeNil())
- Expect(len(jvmTrait)).To(Equal(1))
- Expect(jvmTrait["classpath"]).To(Equal("/etc/camel/resources/my-deps/sample-1.0.jar"))
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, "classpath")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, "classpath")()
+ jvmTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jvm")
+ Expect(jvmTrait).ToNot(BeNil())
+ Expect(len(jvmTrait)).To(Equal(1))
+ Expect(jvmTrait["classpath"]).To(Equal("/etc/camel/resources/my-deps/sample-1.0.jar"))
+ })
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go
index 201caee70..a23789408 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -34,34 +34,35 @@ import (
)
func TestKameletTrait(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("discover kamelet capabilities", func(t *testing.T) {
- template := map[string]interface{}{
- "from": map[string]interface{}{
- "uri": "platform-http:///webhook",
- "steps": []map[string]interface{}{
- {
- "to": "kamelet:sink",
+ t.Run("discover kamelet capabilities", func(t *testing.T) {
+ template := map[string]interface{}{
+ "from": map[string]interface{}{
+ "uri": "platform-http:///webhook",
+ "steps": []map[string]interface{}{
+ {
+ "to": "kamelet:sink",
+ },
},
},
- },
- }
- Expect(CreateKamelet(ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
+ }
+ Expect(CreateKamelet(ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
- name := RandomizedSuffixName("webhook")
- Expect(KamelRunWithID(operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Started capabilities-webhook-source-1 (platform-http:///webhook)"))
- // Verify Integration capabilities
- Eventually(IntegrationStatusCapabilities(ns, name), TestTimeoutShort).Should(ContainElements("platform-http"))
- // Verify expected resources from Kamelet (Service in this case)
- service := Service(ns, name)
- Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
- })
+ name := RandomizedSuffixName("webhook")
+ Expect(KamelRunWithID(operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Started capabilities-webhook-source-1 (platform-http:///webhook)"))
+ // Verify Integration capabilities
+ Eventually(IntegrationStatusCapabilities(ns, name), TestTimeoutShort).Should(ContainElements("platform-http"))
+ // Verify expected resources from Kamelet (Service in this case)
+ service := Service(ns, name)
+ Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
+ })
- // Clean-up
- Expect(DeleteKamelet(ns, "capabilities-webhook-source")).To(Succeed())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ // Clean-up
+ Expect(DeleteKamelet(ns, "capabilities-webhook-source")).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go
index 111760b02..06c6cf5cd 100644
--- a/e2e/common/traits/master_test.go
+++ b/e2e/common/traits/master_test.go
@@ -35,47 +35,48 @@ import (
)
func TestMasterTrait(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("master works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Master.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "master"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "master"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
+ t.Run("master works", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/Master.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "master"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "master"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
- t.Run("only one integration with master runs", func(t *testing.T) {
- nameFirst := RandomizedSuffixName("first")
- Expect(KamelRunWithID(operatorID, ns, "files/Master.java",
- "--name", nameFirst,
- "--label", "leader-group=same",
- "-t", "master.label-key=leader-group",
- "-t", "master.label-value=same",
- "-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- // Start a second integration with the same lock (it should not start the route)
- nameSecond := RandomizedSuffixName("second")
- Expect(KamelRunWithID(operatorID, ns, "files/Master.java",
- "--name", nameSecond,
- "--label", "leader-group=same",
- "-t", "master.label-key=leader-group",
- "-t", "master.label-value=same",
- "-t", "master.resource-name=first-lock",
- "-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in"))
- Eventually(IntegrationLogs(ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!"))
+ t.Run("only one integration with master runs", func(t *testing.T) {
+ nameFirst := RandomizedSuffixName("first")
+ Expect(KamelRunWithID(operatorID, ns, "files/Master.java",
+ "--name", nameFirst,
+ "--label", "leader-group=same",
+ "-t", "master.label-key=leader-group",
+ "-t", "master.label-value=same",
+ "-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // Start a second integration with the same lock (it should not start the route)
+ nameSecond := RandomizedSuffixName("second")
+ Expect(KamelRunWithID(operatorID, ns, "files/Master.java",
+ "--name", nameSecond,
+ "--label", "leader-group=same",
+ "-t", "master.label-key=leader-group",
+ "-t", "master.label-value=same",
+ "-t", "master.resource-name=first-lock",
+ "-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in"))
+ Eventually(IntegrationLogs(ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!"))
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, nameFirst)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, nameFirst)()
- builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "addons", "master")
- Expect(builderTrait).ToNot(BeNil())
- Expect(len(builderTrait)).To(Equal(2))
- Expect(builderTrait["labelKey"]).To(Equal("leader-group"))
- Expect(builderTrait["labelValue"]).To(Equal("same"))
- })
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, nameFirst)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, nameFirst)()
+ builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "addons", "master")
+ Expect(builderTrait).ToNot(BeNil())
+ Expect(len(builderTrait)).To(Equal(2))
+ Expect(builderTrait["labelKey"]).To(Equal("leader-group"))
+ Expect(builderTrait["labelValue"]).To(Equal("same"))
+ })
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go
index 072f3b9a9..10f321e88 100644
--- a/e2e/common/traits/openapi_test.go
+++ b/e2e/common/traits/openapi_test.go
@@ -35,31 +35,32 @@ import (
)
func TestOpenAPI(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- openapiContent, err := ioutil.ReadFile("./files/openapi/petstore-api.yaml")
- require.NoError(t, err)
- var cmDataProps = make(map[string]string)
- cmDataProps["petstore-api.yaml"] = string(openapiContent)
- CreatePlainTextConfigmap(ns, "my-openapi", cmDataProps)
+ openapiContent, err := ioutil.ReadFile("./files/openapi/petstore-api.yaml")
+ require.NoError(t, err)
+ var cmDataProps = make(map[string]string)
+ cmDataProps["petstore-api.yaml"] = string(openapiContent)
+ CreatePlainTextConfigmap(ns, "my-openapi", cmDataProps)
- Expect(KamelRunWithID(operatorID, ns,
- "--name", "petstore",
- "--open-api", "configmap:my-openapi",
- "files/openapi/petstore.groovy",
- ).Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns,
+ "--name", "petstore",
+ "--open-api", "configmap:my-openapi",
+ "files/openapi/petstore.groovy",
+ ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "petstore"), TestTimeoutLong).
- Should(Equal(corev1.PodRunning))
- Eventually(DeploymentWithIntegrationLabel(ns, "petstore"), TestTimeoutLong).
- Should(Not(BeNil()))
+ Eventually(IntegrationPodPhase(ns, "petstore"), TestTimeoutLong).
+ Should(Equal(corev1.PodRunning))
+ Eventually(DeploymentWithIntegrationLabel(ns, "petstore"), TestTimeoutLong).
+ Should(Not(BeNil()))
- Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
- Should(ContainSubstring("Started listPets (rest://get:/v1:/pets)"))
- Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
- Should(ContainSubstring("Started createPets (rest://post:/v1:/pets)"))
- Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
- Should(ContainSubstring("Started showPetById (rest://get:/v1:/pets/%7BpetId%7D)"))
+ Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
+ Should(ContainSubstring("Started listPets (rest://get:/v1:/pets)"))
+ Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
+ Should(ContainSubstring("Started createPets (rest://post:/v1:/pets)"))
+ Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
+ Should(ContainSubstring("Started showPetById (rest://get:/v1:/pets/%7BpetId%7D)"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index 7c43e1ff7..6c4c0083e 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -43,110 +43,111 @@ import (
)
func TestPodDisruptionBudgetTrait(t *testing.T) {
- RegisterTestingT(t)
-
- name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "pdb.enabled=true",
- "-t", "pdb.min-available=2",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
- pdbTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pdb")
- Expect(pdbTrait).ToNot(BeNil())
- Expect(len(pdbTrait)).To(Equal(2))
- Expect(pdbTrait["enabled"]).To(Equal(true))
- Expect(pdbTrait["minAvailable"]).To(Equal("2"))
-
- // Check PodDisruptionBudget
- Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).ShouldNot(BeNil())
- pdb := podDisruptionBudget(ns, name)()
- // Assert PDB Spec
- Expect(pdb.Spec.MinAvailable).To(PointTo(Equal(intstr.FromInt(2))))
- // Assert PDB Status
- Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).
- Should(MatchFieldsP(IgnoreExtras, Fields{
- "Status": MatchFields(IgnoreExtras, Fields{
- "ObservedGeneration": BeNumerically("==", 1),
- "DisruptionsAllowed": BeNumerically("==", 0),
- "CurrentHealthy": BeNumerically("==", 1),
- "DesiredHealthy": BeNumerically("==", 2),
- "ExpectedPods": BeNumerically("==", 1),
- }),
+ WithNewTestNamespace(t, func(ns string) {
+
+ name := RandomizedSuffixName("java")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "pdb.enabled=true",
+ "-t", "pdb.min-available=2",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ pdbTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pdb")
+ Expect(pdbTrait).ToNot(BeNil())
+ Expect(len(pdbTrait)).To(Equal(2))
+ Expect(pdbTrait["enabled"]).To(Equal(true))
+ Expect(pdbTrait["minAvailable"]).To(Equal("2"))
+
+ // Check PodDisruptionBudget
+ Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).ShouldNot(BeNil())
+ pdb := podDisruptionBudget(ns, name)()
+ // Assert PDB Spec
+ Expect(pdb.Spec.MinAvailable).To(PointTo(Equal(intstr.FromInt(2))))
+ // Assert PDB Status
+ Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).
+ Should(MatchFieldsP(IgnoreExtras, Fields{
+ "Status": MatchFields(IgnoreExtras, Fields{
+ "ObservedGeneration": BeNumerically("==", 1),
+ "DisruptionsAllowed": BeNumerically("==", 0),
+ "CurrentHealthy": BeNumerically("==", 1),
+ "DesiredHealthy": BeNumerically("==", 2),
+ "ExpectedPods": BeNumerically("==", 1),
+ }),
+ }))
+
+ // Scale Integration
+ Expect(ScaleIntegration(ns, name, 2)).To(Succeed())
+ Eventually(IntegrationPods(ns, name), TestTimeoutMedium).Should(HaveLen(2))
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(PointTo(BeNumerically("==", 2)))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+
+ // Check PodDisruptionBudget
+ pdb = podDisruptionBudget(ns, name)()
+ Expect(pdb).NotTo(BeNil())
+ // Assert PDB Status according to the scale change
+ Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).
+ Should(MatchFieldsP(IgnoreExtras, Fields{
+ "Status": MatchFields(IgnoreExtras, Fields{
+ "ObservedGeneration": BeNumerically("==", 1),
+ "DisruptionsAllowed": BeNumerically("==", 0),
+ "CurrentHealthy": BeNumerically("==", 2),
+ "DesiredHealthy": BeNumerically("==", 2),
+ "ExpectedPods": BeNumerically("==", 2),
+ }),
+ }))
+
+ // Eviction attempt
+ pods := IntegrationPods(ns, name)()
+ Expect(pods).To(HaveLen(2))
+ err := TestClient().CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: pods[0].Name,
+ },
+ })
+ Expect(err).To(MatchError(&k8serrors.StatusError{
+ ErrStatus: metav1.Status{
+ Status: "Failure",
+ Message: "Cannot evict pod as it would violate the pod's disruption budget.",
+ Reason: "TooManyRequests",
+ Code: http.StatusTooManyRequests,
+ Details: &metav1.StatusDetails{
+ Causes: []metav1.StatusCause{
+ {
+ Type: "DisruptionBudget",
+ Message: "The disruption budget " + name + " needs 2 healthy pods and has 2 currently",
+ },
+ },
+ },
+ },
}))
- // Scale Integration
- Expect(ScaleIntegration(ns, name, 2)).To(Succeed())
- Eventually(IntegrationPods(ns, name), TestTimeoutMedium).Should(HaveLen(2))
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(PointTo(BeNumerically("==", 2)))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
-
- // Check PodDisruptionBudget
- pdb = podDisruptionBudget(ns, name)()
- Expect(pdb).NotTo(BeNil())
- // Assert PDB Status according to the scale change
- Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).
- Should(MatchFieldsP(IgnoreExtras, Fields{
- "Status": MatchFields(IgnoreExtras, Fields{
- "ObservedGeneration": BeNumerically("==", 1),
- "DisruptionsAllowed": BeNumerically("==", 0),
- "CurrentHealthy": BeNumerically("==", 2),
- "DesiredHealthy": BeNumerically("==", 2),
- "ExpectedPods": BeNumerically("==", 2),
- }),
- }))
+ // Scale Integration to Scale > PodDisruptionBudgetSpec.MinAvailable
+ // for the eviction request to succeed once replicas are ready
+ Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
+ Eventually(IntegrationPods(ns, name), TestTimeoutMedium).Should(HaveLen(3))
+ Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Should(PointTo(BeNumerically("==", 3)))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+
+ pods = IntegrationPods(ns, name)()
+ Expect(pods).To(HaveLen(3))
+ Expect(TestClient().CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: pods[0].Name,
+ },
+ })).To(Succeed())
- // Eviction attempt
- pods := IntegrationPods(ns, name)()
- Expect(pods).To(HaveLen(2))
- err := TestClient().CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
- ObjectMeta: metav1.ObjectMeta{
- Name: pods[0].Name,
- },
+ // Clean up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
})
- Expect(err).To(MatchError(&k8serrors.StatusError{
- ErrStatus: metav1.Status{
- Status: "Failure",
- Message: "Cannot evict pod as it would violate the pod's disruption budget.",
- Reason: "TooManyRequests",
- Code: http.StatusTooManyRequests,
- Details: &metav1.StatusDetails{
- Causes: []metav1.StatusCause{
- {
- Type: "DisruptionBudget",
- Message: "The disruption budget " + name + " needs 2 healthy pods and has 2 currently",
- },
- },
- },
- },
- }))
-
- // Scale Integration to Scale > PodDisruptionBudgetSpec.MinAvailable
- // for the eviction request to succeed once replicas are ready
- Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
- Eventually(IntegrationPods(ns, name), TestTimeoutMedium).Should(HaveLen(3))
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
- Should(PointTo(BeNumerically("==", 3)))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
-
- pods = IntegrationPods(ns, name)()
- Expect(pods).To(HaveLen(3))
- Expect(TestClient().CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
- ObjectMeta: metav1.ObjectMeta{
- Name: pods[0].Name,
- },
- })).To(Succeed())
-
- // Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func podDisruptionBudget(ns string, name string) func() *policyv1.PodDisruptionBudget {
diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go
index 19c229064..bfc679655 100644
--- a/e2e/common/traits/pod_test.go
+++ b/e2e/common/traits/pod_test.go
@@ -34,72 +34,73 @@ import (
)
func TestPodTrait(t *testing.T) {
- RegisterTestingT(t)
-
- tc := []struct {
- name string
- templateName string
- assertions func(t *testing.T, ns string, name string)
- }{
- {
- name: "pod trait with env vars and volume mounts",
- templateName: "files/template.yaml",
- //nolint: thelper
- assertions: func(t *testing.T, ns string, name string) {
- // check that integrations is working and reading data created by sidecar container
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Content from the sidecar container"))
- // check that env var is injected
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("hello from the template"))
- pod := IntegrationPod(ns, name)()
-
- // check if ENV variable is applied
- envValue := getEnvVar("TEST_VARIABLE", pod.Spec)
- Expect(envValue).To(Equal("hello from the template"))
+ WithNewTestNamespace(t, func(ns string) {
+
+ tc := []struct {
+ name string
+ templateName string
+ assertions func(t *testing.T, ns string, name string)
+ }{
+ {
+ name: "pod trait with env vars and volume mounts",
+ templateName: "files/template.yaml",
+ //nolint: thelper
+ assertions: func(t *testing.T, ns string, name string) {
+ // check that integrations is working and reading data created by sidecar container
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Content from the sidecar container"))
+ // check that env var is injected
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("hello from the template"))
+ pod := IntegrationPod(ns, name)()
+
+ // check if ENV variable is applied
+ envValue := getEnvVar("TEST_VARIABLE", pod.Spec)
+ Expect(envValue).To(Equal("hello from the template"))
+ },
},
- },
- {
- name: "pod trait with supplemental groups",
- templateName: "files/template-with-supplemental-groups.yaml",
- //nolint: thelper
- assertions: func(t *testing.T, ns string, name string) {
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
- if pod.Spec.SecurityContext == nil {
- return false
- }
- for _, sg := range pod.Spec.SecurityContext.SupplementalGroups {
- if sg == 666 {
- return true
+ {
+ name: "pod trait with supplemental groups",
+ templateName: "files/template-with-supplemental-groups.yaml",
+ //nolint: thelper
+ assertions: func(t *testing.T, ns string, name string) {
+ Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ if pod.Spec.SecurityContext == nil {
+ return false
+ }
+ for _, sg := range pod.Spec.SecurityContext.SupplementalGroups {
+ if sg == 666 {
+ return true
+ }
}
- }
- return false
- }), TestTimeoutShort).Should(BeTrue())
+ return false
+ }), TestTimeoutShort).Should(BeTrue())
+ },
},
- },
- }
+ }
- name := RandomizedSuffixName("pod-template-test")
+ name := RandomizedSuffixName("pod-template-test")
- for i := range tc {
- test := tc[i]
+ for i := range tc {
+ test := tc[i]
- t.Run(test.name, func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PodTest.groovy",
- "--name", name,
- "--pod-template", test.templateName,
- ).Execute()).To(Succeed())
+ t.Run(test.name, func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PodTest.groovy",
+ "--name", name,
+ "--pod-template", test.templateName,
+ ).Execute()).To(Succeed())
- // check integration is deployed
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ // check integration is deployed
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- test.assertions(t, ns, name)
+ test.assertions(t, ns, name)
- // Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
- }
+ // Clean up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+ }
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func getEnvVar(name string, spec corev1.PodSpec) string {
diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go
index 5b28db448..5a1bb4f1e 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -44,45 +44,46 @@ import (
)
func TestPrometheusTrait(t *testing.T) {
- RegisterTestingT(t)
-
- ocp, err := openshift.IsOpenShift(TestClient())
- require.NoError(t, err)
- // Do not create PodMonitor for the time being as CI test runs on OCP 3.11
- createPodMonitor := false
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "-t", "prometheus.enabled=true",
- "-t", fmt.Sprintf("prometheus.pod-monitor=%v", createPodMonitor)).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "java")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "java")()
- prometheusTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "prometheus")
- Expect(prometheusTrait).ToNot(BeNil())
- Expect(len(prometheusTrait)).To(Equal(2))
- Expect(prometheusTrait["enabled"]).To(Equal(true))
- Expect(prometheusTrait["podMonitor"]).ToNot(BeNil())
- t.Run("Metrics endpoint works", func(t *testing.T) {
- pod := IntegrationPod(ns, "java")
- response, err := TestClient().CoreV1().RESTClient().Get().
- AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/q/metrics", ns, pod().Name)).DoRaw(TestContext)
- if err != nil {
- assert.Fail(t, err.Error())
- }
- assert.Contains(t, string(response), "camel_exchanges_total")
- })
-
- if ocp && createPodMonitor {
- t.Run("PodMonitor is created", func(t *testing.T) {
- sm := podMonitor(ns, "java")
- Eventually(sm, TestTimeoutShort).ShouldNot(BeNil())
+ WithNewTestNamespace(t, func(ns string) {
+
+ ocp, err := openshift.IsOpenShift(TestClient())
+ require.NoError(t, err)
+ // Do not create PodMonitor for the time being as CI test runs on OCP 3.11
+ createPodMonitor := false
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "-t", "prometheus.enabled=true",
+ "-t", fmt.Sprintf("prometheus.pod-monitor=%v", createPodMonitor)).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, "java")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, "java")()
+ prometheusTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "prometheus")
+ Expect(prometheusTrait).ToNot(BeNil())
+ Expect(len(prometheusTrait)).To(Equal(2))
+ Expect(prometheusTrait["enabled"]).To(Equal(true))
+ Expect(prometheusTrait["podMonitor"]).ToNot(BeNil())
+ t.Run("Metrics endpoint works", func(t *testing.T) {
+ pod := IntegrationPod(ns, "java")
+ response, err := TestClient().CoreV1().RESTClient().Get().
+ AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/q/metrics", ns, pod().Name)).DoRaw(TestContext)
+ if err != nil {
+ assert.Fail(t, err.Error())
+ }
+ assert.Contains(t, string(response), "camel_exchanges_total")
})
- }
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ if ocp && createPodMonitor {
+ t.Run("PodMonitor is created", func(t *testing.T) {
+ sm := podMonitor(ns, "java")
+ Eventually(sm, TestTimeoutShort).ShouldNot(BeNil())
+ })
+ }
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
func podMonitor(ns string, name string) func() *monitoringv1.PodMonitor {
diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go
index ade72f144..61563bc39 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -36,64 +36,65 @@ import (
)
func TestPullSecretTrait(t *testing.T) {
- RegisterTestingT(t)
-
- ocp, err := openshift.IsOpenShift(TestClient())
- Expect(err).To(BeNil())
-
- t.Run("Image pull secret is set on pod", func(t *testing.T) {
- name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
- "-t", "pull-secret.enabled=true",
- "-t", "pull-secret.secret-name=dummy-secret").Execute()).To(Succeed())
- // pod may not run because the pull secret is dummy
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Or(Equal(corev1.PodRunning), Equal(corev1.PodPending)))
-
- pod := IntegrationPod(ns, name)()
- Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
- Expect(pod.Spec.ImagePullSecrets[0].Name).To(Equal("dummy-secret"))
- })
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("Explicitly disable image pull secret", func(t *testing.T) {
- name := RandomizedSuffixName("java2")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
- "-t", "pull-secret.enabled=false").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
- pullSecretTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pull-secret")
- Expect(pullSecretTrait).ToNot(BeNil())
- Expect(len(pullSecretTrait)).To(Equal(1))
- Expect(pullSecretTrait["enabled"]).To(Equal(false))
-
- pod := IntegrationPod(ns, name)()
- if ocp {
- // OpenShift `default` service account has imagePullSecrets so it's always set
+ ocp, err := openshift.IsOpenShift(TestClient())
+ Expect(err).To(BeNil())
+
+ t.Run("Image pull secret is set on pod", func(t *testing.T) {
+ name := RandomizedSuffixName("java1")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ "-t", "pull-secret.enabled=true",
+ "-t", "pull-secret.secret-name=dummy-secret").Execute()).To(Succeed())
+ // pod may not run because the pull secret is dummy
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Or(Equal(corev1.PodRunning), Equal(corev1.PodPending)))
+
+ pod := IntegrationPod(ns, name)()
Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
- } else {
- Expect(pod.Spec.ImagePullSecrets).To(BeNil())
- }
- })
+ Expect(pod.Spec.ImagePullSecrets[0].Name).To(Equal("dummy-secret"))
+ })
- if ocp {
- // OpenShift always has an internal registry so image pull secret is set by default
- t.Run("Image pull secret is automatically set by default", func(t *testing.T) {
- name := RandomizedSuffixName("java3")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ t.Run("Explicitly disable image pull secret", func(t *testing.T) {
+ name := RandomizedSuffixName("java2")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ "-t", "pull-secret.enabled=false").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ pullSecretTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pull-secret")
+ Expect(pullSecretTrait).ToNot(BeNil())
+ Expect(len(pullSecretTrait)).To(Equal(1))
+ Expect(pullSecretTrait["enabled"]).To(Equal(false))
+
pod := IntegrationPod(ns, name)()
- Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
- Expect(pod.Spec.ImagePullSecrets[0].Name).To(HavePrefix("default-dockercfg-"))
+ if ocp {
+ // OpenShift `default` service account has imagePullSecrets so it's always set
+ Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
+ } else {
+ Expect(pod.Spec.ImagePullSecrets).To(BeNil())
+ }
})
- }
- // Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ if ocp {
+ // OpenShift always has an internal registry so image pull secret is set by default
+ t.Run("Image pull secret is automatically set by default", func(t *testing.T) {
+ name := RandomizedSuffixName("java3")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ pod := IntegrationPod(ns, name)()
+ Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
+ Expect(pod.Spec.ImagePullSecrets[0].Name).To(HavePrefix("default-dockercfg-"))
+ })
+ }
+
+ // Clean-up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index 451f2db10..33f5a1dc3 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -71,158 +71,159 @@ var certPem []byte
var skipClientTLSVerification = true
func TestRunRoutes(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- ocp, err := openshift.IsOpenShift(TestClient())
- if !ocp {
- t.Skip("This test requires route object which is available on OpenShift only.")
- return
- }
- require.NoError(t, err)
-
- operatorID := "camel-k-trait-route"
- Expect(KamelInstallWithID(operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
-
- // create a test secret of type tls with certificates
- // this secret is used to setupt the route TLS object across diferent tests
- secret, err := createSecret(ns)
- require.NoError(t, err)
-
- // they refer to the certificates create in the secret and are reused the different tests
- refKey := secretName + "/" + corev1.TLSPrivateKeyKey
- refCert := secretName + "/" + corev1.TLSCertKey
-
- // =============================
- // Insecure Route / No TLS
- // =============================
- t.Run("Route unsecure http works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
- // must wait a little time after route is created, before doing an http request,
- // otherwise the route is unavailable and the http request will fail
- time.Sleep(waitBeforeHttpRequest)
- url := fmt.Sprintf("http://%s/hello?name=Simple", route().Spec.Host)
- Eventually(httpRequest(url, false), TestTimeoutShort).Should(Equal("Hello Simple"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
- })
-
- // =============================
- // TLS Route Edge
- // =============================
- t.Run("Route Edge https works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java", "-t", "route.tls-termination=edge").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
- // must wait a little time after route is created, before an http request,
- // otherwise the route is unavailable and the http request will fail
- time.Sleep(waitBeforeHttpRequest)
- url := fmt.Sprintf("https://%s/hello?name=TLS_Edge", route().Spec.Host)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello TLS_Edge"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
- })
-
- // =============================
- // TLS Route Edge with custom certificate
- // =============================
- t.Run("Route Edge (custom certificate) https works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
- "-t", "route.tls-termination=edge",
- "-t", "route.tls-certificate-secret="+refCert,
- "-t", "route.tls-key-secret="+refKey,
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
- // must wait a little time after route is created, before an http request,
- // otherwise the route is unavailable and the http request will fail
- time.Sleep(waitBeforeHttpRequest)
- code := "TLS_EdgeCustomCertificate"
- url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
- })
-
- // =============================
- // TLS Route Passthrough
- // =============================
- t.Run("Route passthrough https works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
- // the --resource mounts the certificates inside secret as files in the integration pod
- "--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
- // quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
- "-p", "quarkus.http.ssl.certificate.file=/etc/ssl/"+secretName+"/tls.crt",
- "-p", "quarkus.http.ssl.certificate.key-file=/etc/ssl/"+secretName+"/tls.key",
- "-t", "route.tls-termination=passthrough",
- "-t", "container.port=8443",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
- // must wait a little time after route is created, before an http request,
- // otherwise the route is unavailable and the http request will fail
- time.Sleep(waitBeforeHttpRequest)
- code := "TLS_Passthrough"
- url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
- })
-
- // =============================
- // TLS Route Reencrypt
- // =============================
- t.Run("Route Reencrypt https works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
- // the --resource mounts the certificates inside secret as files in the integration pod
- "--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
- // quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
- "-p", "quarkus.http.ssl.certificate.file=/etc/ssl/"+secretName+"/tls.crt",
- "-p", "quarkus.http.ssl.certificate.key-file=/etc/ssl/"+secretName+"/tls.key",
- "-t", "route.tls-termination=reencrypt",
- // the destination CA certificate which the route service uses to validate the HTTP endpoint TLS certificate
- "-t", "route.tls-destination-ca-certificate-secret="+refCert,
- "-t", "route.tls-certificate-secret="+refCert,
- "-t", "route.tls-key-secret="+refKey,
- "-t", "container.port=8443",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- route := Route(ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
- // must wait a little time after route is created, before an http request,
- // otherwise the route is unavailable and the http request will fail
- time.Sleep(waitBeforeHttpRequest)
- code := "TLS_Reencrypt"
- url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
- })
-
- t.Run("Route annotations added", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
- "-t", "route.annotations.'haproxy.router.openshift.io/balance'=roundrobin").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := RouteFull(ns, integrationName)()
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
- // must wait a little time after route is created, before an http request,
- // otherwise the route is unavailable and the http request will fail
- time.Sleep(waitBeforeHttpRequest)
- var annotations = route.ObjectMeta.Annotations
- Expect(annotations["haproxy.router.openshift.io/balance"]).To(Equal("roundrobin"))
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, integrationName)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, integrationName)()
- routeTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "route")
- Expect(routeTrait).ToNot(BeNil())
- Expect(len(routeTrait)).To(Equal(1))
- Expect(routeTrait["enabled"]).To(Equal(true))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ ocp, err := openshift.IsOpenShift(TestClient())
+ if !ocp {
+ t.Skip("This test requires route object which is available on OpenShift only.")
+ return
+ }
+ require.NoError(t, err)
+
+ operatorID := "camel-k-trait-route"
+ Expect(KamelInstallWithID(operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
+
+ // create a test secret of type tls with certificates
+ // this secret is used to setupt the route TLS object across diferent tests
+ secret, err := createSecret(ns)
+ require.NoError(t, err)
+
+ // they refer to the certificates create in the secret and are reused the different tests
+ refKey := secretName + "/" + corev1.TLSPrivateKeyKey
+ refCert := secretName + "/" + corev1.TLSCertKey
+
+ // =============================
+ // Insecure Route / No TLS
+ // =============================
+ t.Run("Route unsecure http works", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := Route(ns, integrationName)
+ Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ // must wait a little time after route is created, before doing an http request,
+ // otherwise the route is unavailable and the http request will fail
+ time.Sleep(waitBeforeHttpRequest)
+ url := fmt.Sprintf("http://%s/hello?name=Simple", route().Spec.Host)
+ Eventually(httpRequest(url, false), TestTimeoutShort).Should(Equal("Hello Simple"))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ })
+
+ // =============================
+ // TLS Route Edge
+ // =============================
+ t.Run("Route Edge https works", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java", "-t", "route.tls-termination=edge").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := Route(ns, integrationName)
+ Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ // must wait a little time after route is created, before an http request,
+ // otherwise the route is unavailable and the http request will fail
+ time.Sleep(waitBeforeHttpRequest)
+ url := fmt.Sprintf("https://%s/hello?name=TLS_Edge", route().Spec.Host)
+ Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello TLS_Edge"))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ })
+
+ // =============================
+ // TLS Route Edge with custom certificate
+ // =============================
+ t.Run("Route Edge (custom certificate) https works", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ "-t", "route.tls-termination=edge",
+ "-t", "route.tls-certificate-secret="+refCert,
+ "-t", "route.tls-key-secret="+refKey,
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := Route(ns, integrationName)
+ Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ // must wait a little time after route is created, before an http request,
+ // otherwise the route is unavailable and the http request will fail
+ time.Sleep(waitBeforeHttpRequest)
+ code := "TLS_EdgeCustomCertificate"
+ url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
+ Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ })
+
+ // =============================
+ // TLS Route Passthrough
+ // =============================
+ t.Run("Route passthrough https works", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ // the --resource mounts the certificates inside secret as files in the integration pod
+ "--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
+ // quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
+ "-p", "quarkus.http.ssl.certificate.file=/etc/ssl/"+secretName+"/tls.crt",
+ "-p", "quarkus.http.ssl.certificate.key-file=/etc/ssl/"+secretName+"/tls.key",
+ "-t", "route.tls-termination=passthrough",
+ "-t", "container.port=8443",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := Route(ns, integrationName)
+ Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ // must wait a little time after route is created, before an http request,
+ // otherwise the route is unavailable and the http request will fail
+ time.Sleep(waitBeforeHttpRequest)
+ code := "TLS_Passthrough"
+ url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
+ Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ })
+
+ // =============================
+ // TLS Route Reencrypt
+ // =============================
+ t.Run("Route Reencrypt https works", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ // the --resource mounts the certificates inside secret as files in the integration pod
+ "--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
+ // quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
+ "-p", "quarkus.http.ssl.certificate.file=/etc/ssl/"+secretName+"/tls.crt",
+ "-p", "quarkus.http.ssl.certificate.key-file=/etc/ssl/"+secretName+"/tls.key",
+ "-t", "route.tls-termination=reencrypt",
+ // the destination CA certificate which the route service uses to validate the HTTP endpoint TLS certificate
+ "-t", "route.tls-destination-ca-certificate-secret="+refCert,
+ "-t", "route.tls-certificate-secret="+refCert,
+ "-t", "route.tls-key-secret="+refKey,
+ "-t", "container.port=8443",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ route := Route(ns, integrationName)
+ Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ // must wait a little time after route is created, before an http request,
+ // otherwise the route is unavailable and the http request will fail
+ time.Sleep(waitBeforeHttpRequest)
+ code := "TLS_Reencrypt"
+ url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
+ Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ })
+
+ t.Run("Route annotations added", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ "-t", "route.annotations.'haproxy.router.openshift.io/balance'=roundrobin").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := RouteFull(ns, integrationName)()
+ Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ // must wait a little time after route is created, before an http request,
+ // otherwise the route is unavailable and the http request will fail
+ time.Sleep(waitBeforeHttpRequest)
+ var annotations = route.ObjectMeta.Annotations
+ Expect(annotations["haproxy.router.openshift.io/balance"]).To(Equal("roundrobin"))
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, integrationName)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, integrationName)()
+ routeTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "route")
+ Expect(routeTrait).ToNot(BeNil())
+ Expect(len(routeTrait)).To(Equal(1))
+ Expect(routeTrait["enabled"]).To(Equal(true))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ })
+ Expect(TestClient().Delete(TestContext, &secret)).To(Succeed())
})
- Expect(TestClient().Delete(TestContext, &secret)).To(Succeed())
}
func httpRequest(url string, tlsEnabled bool) func() (string, error) {
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index ae43c5f8c..306529892 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -36,73 +36,74 @@ import (
)
func TestServiceBindingTrait(t *testing.T) {
- RegisterTestingT(t)
+ WithNewTestNamespace(t, func(ns string) {
- t.Run("Integration Service Binding", func(t *testing.T) {
- // Create our mock service config
- host := "hostname"
- port := "12324"
- service := &corev1.ConfigMap{
- TypeMeta: metav1.TypeMeta{
- Kind: "ConfigMap",
- APIVersion: "v1",
- },
- ObjectMeta: metav1.ObjectMeta{
- Name: "mock-service-config-it",
- Namespace: ns,
- Annotations: map[string]string{
- "service.binding/host": "path={.data.service-host}",
- "service.binding/port": "path={.data.service-port}",
+ t.Run("Integration Service Binding", func(t *testing.T) {
+ // Create our mock service config
+ host := "hostname"
+ port := "12324"
+ service := &corev1.ConfigMap{
+ TypeMeta: metav1.TypeMeta{
+ Kind: "ConfigMap",
+ APIVersion: "v1",
},
- },
- Data: map[string]string{
- "service-host": host,
- "service-port": port,
- },
- }
- serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
- Expect(TestClient().Create(TestContext, service)).To(Succeed())
- // Create integration and bind it to our service
- name := RandomizedSuffixName("service-binding")
- Expect(KamelRunWithID(operatorID, ns, "files/ServiceBinding.java",
- "--name", name,
- "--connect", serviceRef,
- ).Execute()).To(Succeed())
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "mock-service-config-it",
+ Namespace: ns,
+ Annotations: map[string]string{
+ "service.binding/host": "path={.data.service-host}",
+ "service.binding/port": "path={.data.service-port}",
+ },
+ },
+ Data: map[string]string{
+ "service-host": host,
+ "service-port": port,
+ },
+ }
+ serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
+ Expect(TestClient().Create(TestContext, service)).To(Succeed())
+ // Create integration and bind it to our service
+ name := RandomizedSuffixName("service-binding")
+ Expect(KamelRunWithID(operatorID, ns, "files/ServiceBinding.java",
+ "--name", name,
+ "--connect", serviceRef,
+ ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
- })
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
+ })
- t.Run("Binding Service Binding", func(t *testing.T) {
- // Create our mock service config
- message := "hello"
- service := &corev1.ConfigMap{
- TypeMeta: metav1.TypeMeta{
- Kind: "ConfigMap",
- APIVersion: "v1",
- },
- ObjectMeta: metav1.ObjectMeta{
- Name: "mock-service-config-kb",
- Namespace: ns,
- Annotations: map[string]string{
- "service.binding/message": "path={.data.message}",
+ t.Run("Binding Service Binding", func(t *testing.T) {
+ // Create our mock service config
+ message := "hello"
+ service := &corev1.ConfigMap{
+ TypeMeta: metav1.TypeMeta{
+ Kind: "ConfigMap",
+ APIVersion: "v1",
},
- },
- Data: map[string]string{
- "message": message,
- },
- }
- serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
- Expect(TestClient().Create(TestContext, service)).To(Succeed())
- Expect(CreateTimerKamelet(ns, "my-timer-source")()).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns, "my-timer-source", "log:info",
- "-p", "source.message=Hello+world",
- "--connect", serviceRef).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "my-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "my-timer-source-to-log")).Should(ContainSubstring("Body: Hello+world"))
- })
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "mock-service-config-kb",
+ Namespace: ns,
+ Annotations: map[string]string{
+ "service.binding/message": "path={.data.message}",
+ },
+ },
+ Data: map[string]string{
+ "message": message,
+ },
+ }
+ serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
+ Expect(TestClient().Create(TestContext, service)).To(Succeed())
+ Expect(CreateTimerKamelet(ns, "my-timer-source")()).To(Succeed())
+ Expect(KamelBindWithID(operatorID, ns, "my-timer-source", "log:info",
+ "-p", "source.message=Hello+world",
+ "--connect", serviceRef).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "my-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(ns, "my-timer-source-to-log")).Should(ContainSubstring("Body: Hello+world"))
+ })
- // Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ // Clean up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go
index 8b5e5f168..27df68325 100644
--- a/e2e/common/traits/service_test.go
+++ b/e2e/common/traits/service_test.go
@@ -34,88 +34,89 @@ import (
)
func TestServiceTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("NodePort service", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
- "-t", "service.enabled=true",
- "-t", "service.node-port=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- //
- // Service names can vary with the ExternalName Service
- // sometimes being created first and being given the root name
- //
- Eventually(ServicesByType(ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("Default service (ClusterIP)", func(t *testing.T) {
- // Service trait is enabled by default
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- //
- // Service names can vary with the ExternalName Service
- // sometimes being created first and being given the root name
- //
- Eventually(ServicesByType(ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("NodePort service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
- "-t", "service.enabled=true",
- "-t", "service.type=NodePort").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- //
- // Service names can vary with the ExternalName Service
- // sometimes being created first and being given the root name
- //
- Eventually(ServicesByType(ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("ClusterIP service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
- "-t", "service.enabled=true",
- "-t", "service.type=ClusterIP").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- //
- // Service names can vary with the ExternalName Service
- // sometimes being created first and being given the root name
- //
- Eventually(ServicesByType(ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
-
- // check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "platform-http-server")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "platform-http-server")()
- serviceTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "service")
- Expect(serviceTrait).ToNot(BeNil())
- Expect(len(serviceTrait)).To(Equal(2))
- Expect(serviceTrait["enabled"]).To(Equal(true))
- Expect(serviceTrait["type"]).To(Equal("ClusterIP"))
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-
- t.Run("LoadBalancer service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
- "-t", "service.enabled=true",
- "-t", "service.type=LoadBalancer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- //
- // Service names can vary with the ExternalName Service
- // sometimes being created first and being given the root name
- //
- Eventually(ServicesByType(ns, corev1.ServiceTypeLoadBalancer), TestTimeoutLong).ShouldNot(BeEmpty())
-
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("NodePort service", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ "-t", "service.enabled=true",
+ "-t", "service.node-port=true").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ //
+ // Service names can vary with the ExternalName Service
+ // sometimes being created first and being given the root name
+ //
+ Eventually(ServicesByType(ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Default service (ClusterIP)", func(t *testing.T) {
+ // Service trait is enabled by default
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ //
+ // Service names can vary with the ExternalName Service
+ // sometimes being created first and being given the root name
+ //
+ Eventually(ServicesByType(ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("NodePort service from Type", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ "-t", "service.enabled=true",
+ "-t", "service.type=NodePort").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ //
+ // Service names can vary with the ExternalName Service
+ // sometimes being created first and being given the root name
+ //
+ Eventually(ServicesByType(ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("ClusterIP service from Type", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ "-t", "service.enabled=true",
+ "-t", "service.type=ClusterIP").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ //
+ // Service names can vary with the ExternalName Service
+ // sometimes being created first and being given the root name
+ //
+ Eventually(ServicesByType(ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+
+ // check integration schema does not contains unwanted default trait value.
+ Eventually(UnstructuredIntegration(ns, "platform-http-server")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(ns, "platform-http-server")()
+ serviceTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "service")
+ Expect(serviceTrait).ToNot(BeNil())
+ Expect(len(serviceTrait)).To(Equal(2))
+ Expect(serviceTrait["enabled"]).To(Equal(true))
+ Expect(serviceTrait["type"]).To(Equal("ClusterIP"))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("LoadBalancer service from Type", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ "-t", "service.enabled=true",
+ "-t", "service.type=LoadBalancer").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ //
+ // Service names can vary with the ExternalName Service
+ // sometimes being created first and being given the root name
+ //
+ Eventually(ServicesByType(ns, corev1.ServiceTypeLoadBalancer), TestTimeoutLong).ShouldNot(BeEmpty())
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
})
}
diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go
index 5a723785b..9f5818d4c 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -36,94 +36,95 @@ import (
)
func TestTolerationTrait(t *testing.T) {
- RegisterTestingT(t)
-
- t.Run("Run Java with node toleration operation exists", func(t *testing.T) {
- name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "toleration.enabled=true",
- "-t", "toleration.taints=camel.apache.org/master:NoExecute:300",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- pod := IntegrationPod(ns, name)()
- Expect(pod.Spec.Tolerations).NotTo(BeNil())
-
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
- Key: "camel.apache.org/master",
- Operator: corev1.TolerationOpExists,
- Effect: corev1.TaintEffectNoExecute,
- TolerationSeconds: pointer.Int64(300),
- }))
- })
-
- t.Run("Run Java with node toleration operation equals", func(t *testing.T) {
- name := RandomizedSuffixName("java2")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- "-t", "toleration.enabled=true",
- "-t", "toleration.taints=camel.apache.org/master=test:NoExecute:300",
- ).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- pod := IntegrationPod(ns, name)()
- Expect(pod.Spec.Tolerations).NotTo(BeNil())
-
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
- Key: "camel.apache.org/master",
- Operator: corev1.TolerationOpEqual,
- Value: "test", Effect: corev1.TaintEffectNoExecute,
- TolerationSeconds: pointer.Int64(300),
- }))
- })
-
- t.Run("Run Java with master node toleration", func(t *testing.T) {
- if len(Nodes()()) == 1 {
- t.Skip("Skip master node toleration test on single-node cluster")
- }
-
- name := RandomizedSuffixName("java3")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
- "--name", name,
- // Use the affinity trait to force the scheduling of the Integration pod onto a master node
- "-t", "affinity.enabled=true",
- "-t", "affinity.node-affinity-labels=node-role.kubernetes.io/master",
- // And tolerate the corresponding taint
- "-t", "toleration.enabled=true",
- "-t", "toleration.taints=node-role.kubernetes.io/master:NoSchedule",
- ).Execute()).To(Succeed())
-
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- pod := IntegrationPod(ns, name)()
- Expect(pod).NotTo(BeNil())
-
- // Check the Integration pod contains the toleration
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
- Key: "node-role.kubernetes.io/master",
- Operator: corev1.TolerationOpExists,
- Effect: corev1.TaintEffectNoSchedule,
- }))
-
- // Check the Integration pod is running on a master node
- Expect(Node(pod.Spec.NodeName)()).NotTo(BeNil())
- Expect(Node(pod.Spec.NodeName)()).To(PointTo(MatchFields(IgnoreExtras, Fields{
- "Spec": MatchFields(IgnoreExtras, Fields{
- "Taints": ContainElement(corev1.Taint{
- Key: "node-role.kubernetes.io/master",
- Effect: corev1.TaintEffectNoSchedule,
+ WithNewTestNamespace(t, func(ns string) {
+
+ t.Run("Run Java with node toleration operation exists", func(t *testing.T) {
+ name := RandomizedSuffixName("java1")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "toleration.enabled=true",
+ "-t", "toleration.taints=camel.apache.org/master:NoExecute:300",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ pod := IntegrationPod(ns, name)()
+ Expect(pod.Spec.Tolerations).NotTo(BeNil())
+
+ Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ Key: "camel.apache.org/master",
+ Operator: corev1.TolerationOpExists,
+ Effect: corev1.TaintEffectNoExecute,
+ TolerationSeconds: pointer.Int64(300),
+ }))
+ })
+
+ t.Run("Run Java with node toleration operation equals", func(t *testing.T) {
+ name := RandomizedSuffixName("java2")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ "-t", "toleration.enabled=true",
+ "-t", "toleration.taints=camel.apache.org/master=test:NoExecute:300",
+ ).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ pod := IntegrationPod(ns, name)()
+ Expect(pod.Spec.Tolerations).NotTo(BeNil())
+
+ Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ Key: "camel.apache.org/master",
+ Operator: corev1.TolerationOpEqual,
+ Value: "test", Effect: corev1.TaintEffectNoExecute,
+ TolerationSeconds: pointer.Int64(300),
+ }))
+ })
+
+ t.Run("Run Java with master node toleration", func(t *testing.T) {
+ if len(Nodes()()) == 1 {
+ t.Skip("Skip master node toleration test on single-node cluster")
+ }
+
+ name := RandomizedSuffixName("java3")
+ Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ "--name", name,
+ // Use the affinity trait to force the scheduling of the Integration pod onto a master node
+ "-t", "affinity.enabled=true",
+ "-t", "affinity.node-affinity-labels=node-role.kubernetes.io/master",
+ // And tolerate the corresponding taint
+ "-t", "toleration.enabled=true",
+ "-t", "toleration.taints=node-role.kubernetes.io/master:NoSchedule",
+ ).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ pod := IntegrationPod(ns, name)()
+ Expect(pod).NotTo(BeNil())
+
+ // Check the Integration pod contains the toleration
+ Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ Key: "node-role.kubernetes.io/master",
+ Operator: corev1.TolerationOpExists,
+ Effect: corev1.TaintEffectNoSchedule,
+ }))
+
+ // Check the Integration pod is running on a master node
+ Expect(Node(pod.Spec.NodeName)()).NotTo(BeNil())
+ Expect(Node(pod.Spec.NodeName)()).To(PointTo(MatchFields(IgnoreExtras, Fields{
+ "Spec": MatchFields(IgnoreExtras, Fields{
+ "Taints": ContainElement(corev1.Taint{
+ Key: "node-role.kubernetes.io/master",
+ Effect: corev1.TaintEffectNoSchedule,
+ }),
}),
- }),
- })))
- })
+ })))
+ })
- // Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ // Clean up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
}
diff --git a/e2e/install/cli/uninstall_test.go b/e2e/install/cli/uninstall_test.go
index 0ff450d11..7bda494eb 100644
--- a/e2e/install/cli/uninstall_test.go
+++ b/e2e/install/cli/uninstall_test.go
@@ -46,7 +46,7 @@ func TestBasicUninstall(t *testing.T) {
// Roles only removed in non-olm use-case
uninstallViaOLM := false
var err error
- if uninstallViaOLM, err = olm.IsAPIAvailable(TestContext, TestClient(), ns); err != nil {
+ if uninstallViaOLM, err = olm.IsAPIAvailable(TestClient()); err != nil {
t.Error(err)
t.FailNow()
}
diff --git a/e2e/install/kustomize/operator_test.go b/e2e/install/kustomize/operator_test.go
index 418f71ed0..bf5b67064 100644
--- a/e2e/install/kustomize/operator_test.go
+++ b/e2e/install/kustomize/operator_test.go
@@ -41,7 +41,8 @@ func TestOperatorBasic(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- UninstallAll()
+ RegisterTestingT(t)
+ Expect(UninstallAll()).To(Succeed())
// Return the cluster to previous state
defer Cleanup()
@@ -84,7 +85,8 @@ func TestOperatorKustomizeAlternativeImage(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- UninstallAll()
+ RegisterTestingT(t)
+ Expect(UninstallAll()).To(Succeed())
// Return the cluster to previous state
defer Cleanup()
@@ -115,7 +117,8 @@ func TestOperatorKustomizeGlobal(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- UninstallAll()
+ RegisterTestingT(t)
+ Expect(UninstallAll()).To(Succeed())
// Return the cluster to previous state
defer Cleanup()
diff --git a/e2e/install/kustomize/setup_test.go b/e2e/install/kustomize/setup_test.go
index 429f516e7..9434e17f4 100644
--- a/e2e/install/kustomize/setup_test.go
+++ b/e2e/install/kustomize/setup_test.go
@@ -29,6 +29,7 @@ import (
. "github.com/apache/camel-k/v2/e2e/support"
testutil "github.com/apache/camel-k/v2/e2e/support/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
. "github.com/onsi/gomega"
)
@@ -38,7 +39,7 @@ func TestSetupKustomizeBasic(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- UninstallAll()
+ Expect(UninstallAll()).To(Succeed())
Eventually(CRDs()).Should(HaveLen(0))
// Return the cluster to previous state
@@ -47,7 +48,7 @@ func TestSetupKustomizeBasic(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- Eventually(CRDs()).Should(HaveLen(ExpectedCRDs))
+ Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
ExpectExecSucceed(t, Make("setup", namespaceArg))
@@ -70,7 +71,8 @@ func TestSetupKustomizeGlobal(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- UninstallAll()
+ RegisterTestingT(t)
+ Expect(UninstallAll()).To(Succeed())
Eventually(CRDs()).Should(HaveLen(0))
// Return the cluster to previous state
@@ -79,7 +81,7 @@ func TestSetupKustomizeGlobal(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- Eventually(CRDs()).Should(HaveLen(ExpectedCRDs))
+ Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
ExpectExecSucceed(t, Make("setup", "GLOBAL=true", namespaceArg))
diff --git a/e2e/install/kustomize/uninstall_test.go b/e2e/install/kustomize/uninstall_test.go
index c56bc74f5..7c8e93c35 100644
--- a/e2e/install/kustomize/uninstall_test.go
+++ b/e2e/install/kustomize/uninstall_test.go
@@ -31,6 +31,7 @@ import (
. "github.com/apache/camel-k/v2/e2e/support"
testutil "github.com/apache/camel-k/v2/e2e/support/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
. "github.com/onsi/gomega"
)
@@ -40,7 +41,7 @@ func TestKustomizeUninstallBasic(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- UninstallAll()
+ Expect(UninstallAll()).To(Succeed())
Eventually(CRDs()).Should(HaveLen(0))
// Return the cluster to previous state
@@ -69,7 +70,7 @@ func TestKustomizeUninstallBasic(t *testing.T) {
Eventually(Role(ns)).Should(BeNil())
Eventually(ClusterRole()).Should(BeNil())
// CRDs should be still there
- Eventually(CRDs()).Should(HaveLen(ExpectedCRDs))
+ Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
// Do uninstall all
ExpectExecSucceed(t, Make("uninstall", namespaceArg, "UNINSTALL_ALL=true"))
@@ -85,7 +86,7 @@ func TestUninstallGlobal(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- UninstallAll()
+ Expect(UninstallAll()).To(Succeed())
Eventually(CRDs()).Should(HaveLen(0))
// Return the cluster to previous state
@@ -112,7 +113,7 @@ func TestUninstallGlobal(t *testing.T) {
Eventually(Role(ns)).Should(BeNil())
Eventually(ClusterRole()).Should(BeNil())
// CRDs should be still there
- Eventually(CRDs()).Should(HaveLen(ExpectedCRDs))
+ Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
// Do uninstall all
ExpectExecSucceed(t, Make("uninstall", namespaceArg, "UNINSTALL_ALL=true"))
diff --git a/e2e/install/upgrade/cli_upgrade_test.go b/e2e/install/upgrade/cli_upgrade_test.go
index 9f87f753a..276e697f5 100644
--- a/e2e/install/upgrade/cli_upgrade_test.go
+++ b/e2e/install/upgrade/cli_upgrade_test.go
@@ -30,6 +30,7 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
+ kerrors "k8s.io/apimachinery/pkg/api/errors"
. "github.com/apache/camel-k/v2/e2e/support"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
@@ -51,6 +52,15 @@ func TestCLIOperatorUpgrade(t *testing.T) {
// Set KAMEL_BIN only for this test - don't override the ENV variable for all tests
Expect(os.Setenv("KAMEL_BIN", kamel)).To(Succeed())
+ if len(CRDs()()) > 0 {
+ // Clean up old installation - maybe leftover from another test
+ if err := UninstallAll(); err != nil && !kerrors.IsNotFound(err) {
+ t.Error(err)
+ t.FailNow()
+ }
+ }
+ Eventually(CRDs()).Should(HaveLen(0))
+
// Should both install the CRDs and kamel in the given namespace
Expect(Kamel(
"install",
@@ -126,6 +136,8 @@ func TestCLIOperatorUpgrade(t *testing.T) {
// Clean up
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ // Delete Integration Platform as it does not get removed with uninstall and might cause next tests to fail
+ DeletePlatform(ns)()
Expect(Kamel("uninstall", "--all", "-n", ns, "--olm=false").Execute()).To(Succeed())
})
}
diff --git a/e2e/install/upgrade/helm_upgrade_test.go b/e2e/install/upgrade/helm_upgrade_test.go
index 17287386d..6b72728ce 100644
--- a/e2e/install/upgrade/helm_upgrade_test.go
+++ b/e2e/install/upgrade/helm_upgrade_test.go
@@ -29,10 +29,13 @@ import (
"os/exec"
"testing"
- . "github.com/apache/camel-k/v2/e2e/support"
- "github.com/apache/camel-k/v2/pkg/util/defaults"
. "github.com/onsi/gomega"
+
corev1 "k8s.io/api/core/v1"
+ kerrors "k8s.io/apimachinery/pkg/api/errors"
+
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
// WARNING: this test is not OLM specific but needs certain setting we provide in OLM installation scenario
@@ -51,14 +54,20 @@ func TestHelmOperatorUpgrade(t *testing.T) {
customImage := fmt.Sprintf("%s/apache/camel-k", KAMEL_INSTALL_REGISTRY)
- os.Setenv("CAMEL_K_TEST_MAKE_DIR", "../../../")
+ if err := os.Setenv("CAMEL_K_TEST_MAKE_DIR", "../../../"); err != nil {
+ t.Logf("Unable to set makefile directory envvar - %s", err.Error())
+ }
- // Ensure no CRDs are already installed
- UninstallAll()
+ if len(CRDs()()) > 0 {
+ // Clean up old installation - maybe leftover from another test
+ if err := UninstallAll(); err != nil && !kerrors.IsNotFound(err) {
+ t.Error(err)
+ t.FailNow()
+ }
+ }
Eventually(CRDs()).Should(HaveLen(0))
WithNewTestNamespace(t, func(ns string) {
-
// Install operator in last released version
ExpectExecSucceed(t,
exec.Command(
@@ -77,9 +86,9 @@ func TestHelmOperatorUpgrade(t *testing.T) {
Eventually(OperatorPod(ns)).ShouldNot(BeNil())
Eventually(OperatorImage(ns)).Should(ContainSubstring(releaseVersion))
- Eventually(CRDs()).Should(HaveLen(ExpectedCRDs))
+ Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(releaseVersion)))
- //Test a simple route
+ // Test a simple route
t.Run("simple route", func(t *testing.T) {
name := RandomizedSuffixName("yaml")
Expect(KamelRun(ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
@@ -134,7 +143,7 @@ func TestHelmOperatorUpgrade(t *testing.T) {
Eventually(OperatorPod(ns)).ShouldNot(BeNil())
Eventually(OperatorImage(ns)).Should(ContainSubstring(defaults.Version))
- //Test again a simple route
+ // Test again a simple route
t.Run("simple route upgraded", func(t *testing.T) {
name := RandomizedSuffixName("yaml")
Expect(KamelRun(ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
@@ -142,6 +151,12 @@ func TestHelmOperatorUpgrade(t *testing.T) {
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
+ // Clean up
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+
+ // Delete Integration Platform as it does not get removed with uninstall and might cause next tests to fail
+ DeletePlatform(ns)()
+
// Uninstall with helm
ExpectExecSucceed(t,
exec.Command(
@@ -155,7 +170,7 @@ func TestHelmOperatorUpgrade(t *testing.T) {
Eventually(OperatorPod(ns)).Should(BeNil())
// helm does not remove the CRDs
- Eventually(CRDs()).Should(HaveLen(ExpectedCRDs))
+ Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
ExpectExecSucceed(t,
exec.Command(
"kubectl",
diff --git a/e2e/install/upgrade/olm_upgrade_test.go b/e2e/install/upgrade/olm_upgrade_test.go
index 09b20315b..e1af933ee 100644
--- a/e2e/install/upgrade/olm_upgrade_test.go
+++ b/e2e/install/upgrade/olm_upgrade_test.go
@@ -32,6 +32,7 @@ import (
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
. "github.com/onsi/gomega"
"github.com/stretchr/testify/require"
+ kerrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -72,7 +73,7 @@ func TestOLMOperatorUpgrade(t *testing.T) {
if ocp {
// Wait for pull secret to be created in namespace
- // eg. test-camel-k-source-dockercfg-zlltn
+ // e.g. test-camel-k-source-dockercfg-zlltn
secretPrefix := fmt.Sprintf("%s-dockercfg-", catalogSourceName)
Eventually(SecretByName(ns, secretPrefix), TestTimeoutLong).Should(Not(BeNil()))
}
@@ -83,6 +84,15 @@ func TestOLMOperatorUpgrade(t *testing.T) {
// Set KAMEL_BIN only for this test - don't override the ENV variable for all tests
Expect(os.Setenv("KAMEL_BIN", kamel)).To(Succeed())
+ if len(CRDs()()) > 0 {
+ // Clean up old installation - maybe leftover from another test
+ if err := UninstallAll(); err != nil && !kerrors.IsNotFound(err) {
+ t.Error(err)
+ t.FailNow()
+ }
+ }
+ Eventually(CRDs()).Should(HaveLen(0))
+
args := []string{
"install",
"-n", ns,
@@ -241,6 +251,8 @@ func TestOLMOperatorUpgrade(t *testing.T) {
// Clean up
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ // Delete Integration Platform as it does not get removed with uninstall and might cause next tests to fail
+ DeletePlatform(ns)()
Expect(Kamel("uninstall", "-n", ns).Execute()).To(Succeed())
// Clean up cluster-wide resources that are not removed by OLM
Expect(Kamel("uninstall", "--all", "-n", ns, "--olm=false").Execute()).To(Succeed())
diff --git a/e2e/knative/default.go b/e2e/knative/default.go
index 20fe113af..1def62779 100644
--- a/e2e/knative/default.go
+++ b/e2e/knative/default.go
@@ -20,7 +20,10 @@ limitations under the License.
package knative
-import "github.com/apache/camel-k/v2/e2e/support"
+import (
+ "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/platform"
+)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.GetCIProcessID())
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", support.GetCIProcessID())
+var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
+var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/knative/knative_platform_test.go b/e2e/knative/knative_platform_test.go
index 94da2022a..52f001e4c 100644
--- a/e2e/knative/knative_platform_test.go
+++ b/e2e/knative/knative_platform_test.go
@@ -49,7 +49,7 @@ func TestKnativePlatformDetection(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-knative"
- // Install withouth profile (should automatically detect the presence of KNative)
+ // Install without profile (should automatically detect the presence of Knative)
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
Eventually(PlatformProfile(ns), TestTimeoutShort).Should(Equal(v1.TraitProfile("")))
@@ -60,7 +60,7 @@ func TestKnativePlatformDetection(t *testing.T) {
Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
Eventually(IntegrationTraitProfile(ns, "yaml"), TestTimeoutShort).Should(Equal(v1.TraitProfile(string(cluster))))
- // Change something in the integration to produce a redeploy
+ // Change something in the integration to produce a redeployment
Expect(UpdateIntegration(ns, "yaml", func(it *v1.Integration) {
it.Spec.Profile = ""
content, err := dsl.ToYamlDSL(it.Spec.Flows)
diff --git a/e2e/knative/support/startup_test.go b/e2e/knative/support/startup_test.go
deleted file mode 100644
index da04425db..000000000
--- a/e2e/knative/support/startup_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-//go:build integration
-// +build integration
-
-// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package support
-
-import (
- "testing"
-
- . "github.com/onsi/gomega"
- corev1 "k8s.io/api/core/v1"
-
- . "github.com/apache/camel-k/v2/e2e/support"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
-)
-
-func TestKNativeCamelKInstallStartup(t *testing.T) {
- RegisterTestingT(t)
-
- ns := NewTestNamespace(false)
- Expect(ns).ShouldNot(BeNil())
- // the namespace is dynamic if there is some collision
- // we store this value as it will be used for cleaning in the teardown process
- SaveCIProcessID(ns.GetName())
- // fail fast if something did not work writing the resource
- Expect(GetCIProcessID()).ShouldNot(Equal(""))
-
- Expect(KamelInstallWithIDAndKameletCatalog(ns.GetName(), ns.GetName(), "--trait-profile", "knative").Execute()).To(Succeed())
- Eventually(OperatorPod(ns.GetName())).ShouldNot(BeNil())
- Eventually(Platform(ns.GetName())).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(ns.GetName(), v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
- Should(Equal(corev1.ConditionTrue))
-}
diff --git a/e2e/knative/support/teardown_test.go b/e2e/knative/support/teardown_test.go
deleted file mode 100644
index af4f0c9d8..000000000
--- a/e2e/knative/support/teardown_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-//go:build integration
-// +build integration
-
-// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package support
-
-import (
- "testing"
-
- . "github.com/onsi/gomega"
-
- . "github.com/apache/camel-k/v2/e2e/support"
-)
-
-func TestKNativeCamelKInstallTeardown(t *testing.T) {
- RegisterTestingT(t)
-
- ns := GetCIProcessID()
- Expect(ns).ShouldNot(Equal(""))
- Expect(DeleteNamespace(t, ns)).To(Succeed())
- DeleteCIProcessID()
-}
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 5e351328b..e54d8ba5c 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -98,10 +98,10 @@ const kubeConfigEnvVar = "KUBECONFIG"
const ciPID = "/tmp/ci-k8s-pid"
// v1.Build, v1.Integration
-// v1.IntegrationKit, v1.IntegrationPlatform
+// v1.IntegrationKit, v1.IntegrationPlatform, v1.IntegrationProfile
// v1.Kamelet, v1.Pipe,
// v1alpha1.Kamelet, v1alpha1.KameletBinding
-const ExpectedCRDs = 8
+const ExpectedCRDs = 9
// camel-k-operator,
// camel-k-operator-events,
@@ -124,6 +124,8 @@ const ExpectedOSPromoteRoles = 1
// camel-k-operator-console-openshift
const ExpectedOSClusterRoles = 1
+var TestDefaultNamespace = "default"
+
var TestTimeoutShort = 1 * time.Minute
var TestTimeoutMedium = 5 * time.Minute
var TestTimeoutLong = 15 * time.Minute
@@ -347,20 +349,6 @@ func KamelCommandWithContext(ctx context.Context, command string, operatorID str
return KamelWithContext(ctx, cmdArgs...)
}
-func verifyGlobalOperator() error {
- opns := os.Getenv("CAMEL_K_GLOBAL_OPERATOR_NS")
- if opns == "" {
- return errors.New("no operator namespace defined in CAMEL_K_GLOBAL_OPERATOR_NS")
- }
-
- oppod := OperatorPod(opns)()
- if oppod == nil {
- return fmt.Errorf("no operator pod detected in namespace %s. Operator install is a pre-requisite of the test", opns)
- }
-
- return nil
-}
-
func KamelWithContext(ctx context.Context, args ...string) *cobra.Command {
var c *cobra.Command
var err error
@@ -1945,10 +1933,48 @@ func PlatformByName(ns string, name string) func() *v1.IntegrationPlatform {
}
}
+func CopyIntegrationKits(ns, operatorID string) error {
+ opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+
+ lst := v1.NewIntegrationKitList()
+ if err := TestClient().List(TestContext, &lst, ctrl.InNamespace(opns)); err != nil {
+ failTest(err)
+ }
+ for _, kit := range lst.Items {
+ if kit.Status.Image != "" {
+ copyKit := v1.IntegrationKit{
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: ns,
+ Name: kit.Name,
+ },
+ Spec: *kit.Spec.DeepCopy(),
+ }
+
+ if copyKit.Labels == nil {
+ copyKit.Labels = make(map[string]string)
+ }
+
+ copyKit.Labels[v1.IntegrationKitTypeLabel] = v1.IntegrationKitTypeExternal
+ copyKit.Spec.Image = kit.Status.Image
+
+ v1.SetAnnotation(©Kit.ObjectMeta, v1.OperatorIDAnnotation, operatorID)
+ fmt.Printf("Copy integration kit %s from namespace %s\n", kit.Name, opns)
+ if err := CreateIntegrationKit(©Kit)(); err != nil {
+ return err
+ }
+ }
+ }
+
+ return nil
+}
+
func CopyCamelCatalog(ns, operatorID string) error {
catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion))
- defaultCatalog := CamelCatalog("default", catalogName)()
+ opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+
+ defaultCatalog := CamelCatalog(opns, catalogName)()
if defaultCatalog != nil {
+ fmt.Printf("Copy catalog %s from namespace %s\n", catalogName, opns)
catalog := v1.CamelCatalog{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
@@ -2037,6 +2063,12 @@ func CreateCamelCatalog(catalog *v1.CamelCatalog) func() error {
}
}
+func CreateIntegrationKit(kit *v1.IntegrationKit) func() error {
+ return func() error {
+ return TestClient().Create(TestContext, kit)
+ }
+}
+
func DeleteCamelCatalog(ns, name string) func() bool {
return func() bool {
cat := CamelCatalog(ns, name)()
@@ -2225,6 +2257,17 @@ func AssignPlatformToOperator(ns, operator string) error {
return TestClient().Update(TestContext, pl)
}
+func GetExpectedCRDs(releaseVersion string) int {
+ switch releaseVersion {
+ case "2.2.0":
+ return 8
+ case defaults.Version:
+ return ExpectedCRDs
+ }
+
+ return ExpectedCRDs
+}
+
func CRDs() func() []metav1.APIResource {
return func() []metav1.APIResource {
@@ -2233,6 +2276,7 @@ func CRDs() func() []metav1.APIResource {
reflect.TypeOf(v1.Integration{}).Name(),
reflect.TypeOf(v1.IntegrationKit{}).Name(),
reflect.TypeOf(v1.IntegrationPlatform{}).Name(),
+ reflect.TypeOf(v1.IntegrationProfile{}).Name(),
reflect.TypeOf(v1.Kamelet{}).Name(),
reflect.TypeOf(v1.Pipe{}).Name(),
reflect.TypeOf(v1alpha1.KameletBinding{}).Name(),
@@ -2789,7 +2833,7 @@ func deleteKnativeBroker(ns metav1.Object) {
},
ObjectMeta: metav1.ObjectMeta{
Namespace: ns.GetName(),
- Name: "default",
+ Name: TestDefaultNamespace,
},
}
if err := TestClient().Delete(TestContext, &broker); err != nil {
diff --git a/e2e/support/test_util.go b/e2e/support/test_util.go
index e2cbd933f..5753622d4 100644
--- a/e2e/support/test_util.go
+++ b/e2e/support/test_util.go
@@ -23,6 +23,7 @@ limitations under the License.
package support
import (
+ "github.com/apache/camel-k/v2/pkg/util/log"
"os"
"os/exec"
"strings"
@@ -77,7 +78,7 @@ func ExpectExecSucceed(t *testing.T, command *exec.Cmd) {
assert.NotContains(t, strings.ToUpper(cmdErr.String()), "ERROR")
}
-// Expect a command error with an exit code of 1
+// ExpectExecError Expect a command error with an exit code of 1
func ExpectExecError(t *testing.T, command *exec.Cmd) {
t.Helper()
@@ -98,16 +99,20 @@ func ExpectExecError(t *testing.T, command *exec.Cmd) {
assert.Contains(t, strings.ToUpper(cmdErr.String()), "ERROR")
}
-// Clean up the cluster ready for the next set of tests
+// Cleanup Clean up the cluster ready for the next set of tests
func Cleanup() {
// Remove the locally installed operator
- UninstallAll()
+ if err := UninstallAll(); err != nil {
+ log.Error(err, "Failed to uninstall Camel K")
+ }
// Ensure the CRDs & ClusterRoles are reinstalled if not already
- Kamel("install", "--olm=false", "--cluster-setup").Execute()
+ if err := Kamel("install", "--olm=false", "--cluster-setup").Execute(); err != nil {
+ log.Error(err, "Failed to perform Camel K cluster setup")
+ }
}
-// Removes all items
-func UninstallAll() {
- Kamel("uninstall", "--olm=false", "--all").Execute()
+// UninstallAll Removes all items
+func UninstallAll() error {
+ return Kamel("uninstall", "--olm=false", "--all").Execute()
}
diff --git a/e2e/support/util/dump.go b/e2e/support/util/dump.go
index c170cf6aa..a5741e697 100644
--- a/e2e/support/util/dump.go
+++ b/e2e/support/util/dump.go
@@ -258,7 +258,7 @@ func Dump(ctx context.Context, c client.Client, ns string, t *testing.T) error {
// OLM CSV
csvs := olm.ClusterServiceVersionList{}
err = c.List(ctx, &csvs, ctrl.InNamespace(ns))
- if err != nil {
+ if err != nil && !kubernetes.IsUnknownAPIError(err) {
return err
}
t.Logf("\nFound %d OLM CSVs:\n", len(csvs.Items))
diff --git a/e2e/telemetry/telemetry_test.go b/e2e/telemetry/telemetry_test.go
index b32730092..33fc69bac 100644
--- a/e2e/telemetry/telemetry_test.go
+++ b/e2e/telemetry/telemetry_test.go
@@ -59,12 +59,12 @@ func TestTelemetryTrait(t *testing.T) {
Eventually(IntegrationLogs(ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
Eventually(IntegrationLogs(ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
- // Find opentelemetrycollector pod : the exporter is configured to log traces with detailed verborsity.
+ // Find opentelemetry collector pod : the exporter is configured to log traces with detailed verbosity.
pod, err := Pod("otlp", "opentelemetrycollector")()
Expect(err).To(BeNil())
Expect(pod).NotTo(BeNil())
- // Ensured logs in opentelemetrycollector pod are present
+ // Ensured logs in opentelemetry collector pod are present
Eventually(TailedLogs(pod.Namespace, pod.Name, 100), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("http.target: Str(/customers/%s)", name)))
Eventually(TailedLogs(pod.Namespace, pod.Name, 100), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("http.url: Str(http://rest-consumer/customers/%s)", name)))
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 51f69e4a8..c6e787706 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -277,7 +277,7 @@ func (o *installCmdOptions) tryInstallViaOLM(
if err != nil {
return false, err
}
- if olmAvailable, err := olm.IsAPIAvailable(o.Context, olmClient, o.Namespace); err != nil {
+ if olmAvailable, err := olm.IsAPIAvailable(olmClient); err != nil {
return false, fmt.Errorf("error while checking OLM availability. Run with '--olm=false' to skip this check: %w", err)
} else if !olmAvailable {
diff --git a/pkg/cmd/uninstall.go b/pkg/cmd/uninstall.go
index eb0e5b779..461435c0b 100644
--- a/pkg/cmd/uninstall.go
+++ b/pkg/cmd/uninstall.go
@@ -146,7 +146,7 @@ func (o *uninstallCmdOptions) uninstall(cmd *cobra.Command, _ []string) error {
uninstallViaOLM := false
if o.OlmEnabled {
var err error
- if uninstallViaOLM, err = olm.IsAPIAvailable(o.Context, c, o.Namespace); err != nil {
+ if uninstallViaOLM, err = olm.IsAPIAvailable(c); err != nil {
return fmt.Errorf("error while checking OLM availability. Run with '--olm=false' to skip this check: %w", err)
}
diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index 9963f855e..e4f655bd0 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -135,7 +135,7 @@ func findAny(ctx context.Context, c k8sclient.Reader, namespace string) (*v1.Int
// findLocal returns the currently installed platform or any platform existing in local namespace.
func findLocal(ctx context.Context, c k8sclient.Reader, namespace string) (*v1.IntegrationPlatform, error) {
- log.Debug("Finding available platforms")
+ log.Debugf("Finding available platforms in namespace %s", namespace)
operatorNamespace := GetOperatorNamespace()
if namespace == operatorNamespace {
@@ -168,7 +168,7 @@ func findLocal(ctx context.Context, c k8sclient.Reader, namespace string) (*v1.I
return fallback, nil
}
- log.Debugf("Unable to find integration platform")
+ log.Debugf("Unable to find integration platform in namespace %s", namespace)
return nil, k8serrors.NewNotFound(v1.Resource("IntegrationPlatform"), DefaultPlatformName)
}
diff --git a/pkg/util/olm/available.go b/pkg/util/olm/available.go
index 68cd35c35..294d31ba1 100644
--- a/pkg/util/olm/available.go
+++ b/pkg/util/olm/available.go
@@ -18,8 +18,6 @@ limitations under the License.
package olm
import (
- "context"
-
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
@@ -34,7 +32,7 @@ import (
// IsAPIAvailable returns true if we are connected to a cluster with OLM installed.
//
// This method should not be called from the operator, as it might require permissions that are not available.
-func IsAPIAvailable(ctx context.Context, c kubernetes.Interface, namespace string) (bool, error) {
+func IsAPIAvailable(c kubernetes.Interface) (bool, error) {
// check some Knative APIs
for _, api := range getOLMGroupVersions() {
if installed, err := isAvailable(c, api); err != nil {
diff --git a/script/Makefile b/script/Makefile
index 4de49d689..9ac526c43 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -247,14 +247,13 @@ test: do-build
#
test-common: do-build
FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \
- go test -timeout 10m -v ./e2e/common/support/startup_test.go -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
+ go test -timeout 10m -v ./e2e/common/setup -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v ./e2e/common/languages -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v ./e2e/common/cli -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v ./e2e/common/config -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v ./e2e/common/misc -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 60m -v ./e2e/common/traits -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 20m -v ./e2e/common/runtimes -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 10m -v ./e2e/common/support/teardown_test.go -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
exit $${FAILED}
#
@@ -262,7 +261,7 @@ test-common: do-build
#
test-smoke: do-build
FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \
- go test -timeout 10m -v ./e2e/common/support/startup_test.go -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
+ go test -timeout 10m -v ./e2e/common/setup -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v ./e2e/common/languages -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v \
./e2e/common/misc/default.go \
@@ -277,7 +276,6 @@ test-smoke: do-build
./e2e/common/traits/openapi_test.go \
./e2e/common/traits/service_test.go \
-tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 10m -v ./e2e/common/support/teardown_test.go -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
exit $${FAILED}
#
@@ -317,9 +315,7 @@ test-install-upgrade: do-build
#
test-knative: do-build
STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \
- go test -timeout 10m -v ./e2e/knative/support/startup_test.go -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 60m -v ./e2e/knative -tags=integration $(TEST_KNATIVE_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 10m -v ./e2e/knative/support/teardown_test.go -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
exit $${FAILED}
#
(camel-k) 02/10: chore(e2e): Run E2E tests in parallel
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 4e2db21a8ae09d57a739d45ae643fe3f89d7d29e
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Fri Mar 1 10:31:35 2024 +0100
chore(e2e): Run E2E tests in parallel
---
e2e/advanced/build_order_strategy_test.go | 166 ++--
e2e/advanced/builder_test.go | 46 +-
e2e/advanced/catalog_builder_test.go | 87 ++-
e2e/advanced/debug_test.go | 50 +-
e2e/advanced/deployment_test.go | 18 +-
e2e/advanced/dump_test.go | 20 +-
e2e/advanced/environment_test.go | 48 +-
e2e/advanced/incremental_build_test.go | 200 ++---
e2e/advanced/integration_profile_test.go | 108 +--
e2e/advanced/kamelet_repo_test.go | 30 +-
e2e/advanced/local_platform_test.go | 75 +-
e2e/advanced/main_test.go | 30 +-
e2e/advanced/maven_http_proxy_test.go | 58 +-
e2e/advanced/operator_id_filtering_test.go | 94 +--
e2e/advanced/operator_metrics_test.go | 30 +-
e2e/advanced/platform_traits_test.go | 32 +-
e2e/advanced/promote_test.go | 132 ++--
e2e/advanced/reset_test.go | 62 +-
e2e/advanced/synthetic_test.go | 57 +-
e2e/advanced/tekton_test.go | 14 +-
e2e/builder/build_test.go | 146 ++--
e2e/builder/registry_test.go | 24 +-
e2e/common/cli/bind_test.go | 26 +-
e2e/common/cli/config_test.go | 18 +-
e2e/common/cli/delete_test.go | 58 +-
e2e/common/cli/describe_test.go | 16 +-
e2e/common/cli/dev_mode_test.go | 20 +-
e2e/common/cli/duplicate_parameters_test.go | 4 +-
e2e/common/cli/get_test.go | 46 +-
e2e/common/cli/help_test.go | 6 +-
e2e/common/cli/log_test.go | 16 +-
e2e/common/cli/offline_commands_test.go | 8 +-
e2e/common/cli/run_test.go | 144 ++--
e2e/common/cli/version_test.go | 2 +-
e2e/common/config/config_reload_test.go | 68 +-
e2e/common/config/config_test.go | 266 +++----
e2e/common/config/kamelet_config_test.go | 282 +++----
e2e/common/config/pipe_config_test.go | 116 +--
e2e/common/languages/groovy_test.go | 12 +-
e2e/common/languages/java_test.go | 12 +-
e2e/common/languages/js_test.go | 12 +-
e2e/common/languages/kotlin_test.go | 12 +-
e2e/common/languages/polyglot_test.go | 14 +-
e2e/common/languages/xml_test.go | 12 +-
e2e/common/languages/yaml_test.go | 12 +-
e2e/common/misc/client_test.go | 4 +-
e2e/common/misc/cron_test.go | 44 +-
e2e/common/misc/integration_fail_test.go | 134 ++--
e2e/common/misc/integration_trait_update_test.go | 14 +-
e2e/common/misc/kamelet_test.go | 16 +-
e2e/common/misc/kamelet_update_test.go | 20 +-
e2e/common/misc/maven_repository_test.go | 14 +-
e2e/common/misc/pipe_test.go | 46 +-
e2e/common/misc/pipe_with_image_test.go | 28 +-
e2e/common/misc/registry_maven_wagon_test.go | 56 +-
e2e/common/misc/rest_test.go | 26 +-
e2e/common/misc/scale_binding_test.go | 54 +-
e2e/common/misc/scale_integration_test.go | 68 +-
e2e/common/misc/structured_logs_test.go | 18 +-
e2e/common/runtimes/runtimes_test.go | 42 +-
e2e/common/setup/main_test.go | 26 +-
e2e/common/traits/affinity_test.go | 48 +-
e2e/common/traits/builder_test.go | 231 +++---
e2e/common/traits/camel_test.go | 30 +-
e2e/common/traits/container_test.go | 32 +-
e2e/common/traits/deployment_test.go | 30 +-
e2e/common/traits/error_handler_test.go | 12 +-
e2e/common/traits/errored_trait_test.go | 26 +-
e2e/common/traits/health_test.go | 134 ++--
e2e/common/traits/istio_test.go | 18 +-
e2e/common/traits/jolokia_test.go | 20 +-
e2e/common/traits/jvm_test.go | 18 +-
e2e/common/traits/kamelet_test.go | 20 +-
e2e/common/traits/master_test.go | 30 +-
e2e/common/traits/openapi_test.go | 18 +-
e2e/common/traits/pdb_test.go | 54 +-
e2e/common/traits/pod_test.go | 20 +-
e2e/common/traits/prometheus_test.go | 27 +-
e2e/common/traits/pull_secret_test.go | 36 +-
e2e/common/traits/route_test.go | 72 +-
e2e/common/traits/service_binding_test.go | 24 +-
e2e/common/traits/service_test.go | 46 +-
e2e/common/traits/toleration_test.go | 40 +-
e2e/install/cli/global_kamelet_test.go | 30 +-
e2e/install/cli/global_test.go | 124 +--
e2e/install/cli/install_test.go | 80 +-
e2e/install/cli/maven_ca_secret_test.go | 46 +-
e2e/install/cli/uninstall_test.go | 88 +--
e2e/install/helm/setup_test.go | 16 +-
e2e/install/kustomize/operator_test.go | 54 +-
e2e/install/kustomize/setup_test.go | 34 +-
e2e/install/kustomize/uninstall_test.go | 72 +-
e2e/install/olm/olm_install_test.go | 32 +-
e2e/install/upgrade/cli_upgrade_test.go | 61 +-
e2e/install/upgrade/helm_upgrade_test.go | 42 +-
e2e/install/upgrade/olm_upgrade_test.go | 112 +--
e2e/knative/kamelet_test.go | 30 +-
e2e/knative/knative_platform_test.go | 38 +-
e2e/knative/knative_test.go | 140 ++--
e2e/knative/openapi_test.go | 14 +-
e2e/knative/pod_test.go | 18 +-
e2e/native/native_binding_test.go | 22 +-
e2e/native/native_test.go | 82 +-
e2e/native/native_with_sources_test.go | 64 +-
e2e/support/csv.go | 37 +-
e2e/support/test_nexus_hooks.go | 2 +-
e2e/support/test_support.go | 950 ++++++++++++-----------
e2e/support/test_util.go | 10 +-
e2e/telemetry/telemetry_test.go | 28 +-
script/Makefile | 26 +-
110 files changed, 3373 insertions(+), 3184 deletions(-)
diff --git a/e2e/advanced/build_order_strategy_test.go b/e2e/advanced/build_order_strategy_test.go
index 5dd64120d..46111d8cb 100644
--- a/e2e/advanced/build_order_strategy_test.go
+++ b/e2e/advanced/build_order_strategy_test.go
@@ -35,80 +35,82 @@ import (
)
func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-build-order-deps"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns,
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns,
"--max-running-pipelines", "4",
"--build-order-strategy", string(v1.BuildOrderStrategyDependencies)).Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(CreateTimerKamelet(ns, "timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
integrationA := RandomizedSuffixName("java-a")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationA,
).Execute()).To(Succeed())
- Eventually(IntegrationKit(ns, integrationA), TestTimeoutMedium).ShouldNot(BeEmpty())
- integrationKitNameA := IntegrationKit(ns, integrationA)()
- Eventually(Build(ns, integrationKitNameA), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(IntegrationKit(t, ns, integrationA), TestTimeoutMedium).ShouldNot(BeEmpty())
+ integrationKitNameA := IntegrationKit(t, ns, integrationA)()
+ Eventually(Build(t, ns, integrationKitNameA), TestTimeoutMedium).ShouldNot(BeNil())
integrationB := RandomizedSuffixName("java-b")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationB,
"-d", "camel:cron",
).Execute()).To(Succeed())
integrationC := RandomizedSuffixName("java-c")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationC,
"-d", "camel:cron",
"-d", "camel:zipfile",
).Execute()).To(Succeed())
integrationZ := RandomizedSuffixName("groovy-z")
- Expect(KamelRunWithID(operatorID, ns, "files/timer-source.groovy",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
"--name", integrationZ,
).Execute()).To(Succeed())
- Eventually(IntegrationKit(ns, integrationB), TestTimeoutMedium).ShouldNot(BeEmpty())
- Eventually(IntegrationKit(ns, integrationC), TestTimeoutMedium).ShouldNot(BeEmpty())
- Eventually(IntegrationKit(ns, integrationZ), TestTimeoutMedium).ShouldNot(BeEmpty())
-
- integrationKitNameB := IntegrationKit(ns, integrationB)()
- integrationKitNameC := IntegrationKit(ns, integrationC)()
- integrationKitNameZ := IntegrationKit(ns, integrationZ)()
-
- Eventually(BuildPhase(ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Eventually(BuildPhase(ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, integrationKitNameB)().Status.BaseImage).Should(ContainSubstring(integrationKitNameA))
-
- Eventually(BuildPhase(ns, integrationKitNameC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(ns, integrationC), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, integrationC, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, integrationC), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, integrationKitNameC)().Status.BaseImage).Should(ContainSubstring(integrationKitNameB))
-
- Eventually(BuildPhase(ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- buildA := Build(ns, integrationKitNameA)()
- buildB := Build(ns, integrationKitNameB)()
- buildC := Build(ns, integrationKitNameC)()
- buildZ := Build(ns, integrationKitNameZ)()
+ Eventually(IntegrationKit(t, ns, integrationB), TestTimeoutMedium).ShouldNot(BeEmpty())
+ Eventually(IntegrationKit(t, ns, integrationC), TestTimeoutMedium).ShouldNot(BeEmpty())
+ Eventually(IntegrationKit(t, ns, integrationZ), TestTimeoutMedium).ShouldNot(BeEmpty())
+
+ integrationKitNameB := IntegrationKit(t, ns, integrationB)()
+ integrationKitNameC := IntegrationKit(t, ns, integrationC)()
+ integrationKitNameZ := IntegrationKit(t, ns, integrationZ)()
+
+ Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(ContainSubstring(integrationKitNameA))
+
+ Eventually(BuildPhase(t, ns, integrationKitNameC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(IntegrationPodPhase(t, ns, integrationC), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, integrationC, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, integrationC), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Kit(t, ns, integrationKitNameC)().Status.BaseImage).Should(ContainSubstring(integrationKitNameB))
+
+ Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ buildA := Build(t, ns, integrationKitNameA)()
+ buildB := Build(t, ns, integrationKitNameB)()
+ buildC := Build(t, ns, integrationKitNameC)()
+ buildZ := Build(t, ns, integrationKitNameZ)()
Expect(buildA.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
Expect(buildA.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
@@ -116,7 +118,7 @@ func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
Expect(buildZ.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
Expect(buildZ.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -124,60 +126,60 @@ func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
func TestRunBuildOrderStrategyFIFO(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-build-order-fifo"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns, "--build-order-strategy", string(v1.BuildOrderStrategyFIFO)).Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--build-order-strategy", string(v1.BuildOrderStrategyFIFO)).Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(CreateTimerKamelet(ns, "timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
integrationA := RandomizedSuffixName("java-a")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationA,
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, integrationA)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ Eventually(IntegrationPhase(t, ns, integrationA)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationB := RandomizedSuffixName("java-b")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationB,
"-d", "camel:joor",
).Execute()).To(Succeed())
integrationZ := RandomizedSuffixName("groovy-z")
- Expect(KamelRunWithID(operatorID, ns, "files/timer-source.groovy",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
"--name", integrationZ,
).Execute()).To(Succeed())
- integrationKitNameA := IntegrationKit(ns, integrationA)()
- Eventually(BuildPhase(ns, integrationKitNameA), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+ integrationKitNameA := IntegrationKit(t, ns, integrationA)()
+ Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
- Eventually(IntegrationPhase(ns, integrationB)).Should(Equal(v1.IntegrationPhaseBuildingKit))
- integrationKitNameB := IntegrationKit(ns, integrationB)()
- Eventually(BuildPhase(ns, integrationKitNameB), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+ Eventually(IntegrationPhase(t, ns, integrationB)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ integrationKitNameB := IntegrationKit(t, ns, integrationB)()
+ Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
- Eventually(IntegrationPhase(ns, integrationZ)).Should(Equal(v1.IntegrationPhaseBuildingKit))
- integrationKitNameZ := IntegrationKit(ns, integrationZ)()
- Eventually(BuildPhase(ns, integrationKitNameZ), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+ Eventually(IntegrationPhase(t, ns, integrationZ)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ integrationKitNameZ := IntegrationKit(t, ns, integrationZ)()
+ Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
- Eventually(BuildPhase(ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(BuildPhase(ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, integrationKitNameB)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(BuildPhase(ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
*/
diff --git a/e2e/advanced/builder_test.go b/e2e/advanced/builder_test.go
index 78867b16e..a1548812c 100644
--- a/e2e/advanced/builder_test.go
+++ b/e2e/advanced/builder_test.go
@@ -36,50 +36,52 @@ import (
)
func TestBuilderTimeout(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(Platform(ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- pl := Platform(ns)()
+ pl := Platform(t, ns)()
// set a short timeout to simulate the build timeout
pl.Spec.Build.Timeout = &metav1.Duration{
Duration: 10 * time.Second,
}
- TestClient().Update(TestContext, pl)
- Eventually(Platform(ns)).ShouldNot(BeNil())
- Eventually(PlatformTimeout(ns)).Should(Equal(
+ TestClient(t).Update(TestContext, pl)
+ Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ Eventually(PlatformTimeout(t, ns)).Should(Equal(
&metav1.Duration{
Duration: 10 * time.Second,
},
))
- operatorPod := OperatorPod(ns)()
+ operatorPod := OperatorPod(t, ns)()
operatorPodImage := operatorPod.Spec.Containers[0].Image
t.Run("run yaml", func(t *testing.T) {
name := RandomizedSuffixName("yaml")
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml",
"--name", name,
"-t", "builder.strategy=pod").Execute()).To(Succeed())
// As the build hits timeout, it keeps trying building
- Eventually(IntegrationPhase(ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
- integrationKitName := IntegrationKit(ns, name)()
+ Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ integrationKitName := IntegrationKit(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPodPhase(ns, builderKitName)).Should(Equal(corev1.PodPending))
- Eventually(BuildPhase(ns, integrationKitName)).Should(Equal(v1.BuildPhaseRunning))
- Eventually(BuilderPod(ns, builderKitName)().Spec.InitContainers[0].Name).Should(Equal("builder"))
- Eventually(BuilderPod(ns, builderKitName)().Spec.InitContainers[0].Image).Should(Equal(operatorPodImage))
+ Eventually(BuilderPodPhase(t, ns, builderKitName)).Should(Equal(corev1.PodPending))
+ Eventually(BuildPhase(t, ns, integrationKitName)).Should(Equal(v1.BuildPhaseRunning))
+ Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Name).Should(Equal("builder"))
+ Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Image).Should(Equal(operatorPodImage))
// After a few minutes (5 max retries), this has to be in error state
- Eventually(BuildPhase(ns, integrationKitName), TestTimeoutMedium).Should(Equal(v1.BuildPhaseError))
- Eventually(IntegrationPhase(ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
- Eventually(BuildFailureRecovery(ns, integrationKitName), TestTimeoutMedium).Should(Equal(5))
- Eventually(BuilderPodPhase(ns, builderKitName), TestTimeoutMedium).Should(Equal(corev1.PodFailed))
+ Eventually(BuildPhase(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(v1.BuildPhaseError))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(BuildFailureRecovery(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(5))
+ Eventually(BuilderPodPhase(t, ns, builderKitName), TestTimeoutMedium).Should(Equal(corev1.PodFailed))
})
})
}
diff --git a/e2e/advanced/catalog_builder_test.go b/e2e/advanced/catalog_builder_test.go
index d67cfacd9..e85f900ac 100644
--- a/e2e/advanced/catalog_builder_test.go
+++ b/e2e/advanced/catalog_builder_test.go
@@ -36,19 +36,20 @@ import (
)
func TestCamelCatalogBuilder(t *testing.T) {
+ t.Parallel()
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(Platform(ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion))
- Eventually(CamelCatalog(ns, catalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ Eventually(CamelCatalog(t, ns, catalogName)).ShouldNot(BeNil())
+ Eventually(CamelCatalogPhase(t, ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
// Run an integration with a catalog not compatible
// The operator should create the catalog, but fail on reconciliation as it is not compatible
@@ -57,23 +58,23 @@ func TestCamelCatalogBuilder(t *testing.T) {
name := RandomizedSuffixName("java-1-15")
nonCompatibleCatalogName := "camel-catalog-1.15.0"
Expect(
- KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version=1.15.0",
).Execute()).To(Succeed())
- Eventually(CamelCatalog(ns, nonCompatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(ns, nonCompatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseError))
- Eventually(CamelCatalogCondition(ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("Container image tool missing in catalog"))
+ Eventually(CamelCatalog(t, ns, nonCompatibleCatalogName)).ShouldNot(BeNil())
+ Eventually(CamelCatalogPhase(t, ns, nonCompatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseError))
+ Eventually(CamelCatalogCondition(t, ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("Container image tool missing in catalog"))
- Eventually(IntegrationKit(ns, name)).ShouldNot(Equal(""))
- kitName := IntegrationKit(ns, name)()
- Eventually(KitPhase(ns, kitName)).Should(Equal(v1.IntegrationKitPhaseError))
- Eventually(KitCondition(ns, kitName, v1.IntegrationKitConditionCatalogAvailable)().Reason).Should(Equal("Camel Catalog 1.15.0 error"))
- Eventually(IntegrationPhase(ns, name)).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionKitAvailable)().Status).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
+ kitName := IntegrationKit(t, ns, name)()
+ Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseError))
+ Eventually(KitCondition(t, ns, kitName, v1.IntegrationKitConditionCatalogAvailable)().Reason).Should(Equal("Camel Catalog 1.15.0 error"))
+ Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable)().Status).Should(Equal(corev1.ConditionFalse))
// Clean up
- Eventually(DeleteIntegrations(ns)).Should(Equal(0))
+ Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
// Run an integration with a compatible catalog
@@ -84,24 +85,24 @@ func TestCamelCatalogBuilder(t *testing.T) {
compatibleCatalogName := "camel-catalog-" + strings.ToLower(compatibleVersion)
// First of all we delete the catalog, if by any chance it was created previously
- Expect(DeleteCamelCatalog(ns, compatibleCatalogName)()).Should(BeTrue())
- Eventually(CamelCatalog(ns, compatibleCatalogName)).Should(BeNil())
+ Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
+ Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
Expect(
- KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version="+compatibleVersion,
).Execute()).To(Succeed())
- Eventually(CamelCatalog(ns, compatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
- Eventually(CamelCatalogCondition(ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(Equal("Container image tool found in catalog"))
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).
+ Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
+ Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
+ Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(Equal("Container image tool found in catalog"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
// Clean up
- Eventually(DeleteIntegrations(ns)).Should(Equal(0))
+ Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
t.Run("Run catalog container exists", func(t *testing.T) {
@@ -110,32 +111,32 @@ func TestCamelCatalogBuilder(t *testing.T) {
compatibleCatalogName := "camel-catalog-" + strings.ToLower(compatibleVersion)
// First of all we delete the catalog, if by any chance it was created previously
- Expect(DeleteCamelCatalog(ns, compatibleCatalogName)()).Should(BeTrue())
- Eventually(CamelCatalog(ns, compatibleCatalogName)).Should(BeNil())
+ Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
+ Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
Expect(
- KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version="+compatibleVersion,
).Execute()).To(Succeed())
- Eventually(CamelCatalog(ns, compatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
- Eventually(CamelCatalogCondition(ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(
+ Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
+ Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
+ Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(
Equal("Container image tool found in catalog"),
)
- Eventually(IntegrationKit(ns, name)).ShouldNot(Equal(""))
- kitName := IntegrationKit(ns, name)()
- Eventually(KitPhase(ns, kitName)).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(IntegrationPodPhase(ns, name)).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
+ kitName := IntegrationKit(t, ns, name)()
+ Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(IntegrationPodPhase(t, ns, name)).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Clean up
- Eventually(DeleteIntegrations(ns)).Should(Equal(0))
+ Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/debug_test.go b/e2e/advanced/debug_test.go
index 38c422cee..206211aac 100644
--- a/e2e/advanced/debug_test.go
+++ b/e2e/advanced/debug_test.go
@@ -37,70 +37,70 @@ import (
)
func TestKamelCLIDebug(t *testing.T) {
- RegisterTestingT(t)
+ t.Parallel()
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("debug local default port check", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
Expect(portIsInUse("127.0.0.1", "5005")()).To(BeFalse())
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
- go KamelWithContext(debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
+ go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
Eventually(portIsInUse("127.0.0.1", "5005"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("debug local port check", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
Expect(portIsInUse("127.0.0.1", "5006")()).To(BeFalse())
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
- go KamelWithContext(debugTestContext, "debug", "yaml", "--port", "5006", "-n", ns).ExecuteContext(debugTestContext)
+ go KamelWithContext(t, debugTestContext, "debug", "yaml", "--port", "5006", "-n", ns).ExecuteContext(debugTestContext)
Eventually(portIsInUse("127.0.0.1", "5006"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("debug logs check", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
- go KamelWithContext(debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
+ go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutMedium).Should(ContainSubstring("Listening for transport dt_socket at address: 5005"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutMedium).Should(ContainSubstring("Listening for transport dt_socket at address: 5005"))
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Pod config test", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
- go KamelWithContext(debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
+ go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
Eventually(func() string {
- return IntegrationPod(ns, "yaml")().Spec.Containers[0].Args[0]
+ return IntegrationPod(t, ns, "yaml")().Spec.Containers[0].Args[0]
}).Should(ContainSubstring("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005"))
- Expect(IntegrationPod(ns, "yaml")().GetLabels()["camel.apache.org/debug"]).To(Not(BeNil()))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(IntegrationPod(t, ns, "yaml")().GetLabels()["camel.apache.org/debug"]).To(Not(BeNil()))
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/deployment_test.go b/e2e/advanced/deployment_test.go
index 4d489e2dd..8c80f68a4 100644
--- a/e2e/advanced/deployment_test.go
+++ b/e2e/advanced/deployment_test.go
@@ -34,12 +34,14 @@ import (
)
func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-failing-deploy"
nsRestr := "restr"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
// Create restricted namespace
ExpectExecSucceed(t,
exec.Command(
@@ -66,14 +68,14 @@ func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
)
// Create an Integration into a restricted namespace
name := RandomizedSuffixName("java-fail")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name, "-n", nsRestr).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name, "-n", nsRestr).Execute()).To(Succeed())
// Check the error is reported into the Integration
- Eventually(IntegrationPhase(nsRestr, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(nsRestr, name, v1.IntegrationConditionReady)().Status).
+ Eventually(IntegrationPhase(t, nsRestr, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Status).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(nsRestr, name, v1.IntegrationConditionReady)().Message).
+ Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Message).
Should(ContainSubstring("is forbidden: violates PodSecurity"))
// Clean up
- Eventually(DeleteIntegrations(nsRestr)).Should(Equal(0))
+ Eventually(DeleteIntegrations(t, nsRestr)).Should(Equal(0))
})
}
diff --git a/e2e/advanced/dump_test.go b/e2e/advanced/dump_test.go
index 31a31825e..3f6bad518 100644
--- a/e2e/advanced/dump_test.go
+++ b/e2e/advanced/dump_test.go
@@ -35,11 +35,11 @@ import (
)
func TestKamelCLIDump(t *testing.T) {
- RegisterTestingT(t)
+ t.Parallel()
WithNewTestNamespace(t, func(ns string) {
t.Run("dump empty namespace", func(t *testing.T) {
- dump := GetOutputString(Kamel("dump", "-n", ns))
+ dump := GetOutputString(Kamel(t, "dump", "-n", ns))
Expect(dump).To(ContainSubstring("Found 0 integrations:"))
Expect(dump).To(ContainSubstring("Found 0 deployments:"))
@@ -47,16 +47,16 @@ func TestKamelCLIDump(t *testing.T) {
t.Run("dump non-empty namespace", func(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "yaml")).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "yaml")).Should(ContainSubstring("Magicstring!"))
- dump := GetOutputString(Kamel("dump", "-n", ns))
+ dump := GetOutputString(Kamel(t, "dump", "-n", ns))
Expect(dump).To(ContainSubstring("Found 1 platforms"))
Expect(dump).To(ContainSubstring("Found 1 integrations"))
Expect(dump).To(ContainSubstring("name: yaml"))
diff --git a/e2e/advanced/environment_test.go b/e2e/advanced/environment_test.go
index 2befe92fe..a9793a904 100644
--- a/e2e/advanced/environment_test.go
+++ b/e2e/advanced/environment_test.go
@@ -39,6 +39,8 @@ import (
)
func TestEnvironmentTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
// HTTP proxy configuration
httpProxy := "http://proxy"
@@ -50,7 +52,7 @@ func TestEnvironmentTrait(t *testing.T) {
}
// Retrieve the Kubernetes Service ClusterIPs to populate the NO_PROXY environment variable
- svc := Service(TestDefaultNamespace, "kubernetes")()
+ svc := Service(t, TestDefaultNamespace, "kubernetes")()
Expect(svc).NotTo(BeNil())
noProxy = append(noProxy, svc.Spec.ClusterIPs...)
@@ -65,23 +67,23 @@ func TestEnvironmentTrait(t *testing.T) {
// Install Camel K with the HTTP proxy environment variable
operatorID := "camel-k-trait-environment"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns,
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=%s", httpProxy),
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","),
).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run integration with default environment", func(t *testing.T) {
name := RandomizedSuffixName("java-default")
- Expect(KamelRunWithID(operatorID, ns, "--name", name, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "--name", name, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(ns, name)()).To(WithTransform(podEnvVars, And(
+ Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -102,15 +104,15 @@ func TestEnvironmentTrait(t *testing.T) {
t.Run("Run integration with custom environment", func(t *testing.T) {
name := RandomizedSuffixName("java-custom-proxy")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "environment.vars=HTTP_PROXY=http://custom.proxy",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(ns, name)()).To(WithTransform(podEnvVars, And(
+ Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -131,15 +133,15 @@ func TestEnvironmentTrait(t *testing.T) {
t.Run("Run integration without default HTTP proxy environment", func(t *testing.T) {
name := RandomizedSuffixName("java-no-proxy")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "environment.http-proxy=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(ns, name)()).To(WithTransform(podEnvVars, And(
+ Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -158,15 +160,15 @@ func TestEnvironmentTrait(t *testing.T) {
)))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
envTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "environment")
Expect(envTrait).ToNot(BeNil())
Expect(len(envTrait)).To(Equal(1))
Expect(envTrait["httpProxy"]).To(Equal(false))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/incremental_build_test.go b/e2e/advanced/incremental_build_test.go
index a28510e78..5f627e73d 100644
--- a/e2e/advanced/incremental_build_test.go
+++ b/e2e/advanced/incremental_build_test.go
@@ -36,33 +36,35 @@ import (
)
func TestRunIncrementalBuildRoutine(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-incremental-build"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- Eventually(Kit(ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationKitName := IntegrationKit(t, ns, name)()
+ Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
t.Run("Reuse previous kit", func(t *testing.T) {
nameClone := "java-clone"
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationCloneKitName := IntegrationKit(ns, nameClone)()
+ Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
})
@@ -70,184 +72,190 @@ func TestRunIncrementalBuildRoutine(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationIncrementalKitName := IntegrationKit(ns, nameIncremental)()
+ Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
- // we should be save just to check the substring is contained
- Eventually(Kit(ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ // we should be saving just to check the substring is contained
+ Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildPod(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-incremental-build"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- Eventually(Kit(ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Eventually(BuilderPodsCount(ns)).Should(Equal(1))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationKitName := IntegrationKit(t, ns, name)()
+ Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
t.Run("Reuse previous kit", func(t *testing.T) {
nameClone := RandomizedSuffixName("java-clone")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationCloneKitName := IntegrationKit(ns, nameClone)()
+ Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
- Eventually(BuilderPodsCount(ns)).Should(Equal(1))
+ Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
})
t.Run("Create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationIncrementalKitName := IntegrationKit(ns, nameIncremental)()
+ Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
// we should be save just to check the substring is contained
- Eventually(Kit(ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Eventually(BuilderPodsCount(ns)).Should(Equal(2))
+ Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ Eventually(BuilderPodsCount(t, ns)).Should(Equal(2))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildOff(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-standard-build"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- Eventually(Kit(ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationKitName := IntegrationKit(t, ns, name)()
+ Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
t.Run("Don't reuse previous kit", func(t *testing.T) {
nameClone := RandomizedSuffixName("java-clone")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
"-t", "builder.incremental-image-build=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationCloneKitName := IntegrationKit(ns, nameClone)()
- Eventually(Kit(ns, integrationCloneKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
+ Eventually(Kit(t, ns, integrationCloneKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
})
t.Run("Don't create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
"-t", "builder.incremental-image-build=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationIncrementalKitName := IntegrationKit(ns, nameIncremental)()
- Eventually(Kit(ns, integrationIncrementalKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
+ Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
- operatorID := "camel-k-standard-build"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
+ operatorID := "camel-k-incremental-different-base"
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- Eventually(Kit(ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationKitName := IntegrationKit(t, ns, name)()
+ Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
t.Run("Create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationIncrementalKitName := IntegrationKit(ns, nameIncremental)()
+ Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
// we should be save just to check the substring is contained
- Eventually(Kit(ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
})
t.Run("Create new hierarchy kit", func(t *testing.T) {
// We should spin off a new hierarchy of builds
newBaseImage := "eclipse-temurin:17.0.8.1_1-jdk-ubi9-minimal"
name = RandomizedSuffixName("java-new")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-d", "camel:mongodb",
"-t", fmt.Sprintf("builder.base-image=%s", newBaseImage),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName = IntegrationKit(ns, name)()
- Eventually(Kit(ns, integrationKitName)().Status.BaseImage).Should(Equal(newBaseImage))
- Eventually(Kit(ns, integrationKitName)().Status.RootImage).Should(Equal(newBaseImage))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationKitName = IntegrationKit(t, ns, name)()
+ Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(newBaseImage))
+ Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(newBaseImage))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/integration_profile_test.go b/e2e/advanced/integration_profile_test.go
index b4475fb0f..e26000097 100644
--- a/e2e/advanced/integration_profile_test.go
+++ b/e2e/advanced/integration_profile_test.go
@@ -36,10 +36,12 @@ import (
)
func TestIntegrationProfile(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-integration-profile"
- Expect(KamelInstallWithID(operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
integrationProfile.SetOperatorID(operatorID)
@@ -48,8 +50,8 @@ func TestIntegrationProfile(t *testing.T) {
LimitCPU: "0.2",
}
- Expect(CreateIntegrationProfile(&integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
WithNewTestNamespace(t, func(ns1 string) {
integrationProfile := v1.NewIntegrationProfile(ns1, "ipr-local")
@@ -57,35 +59,35 @@ func TestIntegrationProfile(t *testing.T) {
integrationProfile.Spec.Traits.Container = &traitv1.ContainerTrait{
LimitCPU: "0.1",
}
- Expect(CreateIntegrationProfile(&integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(ns1, "ipr-local"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ Eventually(SelectedIntegrationProfilePhase(t, ns1, "ipr-local"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
t.Run("Run integration with global integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(ns1, "limited", func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
+ Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
containerName := pod.Spec.Containers[0].Name
return containerName == "ck-integration-global"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(ns1, "limited", func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
cpuLimits := pod.Spec.Containers[0].Resources.Limits.Cpu()
return cpuLimits != nil && cpuLimits.AsApproximateFloat64() > 0
}), TestTimeoutShort).Should(BeTrue())
- Expect(Kamel("delete", "limited", "-n", ns1).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
})
t.Run("Run integration with namespace local integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-local", "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-local", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(ns1, "limited", func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
+ Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -93,20 +95,20 @@ func TestIntegrationProfile(t *testing.T) {
return containerName == "integration"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(ns1, "limited", func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
cpuLimits := pod.Spec.Containers[0].Resources.Limits.Cpu()
return cpuLimits != nil && cpuLimits.AsApproximateFloat64() > 0
}), TestTimeoutShort).Should(BeTrue())
- Expect(Kamel("delete", "limited", "-n", ns1).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
})
t.Run("Run integration without integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns1, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(ns1, "normal"), TestTimeoutShort).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(ns1, "normal", func(pod *corev1.Pod) bool {
+ Expect(KamelRunWithID(t, operatorID, ns1, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPod(t, ns1, "normal"), TestTimeoutShort).Should(Not(BeNil()))
+ Eventually(IntegrationPodHas(t, ns1, "normal", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -116,16 +118,18 @@ func TestIntegrationProfile(t *testing.T) {
})
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns1).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
})
})
}
func TestIntegrationProfileInfluencesKit(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-ipr-kit"
- Expect(KamelInstallWithID(operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
integrationProfile.SetOperatorID(operatorID)
@@ -133,42 +137,44 @@ func TestIntegrationProfileInfluencesKit(t *testing.T) {
Properties: []string{"b1=foo"},
}
- Expect(CreateIntegrationProfile(&integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
- Expect(KamelRunWithID(operatorID, ns, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(ns, "normal"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodPhase(ns, "normal"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "normal", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "normal"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPod(t, ns, "normal"), TestTimeoutMedium).Should(Not(BeNil()))
+ Eventually(IntegrationPodPhase(t, ns, "normal"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "normal", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "normal"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Verify that a new kit has been built based on the default base image
- integrationKitName := IntegrationKit(ns, "normal")()
- Eventually(Kit(ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ integrationKitName := IntegrationKit(t, ns, "normal")()
+ Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Expect(KamelRunWithID(operatorID, ns, "--name", "simple", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodPhase(ns, "simple"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "simple", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "simple"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
+ Eventually(IntegrationPodPhase(t, ns, "simple"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "simple", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "simple"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Verify that a new kit has been built based on the previous kit
- integrationKitNameWithProfile := IntegrationKit(ns, "simple")()
+ integrationKitNameWithProfile := IntegrationKit(t, ns, "simple")()
Eventually(integrationKitNameWithProfile).ShouldNot(Equal(integrationKitName))
- Eventually(Kit(ns, integrationKitNameWithProfile)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(ns, integrationKitNameWithProfile)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.RootImage).Should(Equal(defaults.BaseImage()))
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestPropagateIntegrationProfileChanges(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-ipr-changes"
- Expect(KamelInstallWithID(operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "debug-profile")
integrationProfile.SetOperatorID(operatorID)
@@ -179,13 +185,13 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
Level: "DEBUG",
}
- Expect(CreateIntegrationProfile(&integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(ns, "debug-profile"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ Eventually(SelectedIntegrationProfilePhase(t, ns, "debug-profile"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
- Expect(KamelRunWithID(operatorID, ns, "--name", "simple", "--integration-profile", "debug-profile", "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "debug-profile", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(ns, "simple", func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
+ Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -193,13 +199,13 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
return containerName == "ck-ipr"
}), TestTimeoutShort).Should(BeTrue())
- Expect(UpdateIntegrationProfile(ns, func(ipr *v1.IntegrationProfile) {
+ Expect(UpdateIntegrationProfile(t, ns, func(ipr *v1.IntegrationProfile) {
ipr.Spec.Traits.Container = &traitv1.ContainerTrait{
Name: "ck-ipr-new",
}
})).To(Succeed())
- Eventually(IntegrationPodHas(ns, "simple", func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -208,6 +214,6 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/kamelet_repo_test.go b/e2e/advanced/kamelet_repo_test.go
index 08a9ad3d5..532397c43 100644
--- a/e2e/advanced/kamelet_repo_test.go
+++ b/e2e/advanced/kamelet_repo_test.go
@@ -34,39 +34,39 @@ import (
)
func TestKameletFromCustomRepository(t *testing.T) {
- RegisterTestingT(t)
+ t.Parallel()
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
kameletName := "timer-custom-source"
- removeKamelet(kameletName, ns)
+ removeKamelet(t, kameletName, ns)
- Eventually(Kamelet(kameletName, ns)).Should(BeNil())
+ Eventually(Kamelet(t, kameletName, ns)).Should(BeNil())
// Add the custom repository
- Expect(Kamel("kamelet", "add-repo",
+ Expect(Kamel(t, "kamelet", "add-repo",
"github:squakez/ck-kamelet-test-repo/kamelets",
"-n", ns,
"-x", operatorID).Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/TimerCustomKameletIntegration.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "timer-custom-kamelet-integration"), TestTimeoutLong).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerCustomKameletIntegration.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "timer-custom-kamelet-integration"), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "timer-custom-kamelet-integration")).Should(ContainSubstring("hello world"))
+ Eventually(IntegrationLogs(t, ns, "timer-custom-kamelet-integration")).Should(ContainSubstring("hello world"))
// Remove the custom repository
- Expect(Kamel("kamelet", "remove-repo",
+ Expect(Kamel(t, "kamelet", "remove-repo",
"github:squakez/ck-kamelet-test-repo/kamelets",
"-n", ns,
"-x", operatorID).Execute()).To(Succeed())
})
}
-func removeKamelet(name string, ns string) {
- kamelet := Kamelet(name, ns)()
- TestClient().Delete(TestContext, kamelet)
+func removeKamelet(t *testing.T, name string, ns string) {
+ kamelet := Kamelet(t, name, ns)()
+ TestClient(t).Delete(TestContext, kamelet)
}
diff --git a/e2e/advanced/local_platform_test.go b/e2e/advanced/local_platform_test.go
index 64516768e..ddfc20a2a 100644
--- a/e2e/advanced/local_platform_test.go
+++ b/e2e/advanced/local_platform_test.go
@@ -34,54 +34,51 @@ import (
)
func TestLocalPlatform(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-platform-local"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
-
- pl := Platform(ns)()
- pl.Spec.Build.Maven.Properties = make(map[string]string)
- pl.Spec.Build.Maven.Properties["build-global-prop1"] = "build-global-value1"
- // set maximum number of running builds
- pl.Spec.Build.MaxRunningBuilds = 1
- if err := TestClient().Update(TestContext, pl); err != nil {
- t.Error(err)
- t.FailNow()
- }
-
- Eventually(PlatformHas(ns, func(pl *v1.IntegrationPlatform) bool {
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
+ pl.Spec.Build.Maven.Properties = make(map[string]string)
+ pl.Spec.Build.Maven.Properties["build-global-prop1"] = "build-global-value1"
+ // set maximum number of running builds
+ pl.Spec.Build.MaxRunningBuilds = 1
+ })).To(Succeed())
+
+ Eventually(PlatformHas(t, ns, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Build.MaxRunningBuilds == 1
}), TestTimeoutMedium).Should(BeTrue())
WithNewTestNamespace(t, func(ns1 string) {
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID("local-platform", ns1, "--skip-operator-setup").Execute()).To(Succeed())
-
- localPlatform := Platform(ns1)()
- localPlatform.Spec.Build.Maven.Properties = make(map[string]string)
- localPlatform.Spec.Build.Maven.Properties["build-local-prop1"] = "build-local-value1"
- localPlatform.SetOperatorID(operatorID)
-
- localPlatform.Spec.Traits.Container = &traitv1.ContainerTrait{
- LimitCPU: "0.1",
- }
-
- if err := TestClient().Update(TestContext, localPlatform); err != nil {
- t.Error(err)
- t.FailNow()
- }
- Eventually(PlatformPhase(ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Eventually(PlatformHas(ns1, func(pl *v1.IntegrationPlatform) bool {
+ Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup").Execute()).To(Succeed())
+
+ Expect(UpdatePlatform(t, ns1, "local-platform", func(pl *v1.IntegrationPlatform) {
+ pl.Spec.Build.Maven.Properties = make(map[string]string)
+ pl.Spec.Build.Maven.Properties["build-local-prop1"] = "build-local-value1"
+ pl.SetOperatorID(operatorID)
+
+ pl.Spec.Traits.Container = &traitv1.ContainerTrait{
+ LimitCPU: "0.1",
+ }
+ })).To(Succeed())
+
+ Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Cluster != ""
}), TestTimeoutShort).Should(BeTrue())
- Eventually(PlatformHas(ns1, func(pl *v1.IntegrationPlatform) bool {
+ Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Build.MaxRunningBuilds == 1
}), TestTimeoutShort).Should(BeTrue())
- local := Platform(ns1)()
+ pl := PlatformByName(t, ns, operatorID)()
+ local := Platform(t, ns1)()
Expect(local.Status.Build.PublishStrategy).To(Equal(pl.Status.Build.PublishStrategy))
Expect(local.Status.Build.BuildConfiguration.Strategy).To(Equal(pl.Status.Build.BuildConfiguration.Strategy))
Expect(local.Status.Build.BuildConfiguration.OrderStrategy).To(Equal(pl.Status.Build.BuildConfiguration.OrderStrategy))
@@ -92,9 +89,9 @@ func TestLocalPlatform(t *testing.T) {
Expect(local.Status.Build.Maven.Properties["build-global-prop1"]).To(Equal("build-global-value1"))
Expect(local.Status.Build.Maven.Properties["build-local-prop1"]).To(Equal("build-local-value1"))
- Expect(KamelRunWithID(operatorID, ns1, "--name", "local-integration", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(ns1, "local-integration"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(ns1, "local-integration", func(pod *corev1.Pod) bool {
+ Expect(KamelRunWithID(t, operatorID, ns1, "--name", "local-integration", "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPod(t, ns1, "local-integration"), TestTimeoutMedium).Should(Not(BeNil()))
+ Eventually(IntegrationPodHas(t, ns1, "local-integration", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -103,7 +100,7 @@ func TestLocalPlatform(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns1).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/advanced/main_test.go b/e2e/advanced/main_test.go
index d403140de..1127038b2 100644
--- a/e2e/advanced/main_test.go
+++ b/e2e/advanced/main_test.go
@@ -49,20 +49,22 @@ func TestMain(m *testing.M) {
fmt.Printf("Test fast setup failed! - %s\n", message)
})
- g.Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- g.Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- g.Expect(KamelRunWithID(operatorID, ns, "files/timer-source.groovy").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(ns, "timer-source"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(ns, "timer-source", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(ns, "timer-source"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ var t *testing.T
+ g.Expect(TestClient(t)).ShouldNot(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "timer-source"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "timer-source", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "timer-source"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
os.Exit(m.Run())
}
diff --git a/e2e/advanced/maven_http_proxy_test.go b/e2e/advanced/maven_http_proxy_test.go
index 358e7ca17..f3acd57e7 100644
--- a/e2e/advanced/maven_http_proxy_test.go
+++ b/e2e/advanced/maven_http_proxy_test.go
@@ -58,6 +58,8 @@ import (
var httpdTlsMountPath = "/etc/tls/private"
func TestMavenProxy(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
hostname := fmt.Sprintf("%s.%s.svc", "proxy", ns)
@@ -112,21 +114,21 @@ func TestMavenProxy(t *testing.T) {
corev1.TLSPrivateKeyKey: privateKeyPem,
},
}
- Expect(TestClient().Create(TestContext, secret)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
// HTTPD ConfigMap
config := newHTTPDConfigMap(ns, hostname)
- Expect(TestClient().Create(TestContext, config)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
// HTTPD Deployment
deployment := newHTTPDDeployment(ns, config.Name, secret.Name)
- Expect(TestClient().Create(TestContext, deployment)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
service := newHTTPDService(deployment)
- Expect(TestClient().Create(TestContext, service)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Wait for the Deployment to become ready
- Eventually(Deployment(ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Status": MatchFields(IgnoreExtras,
Fields{
@@ -135,7 +137,7 @@ func TestMavenProxy(t *testing.T) {
}),
))
- svc := Service(TestDefaultNamespace, "kubernetes")()
+ svc := Service(t, TestDefaultNamespace, "kubernetes")()
Expect(svc).NotTo(BeNil())
// It may be needed to populate the values from the cluster, machine and service network CIDRs
@@ -148,11 +150,11 @@ func TestMavenProxy(t *testing.T) {
// Install Camel K with the HTTP proxy
operatorID := "camel-k-maven-proxy"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- olm, olmErr := olm.IsAPIAvailable(TestClient())
- installed, inErr := kubernetes.IsAPIResourceInstalled(TestClient(), configv1.GroupVersion.String(), reflect.TypeOf(configv1.Proxy{}).Name())
- permission, pErr := kubernetes.CheckPermission(TestContext, TestClient(), configv1.GroupName, reflect.TypeOf(configv1.Proxy{}).Name(), "", "cluster", "edit")
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ olm, olmErr := olm.IsAPIAvailable(TestClient(t))
+ installed, inErr := kubernetes.IsAPIResourceInstalled(TestClient(t), configv1.GroupVersion.String(), reflect.TypeOf(configv1.Proxy{}).Name())
+ permission, pErr := kubernetes.CheckPermission(TestContext, TestClient(t), configv1.GroupName, reflect.TypeOf(configv1.Proxy{}).Name(), "", "cluster", "edit")
olmInstall := pErr == nil && olmErr == nil && inErr == nil && olm && installed && permission
var defaultProxy configv1.Proxy
if olmInstall {
@@ -161,12 +163,12 @@ func TestMavenProxy(t *testing.T) {
key := ctrl.ObjectKey{
Name: "cluster",
}
- Expect(TestClient().Get(TestContext, key, &defaultProxy)).To(Succeed())
+ Expect(TestClient(t).Get(TestContext, key, &defaultProxy)).To(Succeed())
newProxy := defaultProxy.DeepCopy()
newProxy.Spec.HTTPProxy = fmt.Sprintf("http://%s", hostname)
newProxy.Spec.NoProxy = strings.Join(noProxy, ",")
- Expect(TestClient().Update(TestContext, newProxy))
+ Expect(TestClient(t).Update(TestContext, newProxy))
defer func() {
//
@@ -175,13 +177,13 @@ func TestMavenProxy(t *testing.T) {
// does not work on some platforms, eg. OCP4
//
patch := []byte(`[{"op": "replace","path": "/spec","value": {}},{"op": "replace","path": "/status","value": {}}]`)
- TestClient().Patch(TestContext, &defaultProxy, ctrl.RawPatch(types.JSONPatchType, patch))
+ TestClient(t).Patch(TestContext, &defaultProxy, ctrl.RawPatch(types.JSONPatchType, patch))
}()
// ENV values should be injected by the OLM
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
} else {
- Expect(KamelInstallWithID(operatorID, ns,
+ Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=http://%s", hostname),
// TODO: enable TLS for the HTTPS proxy when Maven supports it
// "--operator-env-vars", fmt.Sprintf("HTTPS_PROXY=https://%s", hostname),
@@ -190,15 +192,15 @@ func TestMavenProxy(t *testing.T) {
).Execute()).To(Succeed())
}
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the Integration
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
proxies := corev1.PodList{
TypeMeta: metav1.TypeMeta{
@@ -206,23 +208,23 @@ func TestMavenProxy(t *testing.T) {
APIVersion: corev1.SchemeGroupVersion.String(),
},
}
- err = TestClient().List(TestContext, &proxies,
+ err = TestClient(t).List(TestContext, &proxies,
ctrl.InNamespace(ns),
ctrl.MatchingLabels(deployment.Spec.Selector.MatchLabels),
)
Expect(err).To(Succeed())
Expect(proxies.Items).To(HaveLen(1))
- logs := Logs(ns, proxies.Items[0].Name, corev1.PodLogOptions{})()
+ logs := Logs(t, ns, proxies.Items[0].Name, corev1.PodLogOptions{})()
Expect(logs).NotTo(BeEmpty())
Expect(logs).To(ContainSubstring("\"CONNECT repo.maven.apache.org:443 HTTP/1.1\" 200"))
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient().Delete(TestContext, deployment)).To(Succeed())
- Expect(TestClient().Delete(TestContext, service)).To(Succeed())
- Expect(TestClient().Delete(TestContext, secret)).To(Succeed())
- Expect(TestClient().Delete(TestContext, config)).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
})
}
diff --git a/e2e/advanced/operator_id_filtering_test.go b/e2e/advanced/operator_id_filtering_test.go
index 970dd229d..95c9aff77 100644
--- a/e2e/advanced/operator_id_filtering_test.go
+++ b/e2e/advanced/operator_id_filtering_test.go
@@ -35,91 +35,93 @@ import (
)
func TestOperatorIDCamelCatalogReconciliation(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Eventually(DefaultCamelCatalogPhase(ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
})
}
func TestOperatorIDFiltering(t *testing.T) {
- RegisterTestingT(t)
+ t.Parallel()
WithNewTestNamespace(t, func(ns string) {
WithNewTestNamespace(t, func(nsop1 string) {
operator1 := "operator-1"
- Expect(CopyCamelCatalog(nsop1, operator1)).To(Succeed())
- Expect(CopyIntegrationKits(nsop1, operator1)).To(Succeed())
- Expect(KamelInstallWithIDAndKameletCatalog(operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, nsop1, operator1)).To(Succeed())
+ Expect(CopyIntegrationKits(t, nsop1, operator1)).To(Succeed())
+ Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
WithNewTestNamespace(t, func(nsop2 string) {
operator2 := "operator-2"
- Expect(CopyCamelCatalog(nsop2, operator2)).To(Succeed())
- Expect(CopyIntegrationKits(nsop2, operator2)).To(Succeed())
- Expect(KamelInstallWithIDAndKameletCatalog(operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, nsop2, operator2)).To(Succeed())
+ Expect(CopyIntegrationKits(t, nsop2, operator2)).To(Succeed())
+ Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Operators ignore non-scoped integrations", func(t *testing.T) {
- Expect(KamelRunWithID("operator-x", ns, "files/yaml.yaml", "--name", "untouched", "--force").Execute()).To(Succeed())
- Consistently(IntegrationPhase(ns, "untouched"), 10*time.Second).Should(BeEmpty())
+ Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "untouched", "--force").Execute()).To(Succeed())
+ Consistently(IntegrationPhase(t, ns, "untouched"), 10*time.Second).Should(BeEmpty())
})
t.Run("Operators run scoped integrations", func(t *testing.T) {
- Expect(KamelRunWithID("operator-x", ns, "files/yaml.yaml", "--name", "moving", "--force").Execute()).To(Succeed())
- Expect(AssignIntegrationToOperator(ns, "moving", operator1)).To(Succeed())
- Eventually(IntegrationPhase(ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "moving", "--force").Execute()).To(Succeed())
+ Expect(AssignIntegrationToOperator(t, ns, "moving", operator1)).To(Succeed())
+ Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("Operators can handoff scoped integrations", func(t *testing.T) {
- Expect(AssignIntegrationToOperator(ns, "moving", operator2)).To(Succeed())
- Eventually(IntegrationPhase(ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseBuildingKit))
- Eventually(IntegrationPhase(ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(AssignIntegrationToOperator(t, ns, "moving", operator2)).To(Succeed())
+ Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("Operators can be deactivated after completely handing off scoped integrations", func(t *testing.T) {
- Expect(ScaleOperator(nsop1, 0)).To(Succeed())
- Expect(Kamel("rebuild", "-n", ns, "moving").Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(ScaleOperator(nsop1, 1)).To(Succeed())
+ Expect(ScaleOperator(t, nsop1, 0)).To(Succeed())
+ Expect(Kamel(t, "rebuild", "-n", ns, "moving").Execute()).To(Succeed())
+ Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(ScaleOperator(t, nsop1, 1)).To(Succeed())
})
t.Run("Operators can run scoped integrations with fixed image", func(t *testing.T) {
- image := IntegrationPodImage(ns, "moving")()
+ image := IntegrationPodImage(t, ns, "moving")()
Expect(image).NotTo(BeEmpty())
// Save resources by deleting "moving" integration
- Expect(Kamel("delete", "moving", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "moving", "-n", ns).Execute()).To(Succeed())
- Expect(KamelRunWithID("operator-x", ns, "files/yaml.yaml", "--name", "pre-built", "--force",
+ Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "pre-built", "--force",
"-t", fmt.Sprintf("container.image=%s", image), "-t", "jvm.enabled=true").Execute()).To(Succeed())
- Consistently(IntegrationPhase(ns, "pre-built"), 10*time.Second).Should(BeEmpty())
- Expect(AssignIntegrationToOperator(ns, "pre-built", operator2)).To(Succeed())
- Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "pre-built"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel("delete", "pre-built", "-n", ns).Execute()).To(Succeed())
+ Consistently(IntegrationPhase(t, ns, "pre-built"), 10*time.Second).Should(BeEmpty())
+ Expect(AssignIntegrationToOperator(t, ns, "pre-built", operator2)).To(Succeed())
+ Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "pre-built"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
})
t.Run("Operators can run scoped Pipes", func(t *testing.T) {
- Expect(KamelBindWithID("operator-x", ns, "timer-source?message=Hello", "log-sink",
+ Expect(KamelBindWithID(t, "operator-x", ns, "timer-source?message=Hello", "log-sink",
"--name", "klb", "--force").Execute()).To(Succeed())
- Consistently(Integration(ns, "klb"), 10*time.Second).Should(BeNil())
+ Consistently(Integration(t, ns, "klb"), 10*time.Second).Should(BeNil())
- Expect(AssignPipeToOperator(ns, "klb", operator1)).To(Succeed())
- Eventually(Integration(ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(IntegrationPhase(ns, "klb"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "klb"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(AssignPipeToOperator(t, ns, "klb", operator1)).To(Succeed())
+ Eventually(Integration(t, ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(IntegrationPhase(t, ns, "klb"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(t, ns, "klb"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
})
})
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/operator_metrics_test.go b/e2e/advanced/operator_metrics_test.go
index 182812577..af5454448 100644
--- a/e2e/advanced/operator_metrics_test.go
+++ b/e2e/advanced/operator_metrics_test.go
@@ -52,30 +52,30 @@ import (
* Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment.
*/
func TestMetrics(t *testing.T) {
+ t.Parallel()
+
if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" {
t.Skip("WARNING: Test marked as problematic ... skipping")
}
- RegisterTestingT(t)
-
WithNewTestNamespace(t, func(ns string) {
name := RandomizedSuffixName("java")
operatorID := "camel-k-metrics"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns, "--log-level", "debug").Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug").Execute()).To(Succeed())
+ Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "prometheus.enabled=true",
"-t", "prometheus.pod-monitor=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := OperatorPod(ns)()
+ pod := OperatorPod(t, ns)()
Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
@@ -83,19 +83,19 @@ func TestMetrics(t *testing.T) {
logOptions := &corev1.PodLogOptions{
Container: "camel-k-operator",
}
- logs, err := StructuredLogs(pod.Namespace, pod.Name, logOptions, false)
+ logs, err := StructuredLogs(t, pod.Namespace, pod.Name, logOptions, false)
Expect(err).To(BeNil())
Expect(logs).NotTo(BeEmpty())
- response, err := TestClient().CoreV1().RESTClient().Get().
+ response, err := TestClient(t).CoreV1().RESTClient().Get().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/metrics", pod.Namespace, pod.Name)).DoRaw(TestContext)
Expect(err).To(BeNil())
metrics, err := parsePrometheusData(response)
Expect(err).To(BeNil())
- it := Integration(ns, name)()
+ it := Integration(t, ns, name)()
Expect(it).NotTo(BeNil())
- build := Build(ns, it.Status.IntegrationKit.Name)()
+ build := Build(t, ns, it.Status.IntegrationKit.Name)()
Expect(build).NotTo(BeNil())
t.Run("Build duration metric", func(t *testing.T) {
@@ -541,7 +541,7 @@ func TestMetrics(t *testing.T) {
})
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/platform_traits_test.go b/e2e/advanced/platform_traits_test.go
index 0e0ef5d16..1f12d07a7 100644
--- a/e2e/advanced/platform_traits_test.go
+++ b/e2e/advanced/platform_traits_test.go
@@ -36,36 +36,38 @@ import (
)
func TestTraitOnIntegrationPlatform(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-platform-trait-test"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
containerTestName := "testname"
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- ip := Platform(ns)()
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ ip := Platform(t, ns)()
ip.Spec.Traits = v1.Traits{Logging: &trait.LoggingTrait{Level: "DEBUG"}, Container: &trait.ContainerTrait{Name: containerTestName}}
- if err := TestClient().Update(TestContext, ip); err != nil {
+ if err := TestClient(t).Update(TestContext, ip); err != nil {
t.Fatal("Can't create IntegrationPlatform", err)
}
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
t.Run("Run integration with platform traits", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(ns, name)().Spec.Containers[0].Name).To(BeEquivalentTo(containerTestName))
+ Expect(IntegrationPod(t, ns, name)().Spec.Containers[0].Name).To(BeEquivalentTo(containerTestName))
found := false
- for _, env := range IntegrationPod(ns, name)().Spec.Containers[0].Env {
+ for _, env := range IntegrationPod(t, ns, name)().Spec.Containers[0].Env {
if env.Name == "QUARKUS_LOG_LEVEL" {
Expect(env.Value).To(BeEquivalentTo("DEBUG"))
found = true
@@ -73,9 +75,9 @@ func TestTraitOnIntegrationPlatform(t *testing.T) {
}
}
Expect(found).To(BeTrue(), "Can't find QUARKUS_LOG_LEVEL ENV variable")
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("DEBUG"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("DEBUG"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/advanced/promote_test.go b/e2e/advanced/promote_test.go
index 40b4124c8..e5ea4ee52 100644
--- a/e2e/advanced/promote_test.go
+++ b/e2e/advanced/promote_test.go
@@ -34,144 +34,146 @@ import (
)
func TestKamelCLIPromote(t *testing.T) {
+ t.Parallel()
+
one := int64(1)
two := int64(2)
// Dev environment namespace
WithNewTestNamespace(t, func(nsDev string) {
operatorDevID := "camel-k-cli-promote-dev"
- Expect(CopyCamelCatalog(nsDev, operatorDevID)).To(Succeed())
- Expect(CopyIntegrationKits(nsDev, operatorDevID)).To(Succeed())
- Expect(KamelInstallWithID(operatorDevID, nsDev).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, nsDev, operatorDevID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, nsDev, operatorDevID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorDevID, nsDev).Execute()).To(Succeed())
+ Eventually(SelectedPlatformPhase(t, nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Dev content configmap
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "I am development configmap!"
- CreatePlainTextConfigmap(nsDev, "my-cm-promote", cmData)
+ CreatePlainTextConfigmap(t, nsDev, "my-cm-promote", cmData)
// Dev secret
var secData = make(map[string]string)
secData["my-secret-key"] = "very top secret development"
- CreatePlainTextSecret(nsDev, "my-sec-promote", secData)
+ CreatePlainTextSecret(t, nsDev, "my-sec-promote", secData)
t.Run("plain integration dev", func(t *testing.T) {
- Expect(KamelRunWithID(operatorDevID, nsDev, "./files/promote-route.groovy",
+ Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route.groovy",
"--config", "configmap:my-cm-promote",
"--config", "secret:my-sec-promote",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationObservedGeneration(nsDev, "promote-route")).Should(Equal(&one))
- //Eventually(IntegrationConditionStatus(nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
- Eventually(IntegrationLogs(nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret development"))
+ Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&one))
+ //Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
+ Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret development"))
})
t.Run("kamelet integration dev", func(t *testing.T) {
- Expect(CreateTimerKamelet(nsDev, "my-own-timer-source")()).To(Succeed())
- Expect(KamelRunWithID(operatorDevID, nsDev, "./files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(nsDev, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ Expect(CreateTimerKamelet(t, nsDev, "my-own-timer-source")()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, nsDev, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
})
t.Run("binding dev", func(t *testing.T) {
- Expect(CreateTimerKamelet(nsDev, "kb-timer-source")()).To(Succeed())
- Expect(KamelBindWithID(operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
+ Expect(CreateTimerKamelet(t, nsDev, "kb-timer-source")()).To(Succeed())
+ Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
})
// Prod environment namespace
WithNewTestNamespace(t, func(nsProd string) {
operatorProdID := "camel-k-cli-promote-prod"
- Expect(CopyCamelCatalog(nsProd, operatorProdID)).To(Succeed())
- Expect(CopyIntegrationKits(nsProd, operatorProdID)).To(Succeed())
- Expect(KamelInstallWithID(operatorProdID, nsProd).Execute()).To(Succeed())
- Eventually(PlatformPhase(nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, nsProd, operatorProdID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, nsProd, operatorProdID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorProdID, nsProd).Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("no configmap in destination", func(t *testing.T) {
- Expect(Kamel("promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
+ Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
})
// Prod content configmap
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "I am production!"
- CreatePlainTextConfigmap(nsProd, "my-cm-promote", cmData)
+ CreatePlainTextConfigmap(t, nsProd, "my-cm-promote", cmData)
t.Run("no secret in destination", func(t *testing.T) {
- Expect(Kamel("promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
+ Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
})
// Prod secret
var secData = make(map[string]string)
secData["my-secret-key"] = "very top secret production"
- CreatePlainTextSecret(nsProd, "my-sec-promote", secData)
+ CreatePlainTextSecret(t, nsProd, "my-sec-promote", secData)
t.Run("plain integration promotion", func(t *testing.T) {
- Expect(Kamel("promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationObservedGeneration(nsProd, "promote-route")).Should(Equal(&one))
- Eventually(IntegrationPodPhase(nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production!"))
- Eventually(IntegrationLogs(nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret production"))
+ Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
+ Eventually(IntegrationObservedGeneration(t, nsProd, "promote-route")).Should(Equal(&one))
+ Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production!"))
+ Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret production"))
// They must use the same image
- Expect(IntegrationPodImage(nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(nsDev, "promote-route")()))
+ Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
})
t.Run("plain integration promotion update", func(t *testing.T) {
// We need to update the Integration CR in order the operator to restart it both in dev and prod envs
- Expect(KamelRunWithID(operatorDevID, nsDev, "./files/promote-route-edited.groovy", "--name", "promote-route",
+ Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route-edited.groovy", "--name", "promote-route",
"--config", "configmap:my-cm-promote").Execute()).To(Succeed())
// The generation has to be incremented
- Eventually(IntegrationObservedGeneration(nsDev, "promote-route")).Should(Equal(&two))
- Eventually(IntegrationPodPhase(nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
+ Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
+ Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
// Update the configmap only in prod
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "I am production, but I was updated!"
- UpdatePlainTextConfigmap(nsProd, "my-cm-promote", cmData)
+ UpdatePlainTextConfigmap(t, nsProd, "my-cm-promote", cmData)
// Promote the edited Integration
- Expect(Kamel("promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
+ Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
// The generation has to be incremented also in prod
- Eventually(IntegrationObservedGeneration(nsDev, "promote-route")).Should(Equal(&two))
- Eventually(IntegrationPodPhase(nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production, but I was updated!"))
+ Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
+ Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production, but I was updated!"))
// They must use the same image
- Expect(IntegrationPodImage(nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(nsDev, "promote-route")()))
+ Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
})
t.Run("no kamelet in destination", func(t *testing.T) {
- Expect(Kamel("promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).NotTo(Succeed())
+ Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).NotTo(Succeed())
})
t.Run("kamelet integration promotion", func(t *testing.T) {
- Expect(CreateTimerKamelet(nsProd, "my-own-timer-source")()).To(Succeed())
- Expect(Kamel("promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(nsProd, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(nsProd, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ Expect(CreateTimerKamelet(t, nsProd, "my-own-timer-source")()).To(Succeed())
+ Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, nsProd, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, nsProd, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
// They must use the same image
- Expect(IntegrationPodImage(nsProd, "timer-kamelet-usage")()).Should(Equal(IntegrationPodImage(nsDev, "timer-kamelet-usage")()))
+ Expect(IntegrationPodImage(t, nsProd, "timer-kamelet-usage")()).Should(Equal(IntegrationPodImage(t, nsDev, "timer-kamelet-usage")()))
})
t.Run("no kamelet for binding in destination", func(t *testing.T) {
- Expect(Kamel("promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
+ Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
})
t.Run("binding promotion", func(t *testing.T) {
- Expect(CreateTimerKamelet(nsProd, "kb-timer-source")()).To(Succeed())
- Expect(Kamel("promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
+ Expect(CreateTimerKamelet(t, nsProd, "kb-timer-source")()).To(Succeed())
+ Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
// They must use the same image
- Expect(IntegrationPodImage(nsProd, "kb-timer-source-to-log")()).Should(Equal(IntegrationPodImage(nsDev, "kb-timer-source-to-log")()))
+ Expect(IntegrationPodImage(t, nsProd, "kb-timer-source-to-log")()).Should(Equal(IntegrationPodImage(t, nsDev, "kb-timer-source-to-log")()))
//Binding update
- Expect(KamelBindWithID(operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks-again").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
- Expect(Kamel("promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
+ Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks-again").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
+ Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
})
})
})
diff --git a/e2e/advanced/reset_test.go b/e2e/advanced/reset_test.go
index 4768ec0f7..3c866768c 100644
--- a/e2e/advanced/reset_test.go
+++ b/e2e/advanced/reset_test.go
@@ -33,60 +33,62 @@ import (
)
func TestKamelReset(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-cli-reset"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Reset the whole platform", func(t *testing.T) {
name := RandomizedSuffixName("yaml1")
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, IntegrationKit(ns, name)())).Should(Not(BeNil()))
- Eventually(Integration(ns, name)).Should(Not(BeNil()))
+ Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
+ Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
- Expect(Integration(ns, name)()).To(BeNil())
- Expect(Kits(ns)()).To(HaveLen(0))
+ Expect(Integration(t, ns, name)()).To(BeNil())
+ Expect(Kits(t, ns)()).To(HaveLen(0))
})
t.Run("Reset skip-integrations", func(t *testing.T) {
name := RandomizedSuffixName("yaml2")
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(ns, IntegrationKit(ns, name)())).Should(Not(BeNil()))
- Eventually(Integration(ns, name)).Should(Not(BeNil()))
+ Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
+ Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel("reset", "-n", ns, "--skip-integrations").Execute()).To(Succeed())
+ Expect(Kamel(t, "reset", "-n", ns, "--skip-integrations").Execute()).To(Succeed())
- Expect(Integration(ns, name)()).To(Not(BeNil()))
- Expect(Kits(ns)()).To(HaveLen(0))
+ Expect(Integration(t, ns, name)()).To(Not(BeNil()))
+ Expect(Kits(t, ns)()).To(HaveLen(0))
})
t.Run("Reset skip-kits", func(t *testing.T) {
name := RandomizedSuffixName("yaml3")
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- kitName := IntegrationKit(ns, name)()
- Eventually(Kit(ns, kitName)).Should(Not(BeNil()))
- Eventually(Integration(ns, name)).Should(Not(BeNil()))
+ kitName := IntegrationKit(t, ns, name)()
+ Eventually(Kit(t, ns, kitName)).Should(Not(BeNil()))
+ Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel("reset", "-n", ns, "--skip-kits").Execute()).To(Succeed())
+ Expect(Kamel(t, "reset", "-n", ns, "--skip-kits").Execute()).To(Succeed())
- Expect(Integration(ns, name)()).To(BeNil())
- Expect(Kit(ns, kitName)()).To(Not(BeNil()))
+ Expect(Integration(t, ns, name)()).To(BeNil())
+ Expect(Kit(t, ns, kitName)()).To(Not(BeNil()))
})
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/synthetic_test.go b/e2e/advanced/synthetic_test.go
index 236a1fae8..a1f25eeb4 100644
--- a/e2e/advanced/synthetic_test.go
+++ b/e2e/advanced/synthetic_test.go
@@ -35,18 +35,19 @@ import (
)
func TestSyntheticIntegrationOff(t *testing.T) {
- RegisterTestingT(t)
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
// Install Camel K without synthetic Integration feature variable (default)
operatorID := "camel-k-synthetic-env-off"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the external deployment
ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
- Eventually(DeploymentCondition(ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
+ Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
@@ -54,7 +55,7 @@ func TestSyntheticIntegrationOff(t *testing.T) {
// Label the deployment --> Verify the Integration is not created
ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(Integration(ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
})
}
func TestSyntheticIntegrationFromDeployment(t *testing.T) {
@@ -62,15 +63,15 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// Install Camel K with the synthetic Integration feature variable
operatorID := "camel-k-synthetic-env"
- Expect(CopyCamelCatalog(ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns,
+ Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", "CAMEL_K_SYNTHETIC_INTEGRATIONS=true",
).Execute()).To(Succeed())
// Run the external deployment
ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
- Eventually(DeploymentCondition(ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
+ Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
@@ -78,47 +79,47 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
// Label the deployment --> Verify the Integration is created (cannot still monitor)
ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(IntegrationPhase(ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(
+ Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionMonitoringPodsAvailableReason)))
// Label the deployment template --> Verify the Integration is monitored
ExpectExecSucceed(t, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
- Eventually(IntegrationPhase(ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
one := int32(1)
- Eventually(IntegrationStatusReplicas(ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Delete the deployment --> Verify the Integration is eventually garbage collected
ExpectExecSucceed(t, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
- Eventually(Integration(ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
// Recreate the deployment and label --> Verify the Integration is monitored
ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
ExpectExecSucceed(t, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
- Eventually(IntegrationPhase(ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationStatusReplicas(ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Remove label from the deployment --> Verify the Integration is deleted
ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration-", "-n", ns))
- Eventually(Integration(ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
// Add label back to the deployment --> Verify the Integration is created
ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(IntegrationPhase(ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationStatusReplicas(ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Scale the deployment --> verify replicas are correctly set
ExpectExecSucceed(t, Kubectl("scale", "deploy", "my-camel-sb-svc", "--replicas", "2", "-n", ns))
two := int32(2)
- Eventually(IntegrationStatusReplicas(ns, "my-it"), TestTimeoutShort).Should(Equal(&two))
+ Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&two))
// Delete Integration and deployments --> verify no Integration exists any longer
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
ExpectExecSucceed(t, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
- Eventually(Integration(ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
})
}
diff --git a/e2e/advanced/tekton_test.go b/e2e/advanced/tekton_test.go
index f9e84e299..4f075a11c 100644
--- a/e2e/advanced/tekton_test.go
+++ b/e2e/advanced/tekton_test.go
@@ -33,16 +33,16 @@ import (
// TestTektonLikeBehavior verifies that the kamel binary can be invoked from within the Camel K image.
// This feature is used in Tekton pipelines.
func TestTektonLikeBehavior(t *testing.T) {
- RegisterTestingT(t)
+ t.Parallel()
WithNewTestNamespace(t, func(ns string) {
- Expect(CreateOperatorServiceAccount(ns)).To(Succeed())
- Expect(CreateOperatorRole(ns)).To(Succeed())
- Expect(CreateOperatorRoleBinding(ns)).To(Succeed())
+ Expect(CreateOperatorServiceAccount(t, ns)).To(Succeed())
+ Expect(CreateOperatorRole(t, ns)).To(Succeed())
+ Expect(CreateOperatorRoleBinding(t, ns)).To(Succeed())
- Eventually(OperatorPod(ns)).Should(BeNil())
- Expect(CreateKamelPod(ns, "tekton-task", "install", "--skip-cluster-setup", "--force")).To(Succeed())
+ Eventually(OperatorPod(t, ns)).Should(BeNil())
+ Expect(CreateKamelPod(t, ns, "tekton-task", "install", "--skip-cluster-setup", "--force")).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
})
}
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index c90f91f3d..709054b17 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -43,13 +43,13 @@ type kitOptions struct {
func TestKitMaxBuildLimit(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
- createOperator(ns, "8m0s", "--global", "--force")
+ createOperator(t, ns, "8m0s", "--global", "--force")
- pl := Platform(ns)()
+ pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
pl.Spec.Build.MaxRunningBuilds = 2
pl.Spec.Build.BuildConfiguration.OrderStrategy = v1.BuildOrderStrategySequential
- if err := TestClient().Update(TestContext, pl); err != nil {
+ if err := TestClient(t).Update(TestContext, pl); err != nil {
t.Error(err)
t.FailNow()
}
@@ -64,25 +64,25 @@ func TestKitMaxBuildLimit(t *testing.T) {
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 {
+ if err := TestClient(t).Create(TestContext, &pl1); err != nil {
t.Error(err)
t.FailNow()
}
- Eventually(PlatformPhase(ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(PlatformPhase(t, 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 {
+ if err := TestClient(t).Create(TestContext, &pl2); err != nil {
t.Error(err)
t.FailNow()
}
- Eventually(PlatformPhase(ns2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(PlatformPhase(t, ns2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- doKitBuildInNamespace(buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -92,7 +92,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(buildB, ns1, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildB, ns1, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -102,7 +102,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(buildC, ns2, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildC, ns2, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -117,27 +117,27 @@ func TestKitMaxBuildLimit(t *testing.T) {
}
limit := 0
- for limit < 5 && BuildPhase(ns, buildA)() == v1.BuildPhaseRunning {
+ for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(ns, buildA), BuildPhase(ns1, buildB), BuildPhase(ns2, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns1, buildB), BuildPhase(t, ns2, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
// make sure we have verified max build limit at least once
if limit == 0 {
- t.Error(errors.New(fmt.Sprintf("Unexpected build phase '%s' for %s - not able to verify max builds limit", BuildPhase(ns, buildA)(), buildA)))
+ t.Error(errors.New(fmt.Sprintf("Unexpected build phase '%s' for %s - not able to verify max builds limit", BuildPhase(t, ns, buildA)(), buildA)))
t.FailNow()
}
// verify that all builds are successful
- Eventually(BuildPhase(ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(ns1, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns1, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(ns2, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns2, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
})
})
@@ -145,13 +145,13 @@ func TestKitMaxBuildLimit(t *testing.T) {
func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
- createOperator(ns, "8m0s", "--global", "--force")
+ createOperator(t, ns, "8m0s", "--global", "--force")
- pl := Platform(ns)()
+ pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
pl.Spec.Build.MaxRunningBuilds = 2
pl.Spec.Build.BuildConfiguration.OrderStrategy = v1.BuildOrderStrategyFIFO
- if err := TestClient().Update(TestContext, pl); err != nil {
+ if err := TestClient(t).Update(TestContext, pl); err != nil {
t.Error(err)
t.FailNow()
}
@@ -160,7 +160,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -170,7 +170,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -180,7 +180,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -195,37 +195,37 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
}
limit := 0
- for limit < 5 && BuildPhase(ns, buildA)() == v1.BuildPhaseRunning {
+ for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(ns, buildA), BuildPhase(ns, buildB), BuildPhase(ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
// make sure we have verified max build limit at least once
if limit == 0 {
- t.Error(errors.New(fmt.Sprintf("Unexpected build phase '%s' for %s - not able to verify max builds limit", BuildPhase(ns, buildA)(), buildA)))
+ t.Error(errors.New(fmt.Sprintf("Unexpected build phase '%s' for %s - not able to verify max builds limit", BuildPhase(t, ns, buildA)(), buildA)))
t.FailNow()
}
// verify that all builds are successful
- Eventually(BuildPhase(ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
}
func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
- createOperator(ns, "8m0s", "--global", "--force")
+ createOperator(t, ns, "8m0s", "--global", "--force")
- pl := Platform(ns)()
+ pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
pl.Spec.Build.MaxRunningBuilds = 2
pl.Spec.Build.BuildConfiguration.OrderStrategy = v1.BuildOrderStrategyDependencies
- if err := TestClient().Update(TestContext, pl); err != nil {
+ if err := TestClient(t).Update(TestContext, pl); err != nil {
t.Error(err)
t.FailNow()
}
@@ -234,7 +234,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -244,7 +244,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:cron", "camel:log", "camel:joor",
@@ -254,7 +254,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log", "camel:joor", "camel:http",
@@ -269,37 +269,37 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
}
limit := 0
- for limit < 5 && BuildPhase(ns, buildA)() == v1.BuildPhaseRunning {
+ for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(ns, buildA), BuildPhase(ns, buildB), BuildPhase(ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
// make sure we have verified max build limit at least once
if limit == 0 {
- t.Error(errors.New(fmt.Sprintf("Unexpected build phase '%s' for %s - not able to verify max builds limit", BuildPhase(ns, buildA)(), buildA)))
+ t.Error(errors.New(fmt.Sprintf("Unexpected build phase '%s' for %s - not able to verify max builds limit", BuildPhase(t, ns, buildA)(), buildA)))
t.FailNow()
}
// verify that all builds are successful
- Eventually(BuildPhase(ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
}
func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
- createOperator(ns, "8m0s", "--global", "--force")
+ createOperator(t, ns, "8m0s", "--global", "--force")
- pl := Platform(ns)()
+ pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
pl.Spec.Build.MaxRunningBuilds = 1
pl.Spec.Build.BuildConfiguration.OrderStrategy = v1.BuildOrderStrategyFIFO
- if err := TestClient().Update(TestContext, pl); err != nil {
+ if err := TestClient(t).Update(TestContext, pl); err != nil {
t.Error(err)
t.FailNow()
}
@@ -308,7 +308,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -318,7 +318,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:cron", "camel:log", "camel:joor",
@@ -328,7 +328,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
},
}, v1.BuildPhaseScheduling, v1.IntegrationKitPhaseNone)
- doKitBuildInNamespace(buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log", "camel:joor", "camel:http",
@@ -339,24 +339,24 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
}, v1.BuildPhaseScheduling, v1.IntegrationKitPhaseNone)
// verify that last build is waiting
- Eventually(BuildConditions(ns, buildC), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(BuildConditions(t, ns, buildC), TestTimeoutMedium).ShouldNot(BeNil())
Eventually(
- BuildCondition(ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Status,
+ BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
Eventually(
- BuildCondition(ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Reason,
+ BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Reason,
TestTimeoutShort).Should(Equal(v1.BuildConditionWaitingReason))
// verify that last build is scheduled
- Eventually(BuildPhase(ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildConditions(ns, buildC), TestTimeoutLong).ShouldNot(BeNil())
+ Eventually(BuildConditions(t, ns, buildC), TestTimeoutLong).ShouldNot(BeNil())
Eventually(
- BuildCondition(ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Status,
+ BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(
- BuildCondition(ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Reason,
+ BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Reason,
TestTimeoutShort).Should(Equal(v1.BuildConditionReadyReason))
})
}
@@ -393,21 +393,21 @@ func doKitFullBuild(t *testing.T, name string, buildTimeout string, testTimeout
t.Helper()
WithNewTestNamespace(t, func(ns string) {
- createOperator(ns, buildTimeout)
- doKitBuildInNamespace(name, ns, testTimeout, options, buildPhase, kitPhase)
+ createOperator(t, ns, buildTimeout)
+ doKitBuildInNamespace(t, name, ns, testTimeout, options, buildPhase, kitPhase)
})
}
-func createOperator(ns string, buildTimeout string, installArgs ...string) {
+func createOperator(t *testing.T, ns string, buildTimeout string, installArgs ...string) {
args := []string{"--build-timeout", buildTimeout}
args = append(args, installArgs...)
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, args...).Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Expect(KamelInstallWithID(t, operatorID, ns, args...).Execute()).To(Succeed())
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
}
-func doKitBuildInNamespace(name string, ns string, testTimeout time.Duration, options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
+func doKitBuildInNamespace(t *testing.T, name string, ns string, testTimeout time.Duration, options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
buildKitArgs := []string{"kit", "create", name, "-n", ns}
for _, dependency := range options.dependencies {
@@ -423,13 +423,13 @@ func doKitBuildInNamespace(name string, ns string, testTimeout time.Duration, op
buildKitArgs = append(buildKitArgs, "--operator-id", fmt.Sprintf("camel-k-%s", ns))
}
- Expect(Kamel(buildKitArgs...).Execute()).To(Succeed())
+ Expect(Kamel(t, buildKitArgs...).Execute()).To(Succeed())
- Eventually(Build(ns, name), testTimeout).ShouldNot(BeNil())
+ Eventually(Build(t, ns, name), testTimeout).ShouldNot(BeNil())
if buildPhase != v1.BuildPhaseNone {
- Eventually(BuildPhase(ns, name), testTimeout).Should(Equal(buildPhase))
+ Eventually(BuildPhase(t, ns, name), testTimeout).Should(Equal(buildPhase))
}
if kitPhase != v1.IntegrationKitPhaseNone {
- Eventually(KitPhase(ns, name), testTimeout).Should(Equal(kitPhase))
+ Eventually(KitPhase(t, ns, name), testTimeout).Should(Equal(kitPhase))
}
}
diff --git a/e2e/builder/registry_test.go b/e2e/builder/registry_test.go
index b587e8262..1d4c5b3bf 100644
--- a/e2e/builder/registry_test.go
+++ b/e2e/builder/registry_test.go
@@ -43,7 +43,7 @@ func TestRunWithDockerHubRegistry(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-docker-hub"
- Expect(KamelInstallWithID(operatorID, ns,
+ Expect(KamelInstallWithID(t, operatorID, ns,
"--registry", "docker.io",
"--organization", user,
"--registry-auth-username", user,
@@ -51,12 +51,12 @@ func TestRunWithDockerHubRegistry(t *testing.T) {
"--cluster-type", "kubernetes").
Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodImage(ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.io"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.io"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -71,7 +71,7 @@ func TestRunWithGithubPackagesRegistry(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-github-registry"
- Expect(KamelInstallWithID(operatorID, ns,
+ Expect(KamelInstallWithID(t, operatorID, ns,
"--registry", "docker.pkg.github.com",
"--organization", repo,
"--registry-auth-username", user,
@@ -79,11 +79,11 @@ func TestRunWithGithubPackagesRegistry(t *testing.T) {
"--cluster-type", "kubernetes").
Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodImage(ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.pkg.github.com"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.pkg.github.com"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index e888bf597..45dd4c265 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -35,32 +35,32 @@ import (
func TestKamelCLIBind(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
kameletName := "test-timer-source"
- Expect(CreateTimerKamelet(ns, kameletName)()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, kameletName)()).To(Succeed())
t.Run("bind timer to log", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
- Expect(KamelBindWithID(operatorID, ns, "test-timer-source", "log:info", "-p", "source.message=newText").Execute()).To(Succeed())
- Eventually(IntegrationLogs(ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
+ Expect(KamelBindWithID(t, operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
+ Expect(KamelBindWithID(t, operatorID, ns, "test-timer-source", "log:info", "-p", "source.message=newText").Execute()).To(Succeed())
+ Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
})
t.Run("unsuccessful binding, no property", func(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- Expect(KamelBindWithID(operatorID, ns, opns+"/timer-source", "log:info").Execute()).NotTo(Succeed())
+ Expect(KamelBindWithID(t, operatorID, ns, opns+"/timer-source", "log:info").Execute()).NotTo(Succeed())
})
t.Run("bind uris", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "timer-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "timer-to-log")).Should(ContainSubstring("Body is null"))
+ Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "timer-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "timer-to-log")).Should(ContainSubstring("Body is null"))
})
t.Run("bind with custom SA", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar", "--service-account", "my-service-account").Execute()).To(Succeed())
- Eventually(IntegrationSpecSA(ns, "timer-to-log")).Should(Equal("my-service-account"))
+ Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar", "--service-account", "my-service-account").Execute()).To(Succeed())
+ Eventually(IntegrationSpecSA(t, ns, "timer-to-log")).Should(Equal("my-service-account"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/config_test.go b/e2e/common/cli/config_test.go
index 20390ee89..476a1ff85 100644
--- a/e2e/common/cli/config_test.go
+++ b/e2e/common/cli/config_test.go
@@ -44,25 +44,25 @@ func TestKamelCLIConfig(t *testing.T) {
_, err := os.Stat(cmd.DefaultConfigLocation)
assert.True(t, os.IsNotExist(err), "No file at "+cmd.DefaultConfigLocation+" was expected")
t.Cleanup(func() { os.Remove(cmd.DefaultConfigLocation) })
- Expect(Kamel("config", "--default-namespace", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "config", "--default-namespace", ns).Execute()).To(Succeed())
_, err = os.Stat(cmd.DefaultConfigLocation)
require.NoError(t, err, "A file at "+cmd.DefaultConfigLocation+" was expected")
- Expect(Kamel("run", "--operator-id", operatorID, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(Kamel(t, "run", "--operator-id", operatorID, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// first line of the integration logs
- logs := strings.Split(IntegrationLogs(ns, "yaml")(), "\n")[0]
- podName := IntegrationPod(ns, "yaml")().Name
+ logs := strings.Split(IntegrationLogs(t, ns, "yaml")(), "\n")[0]
+ podName := IntegrationPod(t, ns, "yaml")().Name
- logsCLI := GetOutputStringAsync(Kamel("log", "yaml"))
+ logsCLI := GetOutputStringAsync(Kamel(t, "log", "yaml"))
Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
Eventually(logsCLI).Should(ContainSubstring(logs))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/delete_test.go b/e2e/common/cli/delete_test.go
index 01935ea56..6726f145c 100644
--- a/e2e/common/cli/delete_test.go
+++ b/e2e/common/cli/delete_test.go
@@ -35,45 +35,45 @@ import (
func TestKamelCLIDelete(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("delete running integration", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete building integration", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete several integrations", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel("delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
- Expect(Kamel("delete", "java", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(ns, "java"), TestTimeoutLong).Should(BeNil())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ Expect(Kamel(t, "delete", "java", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, "java")).Should(BeNil())
+ Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete all integrations", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"), TestTimeoutLong).Should(BeNil())
- Eventually(Integration(ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(ns, "java"), TestTimeoutLong).Should(BeNil())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ Eventually(Integration(t, ns, "java")).Should(BeNil())
+ Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index ce7cb7a28..c4105efdb 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -38,11 +38,11 @@ import (
func TestKamelCliDescribe(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
t.Run("Test kamel describe integration", func(t *testing.T) {
- integration := GetOutputString(Kamel("describe", "integration", "yaml", "-n", ns))
+ integration := GetOutputString(Kamel(t, "describe", "integration", "yaml", "-n", ns))
r, _ := regexp.Compile("(?sm).*Name:\\s+yaml.*")
Expect(integration).To(MatchRegexp(r.String()))
@@ -54,9 +54,9 @@ func TestKamelCliDescribe(t *testing.T) {
})
t.Run("Test kamel describe integration kit", func(t *testing.T) {
- kitName := Integration(ns, "yaml")().Status.IntegrationKit.Name
- kitNamespace := Integration(ns, "yaml")().Status.IntegrationKit.Namespace
- kit := GetOutputString(Kamel("describe", "kit", kitName, "-n", kitNamespace))
+ kitName := Integration(t, ns, "yaml")().Status.IntegrationKit.Name
+ kitNamespace := Integration(t, ns, "yaml")().Status.IntegrationKit.Namespace
+ kit := GetOutputString(Kamel(t, "describe", "kit", kitName, "-n", kitNamespace))
r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + kitNamespace + ".*")
Expect(kit).To(MatchRegexp(r.String()))
@@ -72,7 +72,7 @@ func TestKamelCliDescribe(t *testing.T) {
t.Run("Test kamel describe integration platform", func(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- platform := GetOutputString(Kamel("describe", "platform", operatorID, "-n", opns))
+ platform := GetOutputString(Kamel(t, "describe", "platform", operatorID, "-n", opns))
Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + opns + ".*")
@@ -82,6 +82,6 @@ func TestKamelCliDescribe(t *testing.T) {
Expect(platform).To(MatchRegexp(r.String()))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go
index bc0a67636..57041d6f6 100644
--- a/e2e/common/cli/dev_mode_test.go
+++ b/e2e/common/cli/dev_mode_test.go
@@ -60,7 +60,7 @@ func TestRunDevMode(t *testing.T) {
file := util.MakeTempCopy(t, "files/yaml.yaml")
name := RandomizedSuffixName("yaml")
- kamelRun := KamelRunWithContext(ctx, operatorID, ns, file, "--name", name, "--dev")
+ kamelRun := KamelRunWithContext(t, ctx, operatorID, ns, file, "--name", name, "--dev")
kamelRun.SetOut(pipew)
logScanner := util.NewLogScanner(ctx, piper, `integration "`+name+`" in phase Running`, "Magicstring!", "Magicjordan!")
@@ -89,7 +89,7 @@ func TestRunDevMode(t *testing.T) {
remoteFile := "https://raw.githubusercontent.com/apache/camel-k/b29333f0a878d5d09fb3965be8fe586d77dd95d0/e2e/common/files/yaml.yaml"
name := RandomizedSuffixName("yaml")
- kamelRun := KamelRunWithContext(ctx, operatorID, ns, remoteFile, "--name", name, "--dev")
+ kamelRun := KamelRunWithContext(t, ctx, operatorID, ns, remoteFile, "--name", name, "--dev")
kamelRun.SetOut(pipew)
logScanner := util.NewLogScanner(ctx, piper, "Magicstring!")
@@ -117,12 +117,12 @@ func TestRunDevMode(t *testing.T) {
name := RandomizedSuffixName("yaml")
// First run (warm up)
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name)).Should(BeNil())
- Eventually(IntegrationPod(ns, name), TestTimeoutMedium).Should(BeNil())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name)).Should(BeNil())
+ Eventually(IntegrationPod(t, ns, name), TestTimeoutMedium).Should(BeNil())
// Second run (rebuild)
ctx, cancel := context.WithCancel(TestContext)
@@ -133,7 +133,7 @@ func TestRunDevMode(t *testing.T) {
file := util.MakeTempCopy(t, "files/yaml.yaml")
- kamelRun := KamelRunWithContext(ctx, operatorID, ns, file, "--name", name, "--dev")
+ kamelRun := KamelRunWithContext(t, ctx, operatorID, ns, file, "--name", name, "--dev")
kamelRun.SetOut(pipew)
logScanner := util.NewLogScanner(ctx, piper, `integration "`+name+`" in phase Running`, "Magicstring!")
@@ -151,6 +151,6 @@ func TestRunDevMode(t *testing.T) {
Eventually(logScanner.IsFound("Magicstring!"), timeout).Should(BeTrue())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/duplicate_parameters_test.go b/e2e/common/cli/duplicate_parameters_test.go
index 84af397ce..ae0345216 100644
--- a/e2e/common/cli/duplicate_parameters_test.go
+++ b/e2e/common/cli/duplicate_parameters_test.go
@@ -48,7 +48,9 @@ func TestDuplicateParameters(t *testing.T) {
comm, _, _ := cmd.NewKamelWithModelineCommand(ctx, cmdParams)
// the command is executed inside GetOutputString function
- commOutput := GetOutputString(comm)
+ commOutput := GetOutputString(&KamelCLI{
+ Command: comm,
+ })
outParams :=
`"traits":{"affinity":{"enabled":true},"camel":{"properties":["prop1 = true","prop2 = true","foo = bar"]},"pull-secret":{"enabled":true},"addons":{"telemetry":{"enabled":true}}}`
diff --git a/e2e/common/cli/get_test.go b/e2e/common/cli/get_test.go
index 88cdffda2..4732c56af 100644
--- a/e2e/common/cli/get_test.go
+++ b/e2e/common/cli/get_test.go
@@ -37,43 +37,43 @@ func TestKamelCLIGet(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("get integration", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
// regex is used for the compatibility of tests between OC and vanilla K8
// kamel get may have different output depending on the platform
- Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
- kitName := IntegrationKit(ns, "yaml")()
- kitNamespace := IntegrationKitNamespace(ns, "yaml")()
+ Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
+ kitName := IntegrationKit(t, ns, "yaml")()
+ kitNamespace := IntegrationKitNamespace(t, ns, "yaml")()
regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*yaml\tRunning\t(%s/%s|%s)", kitNamespace, kitName, kitName)
- Expect(GetOutputString(Kamel("get", "-n", ns))).To(MatchRegexp(regex))
+ Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("get several integrations", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- Eventually(IntegrationKit(ns, "java")).ShouldNot(Equal(""))
- Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
- kitName1 := IntegrationKit(ns, "java")()
- kitName2 := IntegrationKit(ns, "yaml")()
- kitNamespace1 := IntegrationKitNamespace(ns, "java")()
- kitNamespace2 := IntegrationKitNamespace(ns, "yaml")()
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ Eventually(IntegrationKit(t, ns, "java")).ShouldNot(Equal(""))
+ Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
+ kitName1 := IntegrationKit(t, ns, "java")()
+ kitName2 := IntegrationKit(t, ns, "yaml")()
+ kitNamespace1 := IntegrationKitNamespace(t, ns, "java")()
+ kitNamespace2 := IntegrationKitNamespace(t, ns, "yaml")()
regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*java\tRunning\t"+
"(%s/%s|%s)\n\\s*yaml\tRunning\t(%s/%s|%s)\n", kitNamespace1, kitName1, kitName1, kitNamespace2, kitName2, kitName2)
- Expect(GetOutputString(Kamel("get", "-n", ns))).To(MatchRegexp(regex))
+ Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("get no integrations", func(t *testing.T) {
- Expect(GetOutputString(Kamel("get", "-n", ns))).NotTo(ContainSubstring("Running"))
- Expect(GetOutputString(Kamel("get", "-n", ns))).NotTo(ContainSubstring("Building Kit"))
+ Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Running"))
+ Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Building Kit"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/help_test.go b/e2e/common/cli/help_test.go
index ac54e4b16..2507b6ec4 100644
--- a/e2e/common/cli/help_test.go
+++ b/e2e/common/cli/help_test.go
@@ -34,7 +34,7 @@ func TestKamelCLIHelp(t *testing.T) {
RegisterTestingT(t)
t.Run("default help message", func(t *testing.T) {
- helpMsg := GetOutputString(Kamel("help"))
+ helpMsg := GetOutputString(Kamel(t, "help"))
Expect(helpMsg).To(ContainSubstring("Apache Camel K is a lightweight integration platform, born on Kubernetes"))
Expect(helpMsg).To(ContainSubstring("Usage:"))
Expect(helpMsg).To(ContainSubstring("Available Commands:"))
@@ -42,14 +42,14 @@ func TestKamelCLIHelp(t *testing.T) {
})
t.Run("'get' command help (short flag)", func(t *testing.T) {
- helpMsg := GetOutputString(Kamel("get", "-h"))
+ helpMsg := GetOutputString(Kamel(t, "get", "-h"))
Expect(helpMsg).To(ContainSubstring("Get the status of integrations deployed on Kubernetes"))
Expect(helpMsg).To(ContainSubstring("Usage:"))
Expect(helpMsg).To(ContainSubstring("Flags:"))
})
t.Run("'bind' command help (long flag)", func(t *testing.T) {
- helpMsg := GetOutputString(Kamel("bind", "--help"))
+ helpMsg := GetOutputString(Kamel(t, "bind", "--help"))
Expect(helpMsg).To(ContainSubstring("Bind Kubernetes resources, such as Kamelets, in an integration flow."))
Expect(helpMsg).To(ContainSubstring("kamel bind [source] [sink] ... [flags]"))
Expect(helpMsg).To(ContainSubstring("Global Flags:"))
diff --git a/e2e/common/cli/log_test.go b/e2e/common/cli/log_test.go
index 093872822..d2baf7c45 100644
--- a/e2e/common/cli/log_test.go
+++ b/e2e/common/cli/log_test.go
@@ -34,24 +34,24 @@ import (
func TestKamelCLILog(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("check integration log", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "log-yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "log-yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
// first line of the integration logs
- firstLine := strings.Split(IntegrationLogs(ns, "log-yaml")(), "\n")[0]
- podName := IntegrationPod(ns, "log-yaml")().Name
+ firstLine := strings.Split(IntegrationLogs(t, ns, "log-yaml")(), "\n")[0]
+ podName := IntegrationPod(t, ns, "log-yaml")().Name
- logsCLI := GetOutputStringAsync(Kamel("log", "log-yaml", "-n", ns))
+ logsCLI := GetOutputStringAsync(Kamel(t, "log", "log-yaml", "-n", ns))
Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
Eventually(logsCLI).Should(ContainSubstring(firstLine))
- logs := strings.Split(IntegrationLogs(ns, "log-yaml")(), "\n")
+ logs := strings.Split(IntegrationLogs(t, ns, "log-yaml")(), "\n")
lastLine := logs[len(logs)-1]
- logsCLI = GetOutputStringAsync(Kamel("log", "log-yaml", "-n", ns, "--tail", "5"))
+ logsCLI = GetOutputStringAsync(Kamel(t, "log", "log-yaml", "-n", ns, "--tail", "5"))
Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
Eventually(logsCLI).Should(ContainSubstring(lastLine))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/offline_commands_test.go b/e2e/common/cli/offline_commands_test.go
index 0027e8b7d..5a5e7d32d 100644
--- a/e2e/common/cli/offline_commands_test.go
+++ b/e2e/common/cli/offline_commands_test.go
@@ -35,13 +35,13 @@ import (
func TestKamelVersionWorksOffline(t *testing.T) {
RegisterTestingT(t)
- assert.Nil(t, Kamel("version", "--kube-config", "non-existent-kubeconfig-file").Execute())
+ assert.Nil(t, Kamel(t, "version", "--kube-config", "non-existent-kubeconfig-file").Execute())
}
func TestKamelHelpOptionWorksOffline(t *testing.T) {
RegisterTestingT(t)
- traitCmd := Kamel("run", "Xxx.java", "--help")
+ traitCmd := Kamel(t, "run", "Xxx.java", "--help")
traitCmd.SetOut(io.Discard)
assert.Nil(t, traitCmd.Execute())
}
@@ -49,9 +49,9 @@ func TestKamelHelpOptionWorksOffline(t *testing.T) {
func TestKamelCompletionWorksOffline(t *testing.T) {
RegisterTestingT(t)
- bashCmd := Kamel("completion", "bash", "--kube-config", "non-existent-kubeconfig-file")
+ bashCmd := Kamel(t, "completion", "bash", "--kube-config", "non-existent-kubeconfig-file")
bashCmd.SetOut(io.Discard)
- zshCmd := Kamel("completion", "zsh", "--kube-config", "non-existent-kubeconfig-file")
+ zshCmd := Kamel(t, "completion", "zsh", "--kube-config", "non-existent-kubeconfig-file")
zshCmd.SetOut(io.Discard)
assert.Nil(t, bashCmd.Execute())
assert.Nil(t, zshCmd.Execute())
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index 692b4a20f..7bcf6f7b6 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -43,34 +43,34 @@ func TestKamelCLIRun(t *testing.T) {
t.Run("Examples from GitHub", func(t *testing.T) {
t.Run("Java", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
+ Expect(KamelRunWithID(t, operatorID, ns,
"github:apache/camel-k-examples/generic-examples/languages/Sample.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java (RAW)", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
+ Expect(KamelRunWithID(t, operatorID, ns,
"https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java").Execute()).
To(Succeed())
- Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java (branch)", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
+ Expect(KamelRunWithID(t, operatorID, ns,
"github:apache/camel-k-examples/generic-examples/languages/Sample.java?branch=main").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// GIST does not like GITHUB_TOKEN apparently, we must temporarily remove it
@@ -79,26 +79,26 @@ func TestKamelCLIRun(t *testing.T) {
t.Run("Gist (ID)", func(t *testing.T) {
name := RandomizedSuffixName("github-gist-id")
- Expect(KamelRunWithID(operatorID, ns, "--name", name,
+ Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
"gist:e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Gist (URL)", func(t *testing.T) {
name := RandomizedSuffixName("github-gist-url")
- Expect(KamelRunWithID(operatorID, ns, "--name", name,
+ Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
"https://gist.github.com/lburgazzoli/e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// Revert GITHUB TOKEN
@@ -106,76 +106,76 @@ func TestKamelCLIRun(t *testing.T) {
os.Unsetenv("GITHUB_TOKEN_TMP")
// Clean up
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Run and update", func(t *testing.T) {
name := RandomizedSuffixName("run")
- Expect(KamelRunWithID(operatorID, ns, "files/run.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magic default"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic default"))
// Re-run the Integration with an updated configuration
- Expect(KamelRunWithID(operatorID, ns, "files/run.yaml", "--name", name, "-p", "property=value").Execute()).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name, "-p", "property=value").Execute()).
To(Succeed())
// Check the Deployment has progressed successfully
- Eventually(DeploymentCondition(ns, name, appsv1.DeploymentProgressing), TestTimeoutShort).
+ Eventually(DeploymentCondition(t, ns, name, appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
}))
// Check the new configuration is taken into account
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magic value"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic value"))
// Clean up
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Run with glob patterns", func(t *testing.T) {
t.Run("YAML", func(t *testing.T) {
name := RandomizedSuffixName("run")
- Expect(KamelRunWithID(operatorID, ns, "files/glob/run*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/glob/run*", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/glob/Java*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/glob/Java*", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("All", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/glob/*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/glob/*", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// Clean up
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
})
@@ -192,15 +192,15 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID("local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, "local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "../traits/files/jvm/Classpath.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
"-d", sampleJar,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
})
@@ -217,18 +217,18 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID("local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, "local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "../traits/files/jvm/Classpath.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
"-d", sampleJar,
"-d", "https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java|targetPath=/tmp/foo",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- Eventually(DeleteIntegrations(ns), TestTimeoutLong).Should(Equal(0))
+ Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
+ Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/version_test.go b/e2e/common/cli/version_test.go
index 202135e14..6b8e5deae 100644
--- a/e2e/common/cli/version_test.go
+++ b/e2e/common/cli/version_test.go
@@ -35,7 +35,7 @@ func TestKamelCLIVersion(t *testing.T) {
RegisterTestingT(t)
t.Run("check version correctness", func(t *testing.T) {
- version := GetOutputString(Kamel("version"))
+ version := GetOutputString(Kamel(t, "version"))
Expect(version).To(ContainSubstring(defaults.Version))
})
}
diff --git a/e2e/common/config/config_reload_test.go b/e2e/common/config/config_reload_test.go
index b8e3dd33b..9e0a3bcbf 100644
--- a/e2e/common/config/config_reload_test.go
+++ b/e2e/common/config/config_reload_test.go
@@ -35,15 +35,17 @@ import (
)
func TestConfigmapHotReload(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
name := RandomizedSuffixName("config-configmap-route")
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my configmap content"
- CreatePlainTextConfigmapWithLabels(ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
+ CreatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(operatorID, ns,
+ Expect(KamelRunWithID(t, operatorID, ns,
"./files/config-configmap-route.groovy",
"--config",
"configmap:my-hot-cm",
@@ -52,15 +54,15 @@ func TestConfigmapHotReload(t *testing.T) {
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
- UpdatePlainTextConfigmapWithLabels(ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
+ UpdatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -71,23 +73,23 @@ func TestConfigmapHotReloadDefault(t *testing.T) {
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my configmap content"
- CreatePlainTextConfigmapWithLabels(ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
+ CreatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy",
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
"--config",
"configmap:my-hot-cm-2",
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
- UpdatePlainTextConfigmapWithLabels(ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
+ UpdatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -98,9 +100,9 @@ func TestSecretHotReload(t *testing.T) {
var secData = make(map[string]string)
secData["my-secret-key"] = "very top secret"
- CreatePlainTextSecretWithLabels(ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
+ CreatePlainTextSecretWithLabels(t, ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-route.groovy",
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy",
"--config",
"secret:my-hot-sec",
"-t",
@@ -108,15 +110,15 @@ func TestSecretHotReload(t *testing.T) {
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret"))
secData["my-secret-key"] = "very top secret updated"
- UpdatePlainTextSecretWithLabels(ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
+ UpdatePlainTextSecretWithLabels(t, ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -133,7 +135,7 @@ func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
name := RandomizedSuffixName("config-configmap-route")
cmName := RandomizedSuffixName("my-hot-cm-")
- Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy",
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
"--config",
"configmap:"+cmName,
"--name",
@@ -142,19 +144,19 @@ func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
"mount.hot-reload="+strconv.FormatBool(hotreload),
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my configmap content"
- CreatePlainTextConfigmapWithOwnerRefWithLabels(ns, cmName, cmData, name, Integration(ns, name)().UID, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content"))
+ CreatePlainTextConfigmapWithOwnerRefWithLabels(t, ns, cmName, cmData, name, Integration(t, ns, name)().UID, map[string]string{"camel.apache.org/integration": "test"})
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
- UpdatePlainTextConfigmapWithLabels(ns, cmName, cmData, map[string]string{"camel.apache.org/integration": "test"})
+ UpdatePlainTextConfigmapWithLabels(t, ns, cmName, cmData, map[string]string{"camel.apache.org/integration": "test"})
if hotreload {
- Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content updated"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content updated"))
} else {
- Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(Not(ContainSubstring("my configmap content updated")))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(Not(ContainSubstring("my configmap content updated")))
}
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index a799063e5..0d8f8fb21 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -35,102 +35,104 @@ import (
)
func TestRunConfigExamples(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Simple property", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
- Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
+ Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property file", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/property-file-route.groovy", "--property", "file:./files/my.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
- Expect(Kamel("delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "--property", "file:./files/my.properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
+ Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property precedence", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/property-file-route.groovy", "-p", "my.key.2=universe", "-p", "file:./files/my.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello universe"))
- Expect(Kamel("delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "-p", "my.key.2=universe", "-p", "file:./files/my.properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello universe"))
+ Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from ConfigMap", func(t *testing.T) {
var cmData = make(map[string]string)
cmData["my.message"] = "my-configmap-property-value"
- CreatePlainTextConfigmap(ns, "my-cm-test-property", cmData)
+ CreatePlainTextConfigmap(t, ns, "my-cm-test-property", cmData)
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
- Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
+ Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from ConfigMap as property file", func(t *testing.T) {
var cmData = make(map[string]string)
cmData["my.properties"] = "my.message=my-configmap-property-entry"
- CreatePlainTextConfigmap(ns, "my-cm-test-properties", cmData)
+ CreatePlainTextConfigmap(t, ns, "my-cm-test-properties", cmData)
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-entry"))
- Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-entry"))
+ Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from Secret", func(t *testing.T) {
var secData = make(map[string]string)
secData["my.message"] = "my-secret-property-value"
- CreatePlainTextSecret(ns, "my-sec-test-property", secData)
+ CreatePlainTextSecret(t, ns, "my-sec-test-property", secData)
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
- Expect(Kamel("delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
+ Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from Secret as property file", func(t *testing.T) {
var secData = make(map[string]string)
secData["my.properties"] = "my.message=my-secret-property-entry"
- CreatePlainTextSecret(ns, "my-sec-test-properties", secData)
+ CreatePlainTextSecret(t, ns, "my-sec-test-properties", secData)
- Expect(KamelRunWithID(operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-entry"))
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-entry"))
})
t.Run("Property from Secret inlined", func(t *testing.T) {
var secData = make(map[string]string)
secData["my-message"] = "my-secret-external-value"
- CreatePlainTextSecret(ns, "my-sec-inlined", secData)
+ CreatePlainTextSecret(t, ns, "my-sec-inlined", secData)
// TODO: remove jvm.options trait as soon as CAMEL-20054 gets fixed
- Expect(KamelRunWithID(operatorID, ns, "./files/property-secret-route.groovy",
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/property-secret-route.groovy",
"-t", "mount.configs=secret:my-sec-inlined",
"-t", "jvm.options=-Dcamel.k.mount-path.secrets=/etc/camel/conf.d/_secrets",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
+ Eventually(IntegrationPodPhase(t, ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "property-secret-route")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "property-secret-route")()
+ Eventually(UnstructuredIntegration(t, ns, "property-secret-route")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, "property-secret-route")()
mountTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "mount")
Expect(mountTrait).ToNot(BeNil())
Expect(len(mountTrait)).To(Equal(1))
Expect(mountTrait["configs"]).ToNot(BeNil())
- Expect(Kamel("delete", "property-secret-route", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "property-secret-route", "-n", ns).Execute()).To(Succeed())
})
@@ -139,59 +141,59 @@ func TestRunConfigExamples(t *testing.T) {
// Store a configmap on the cluster
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my-configmap-content"
- CreatePlainTextConfigmap(ns, "my-cm", cmData)
+ CreatePlainTextConfigmap(t, ns, "my-cm", cmData)
// Store a configmap with multiple values
var cmDataMulti = make(map[string]string)
cmDataMulti["my-configmap-key"] = "should-not-see-it"
cmDataMulti["my-configmap-key-2"] = "my-configmap-content-2"
- CreatePlainTextConfigmap(ns, "my-cm-multi", cmDataMulti)
+ CreatePlainTextConfigmap(t, ns, "my-cm-multi", cmDataMulti)
t.Run("Config configmap", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "config-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "config-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap", func(t *testing.T) {
// We can reuse the configmap created previously
- Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-route.groovy", "--resource", "configmap:my-cm").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "resource-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "resource-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-route.groovy", "--resource", "configmap:my-cm").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "resource-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap with destination", func(t *testing.T) {
// We can reuse the configmap created previously
- Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-location-route.groovy", "--resource", "configmap:my-cm@/tmp/app").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "resource-configmap-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "resource-configmap-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "resource-configmap-location-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-location-route.groovy", "--resource", "configmap:my-cm@/tmp/app").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "resource-configmap-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "resource-configmap-location-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap with filtered key and destination", func(t *testing.T) {
// We'll use the configmap contaning 2 values filtering only 1 key
- Expect(KamelRunWithID(operatorID, ns, "./files/resource-configmap-key-location-route.groovy", "--resource", "configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "resource-configmap-key-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "resource-configmap-key-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "resource-configmap-key-location-route"), TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
- Eventually(IntegrationLogs(ns, "resource-configmap-key-location-route"), TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-key-location-route.groovy", "--resource", "configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "resource-configmap-key-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-key-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
+ Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
})
// Store a configmap as property file
var cmDataProps = make(map[string]string)
cmDataProps["my.properties"] = "my.key.1=hello\nmy.key.2=world"
- CreatePlainTextConfigmap(ns, "my-cm-properties", cmDataProps)
+ CreatePlainTextConfigmap(t, ns, "my-cm-properties", cmDataProps)
t.Run("Config configmap as property file", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/config-configmap-properties-route.groovy", "--config", "configmap:my-cm-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-configmap-properties-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-configmap-properties-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-configmap-properties-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-properties-route.groovy", "--config", "configmap:my-cm-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "config-configmap-properties-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "config-configmap-properties-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "config-configmap-properties-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
})
// Secret
@@ -199,127 +201,127 @@ func TestRunConfigExamples(t *testing.T) {
// Store a secret on the cluster
var secData = make(map[string]string)
secData["my-secret-key"] = "very top secret"
- CreatePlainTextSecret(ns, "my-sec", secData)
+ CreatePlainTextSecret(t, ns, "my-sec", secData)
// Store a secret with multi values
var secDataMulti = make(map[string]string)
secDataMulti["my-secret-key"] = "very top secret"
secDataMulti["my-secret-key-2"] = "even more secret"
- CreatePlainTextSecret(ns, "my-sec-multi", secDataMulti)
+ CreatePlainTextSecret(t, ns, "my-sec-multi", secDataMulti)
t.Run("Config secret", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "config-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "config-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
})
t.Run("Resource secret", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/resource-secret-route.groovy", "--resource", "secret:my-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "resource-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "resource-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-secret-route.groovy", "--resource", "secret:my-sec").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "resource-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "resource-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Secret with filtered key", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/config-secret-key-route.groovy", "--config", "secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "config-secret-key-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "config-secret-key-route"), TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
- Eventually(IntegrationLogs(ns, "config-secret-key-route"), TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-key-route.groovy", "--config", "secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "config-secret-key-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
+ Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
// Build-Properties
t.Run("Build time property", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-route.groovy", "--build-property", "quarkus.application.name=my-super-application").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--build-property", "quarkus.application.name=my-super-application").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "build-property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "build-property-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
// Don't delete - we need it for next test execution
})
// We need to check also that the property (which is available in the IntegrationKit) is correctly replaced and we don't reuse the same kit
t.Run("Build time property updated", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-route.groovy", "--name", "build-property-route-updated",
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--name", "build-property-route-updated",
"--build-property", "quarkus.application.name=my-super-application-updated").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-route-updated"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
+ Eventually(IntegrationPodPhase(t, ns, "build-property-route-updated"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
// Verify the integration kits are different
- Eventually(IntegrationKit(ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(ns, "build-property-route")()))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Eventually(IntegrationKit(t, ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(t, ns, "build-property-route")()))
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
// Build-Properties file
t.Run("Build time property file", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property file with precedence", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "quarkus.application.name=my-overridden-application", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutMedium).Should(ContainSubstring("my-overridden-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "quarkus.application.name=my-overridden-application", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutMedium).Should(ContainSubstring("my-overridden-application"))
+ Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property from ConfigMap", func(t *testing.T) {
var cmData = make(map[string]string)
cmData["quarkus.application.name"] = "my-cool-application"
- CreatePlainTextConfigmap(ns, "my-cm-test-build-property", cmData)
+ CreatePlainTextConfigmap(t, ns, "my-cm-test-build-property", cmData)
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutLong).Should(ContainSubstring("my-cool-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutLong).Should(ContainSubstring("my-cool-application"))
+ Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property from ConfigMap as property file", func(t *testing.T) {
var cmData = make(map[string]string)
cmData["my.properties"] = "quarkus.application.name=my-super-cool-application"
- CreatePlainTextConfigmap(ns, "my-cm-test-build-properties", cmData)
+ CreatePlainTextConfigmap(t, ns, "my-cm-test-build-properties", cmData)
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
+ Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property from Secret", func(t *testing.T) {
var secData = make(map[string]string)
secData["quarkus.application.name"] = "my-great-application"
- CreatePlainTextSecret(ns, "my-sec-test-build-property", secData)
+ CreatePlainTextSecret(t, ns, "my-sec-test-build-property", secData)
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-great-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-property").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-great-application"))
+ Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property from Secret as property file", func(t *testing.T) {
var secData = make(map[string]string)
secData["my.properties"] = "quarkus.application.name=my-awsome-application"
- CreatePlainTextSecret(ns, "my-sec-test-build-properties", secData)
+ CreatePlainTextSecret(t, ns, "my-sec-test-build-properties", secData)
- Expect(KamelRunWithID(operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-awsome-application"))
- Expect(Kamel("delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-properties").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-awsome-application"))
+ Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go
index 931300bdc..21bb648eb 100644
--- a/e2e/common/config/kamelet_config_test.go
+++ b/e2e/common/config/kamelet_config_test.go
@@ -35,24 +35,26 @@ import (
//
// without having to change the integration code.
func TestKameletImplicitConfigDefaultUserPropery(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run test default config using properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig01-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "iconfig01-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int01")
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
"-p", "camel.kamelet.iconfig01-timer-source.message='Default message 01'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("Default message 01"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("Default message 01"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig01-timer-source")).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(t, ns, "iconfig01-timer-source")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -61,30 +63,30 @@ func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
t.Run("run test default config using mounted secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig03-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "iconfig03-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int3")
secretName := "my-iconfig-int3-secret"
var secData = make(map[string]string)
secData["camel.kamelet.iconfig03-timer-source.message"] = "very top mounted secret message"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration03.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration03.java",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top mounted secret message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig03-timer-source")).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted secret message"))
+
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(t, ns, "iconfig03-timer-source")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -93,57 +95,57 @@ func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
t.Run("run test default config using mounted configmap", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig04-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "iconfig04-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int4")
cmName := "my-iconfig-int4-configmap"
var cmData = make(map[string]string)
cmData["camel.kamelet.iconfig04-timer-source.message"] = "very top mounted configmap message"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+ Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration04.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration04.java",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top mounted configmap message"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted configmap message"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(ns, "iconfig04-timer-source")).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "iconfig04-timer-source")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedUserPropery(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("run test named config using properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig05-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "iconfig05-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int5")
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
"-p", "camel.kamelet.iconfig05-timer-source.message='Default message 05'",
"-p", "camel.kamelet.iconfig05-timer-source.mynamedconfig.message='My Named Config message'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My Named Config message"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My Named Config message"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig05-timer-source")).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(t, ns, "iconfig05-timer-source")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("run test named config using labeled secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig06-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "iconfig06-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int6")
secretName := "my-iconfig-int6-secret"
@@ -153,90 +155,90 @@ func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "iconfig06-timer-source"
labels["camel.apache.org/kamelet.configuration"] = "mynamedconfig"
- Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
+ Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration06.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration06.java",
"-p", "camel.kamelet.iconfig06-timer-source.message='Default message 06'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named secret message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig06-timer-source")).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named secret message"))
+
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(t, ns, "iconfig06-timer-source")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("run test named config using mounted secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig07-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "iconfig07-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int7")
secretName := "my-iconfig-int7-secret"
var secData = make(map[string]string)
secData["camel.kamelet.iconfig07-timer-source.mynamedconfig.message"] = "very top named mounted secret message"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration07.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration07.java",
"-p", "camel.kamelet.iconfig07-timer-source.message='Default message 07'",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named mounted secret message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig07-timer-source")).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted secret message"))
+
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(t, ns, "iconfig07-timer-source")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("run test named config using mounted configmap", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig08-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "iconfig08-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int8")
cmName := "my-iconfig-int8-configmap"
var cmData = make(map[string]string)
cmData["camel.kamelet.iconfig08-timer-source.mynamedconfig.message"] = "very top named mounted configmap message"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+ Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration08.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration08.java",
"-p", "camel.kamelet.iconfig08-timer-source.message='Default message 08'",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top named mounted configmap message"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted configmap message"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(ns, "iconfig08-timer-source")).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "iconfig08-timer-source")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("run test default config using labeled secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "iconfig09-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "iconfig09-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int9")
secretName := "my-iconfig-int9-secret"
@@ -245,22 +247,22 @@ func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
secData["camel.kamelet.iconfig09-timer-source.message"] = "very top labeled secret message"
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "iconfig09-timer-source"
- Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
+ Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegrationConfiguration09.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration09.java",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("very top labeled secret message"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Eventually(SecretByName(ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "iconfig09-timer-source")).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top labeled secret message"))
+
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(t, ns, "iconfig09-timer-source")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -269,24 +271,24 @@ func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
func TestKameletConfigInlinedUserPropery(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("run test default config inlined properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "config01-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "config01-log-sink")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "config01-timer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(t, ns, "config01-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int1")
- Expect(KamelRunWithID(operatorID, ns, "files/timer-kamelet-integration-inlined-configuration-01.yaml",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-inlined-configuration-01.yaml",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("important message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("integrationLogger"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "config01-timer-source")).To(Succeed())
- Expect(DeleteKamelet(ns, "config01-log-sink")).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("important message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("integrationLogger"))
+
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(t, ns, "config01-timer-source")).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "config01-log-sink")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -294,34 +296,34 @@ func TestKameletConfigDefaultParamUserPropery(t *testing.T) {
RegisterTestingT(t)
t.Run("run test default config parameters properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "config02-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "config02-log-sink")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "config02-timer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(t, ns, "config02-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int2")
- Expect(KamelRunWithID(operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
"-p", "my-message='My parameter message 02'",
"-p", "my-logger='myIntegrationLogger02'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My parameter message 02"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myIntegrationLogger02"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(ns, "config02-timer-source")).To(Succeed())
- Expect(DeleteKamelet(ns, "config02-log-sink")).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My parameter message 02"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myIntegrationLogger02"))
+
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
RegisterTestingT(t)
t.Run("run test default config secret properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "config03-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "config03-log-sink")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "config03-timer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(t, ns, "config03-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int3")
secretName := "my-config-int3-secret"
@@ -329,31 +331,31 @@ func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
var secData = make(map[string]string)
secData["my-message"] = "My secret message 03"
secData["my-logger"] = "mySecretIntegrationLogger03"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+ Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My secret message 03"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
- Expect(DeleteKamelet(ns, "config03-timer-source")).To(Succeed())
- Expect(DeleteKamelet(ns, "config03-log-sink")).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My secret message 03"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
+
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
RegisterTestingT(t)
t.Run("run test default config configmap properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "config04-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "config04-log-sink")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "config04-timer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(t, ns, "config04-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int4")
cmName := "my-config-int4-configmap"
@@ -361,21 +363,21 @@ func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
var cmData = make(map[string]string)
cmData["my-message"] = "My configmap message 04"
cmData["my-logger"] = "myConfigmapIntegrationLogger04"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+ Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My configmap message 04"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
-
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(ns, "config04-timer-source")).To(Succeed())
- Expect(DeleteKamelet(ns, "config04-log-sink")).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My configmap message 04"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
+
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index 49ff9b444..da50d115a 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -33,25 +33,27 @@ import (
// Tests on pipe with kamelets containing configuration from properties and secrets.
func TestPipeConfig(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("test custom source/sink pipe", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "my-pipe-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "my-pipe-log-sink")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "my-pipe-timer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(t, ns, "my-pipe-log-sink")()).To(Succeed())
t.Run("run test default config using properties", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-properties")
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-p", "source.message=My pipe message",
"-p", "sink.loggerName=myPipeLogger",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeLogger"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeLogger"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
})
t.Run("run test implicit default config using labeled secret", func(t *testing.T) {
@@ -62,20 +64,20 @@ func TestPipeConfig(t *testing.T) {
secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "my-pipe-timer-source"
- Expect(CreatePlainTextSecretWithLabels(ns, secretName, secData, labels)).To(Succeed())
+ Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-p", "sink.loggerName=myDefaultLogger",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe secret message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myDefaultLogger"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myDefaultLogger"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit default config using mounted secret", func(t *testing.T) {
@@ -85,20 +87,20 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
secData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeSecretLogger"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+ Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe secret message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSecretLogger"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSecretLogger"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit default config using mounted configmap", func(t *testing.T) {
@@ -108,20 +110,20 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe configmap message"
cmData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeConfigmapLogger"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+ Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe configmap message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeConfigmapLogger"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe configmap message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeConfigmapLogger"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
t.Run("run test implicit named config using mounted secret", func(t *testing.T) {
@@ -131,9 +133,9 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named secret message"
secData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedSecretLogger"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+ Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
@@ -142,12 +144,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe named secret message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeNamedSecretLogger"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named secret message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedSecretLogger"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit named config using mounted configmap", func(t *testing.T) {
@@ -157,9 +159,9 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named configmap message"
cmData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedConfigmapLogger"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+ Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
@@ -168,12 +170,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe named configmap message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeNamedConfigmapLogger"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named configmap message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedConfigmapLogger"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
t.Run("run test implicit specific config using mounted secret", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-specific-secret")
@@ -182,9 +184,9 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["mynamedconfig.message"] = "My pipe specific secret message"
secData["mynamedconfig.loggerName"] = "myPipeSpecificSecretLogger"
- Expect(CreatePlainTextSecret(ns, secretName, secData)).To(Succeed())
+ Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
@@ -193,12 +195,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe specific secret message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSpecificSecretLogger"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific secret message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificSecretLogger"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(ns, secretName)).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit specific config using mounted configmap", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-specific-configmap")
@@ -207,9 +209,9 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["mynamedconfig.message"] = "My pipe specific configmap message"
cmData["mynamedconfig.loggerName"] = "myPipeSpecificConfgmapLogger"
- Expect(CreatePlainTextConfigmap(ns, cmName, cmData)).To(Succeed())
+ Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
@@ -218,15 +220,15 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("My pipe specific configmap message"))
- Eventually(IntegrationLogs(ns, name)).Should(ContainSubstring("myPipeSpecificConfgmapLogger"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific configmap message"))
+ Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificConfgmapLogger"))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(ns, cmName)).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go
index a86db06e7..75072d233 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -34,15 +34,17 @@ import (
)
func TestRunSimpleGroovyExamples(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run groovy", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go
index c361bc072..fd17a6ff7 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -34,15 +34,17 @@ import (
)
func TestRunSimpleJavaExamples(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run java", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index 9cf92e27f..76fe2e706 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -34,15 +34,17 @@ import (
)
func TestRunSimpleJavaScriptExamples(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run js", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/js.js").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/js.js").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index e252fd0f0..657ce5dba 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -34,15 +34,17 @@ import (
)
func TestRunSimpleKotlinExamples(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run kotlin", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go
index 8009c9fc2..ef55d16b8 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -34,16 +34,18 @@ import (
)
func TestRunPolyglotExamples(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run polyglot", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
- Eventually(IntegrationLogs(ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
+ Expect(KamelRunWithID(t, operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
+ Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index 4e5cc3ff7..037768bf2 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -34,15 +34,17 @@ import (
)
func TestRunSimpleXmlExamples(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run xml", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go
index 82f150b21..1d38e211e 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -34,15 +34,17 @@ import (
)
func TestRunSimpleYamlExamples(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run yaml", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/client_test.go b/e2e/common/misc/client_test.go
index 5bddeac36..41a2d3554 100644
--- a/e2e/common/misc/client_test.go
+++ b/e2e/common/misc/client_test.go
@@ -39,6 +39,8 @@ import (
)
func TestClientFunctionalities(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
cfg, err := config.GetConfig()
@@ -65,6 +67,6 @@ func TestClientFunctionalities(t *testing.T) {
err = camel.CamelV1().Integrations(ns).Delete(TestContext, "dummy", metav1.DeleteOptions{})
require.NoError(t, err)
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index efcd0e948..42fb81171 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -34,43 +34,45 @@ import (
)
func TestRunCronExample(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("cron", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationCronJob(t, ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(IntegrationConditionStatus(t, ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-yaml", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationCronJob(t, ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(IntegrationConditionStatus(t, ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-timer", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationCronJob(t, ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(IntegrationConditionStatus(t, ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-fallback", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron-fallback.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "cron-fallback"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "cron-fallback", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron-fallback"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/cron-fallback.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "cron-fallback"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "cron-fallback", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "cron-fallback"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-quartz", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/cron-quartz.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "cron-quartz"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "cron-quartz", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "cron-quartz"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/cron-quartz.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "cron-quartz"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "cron-quartz", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "cron-quartz"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go
index 4165358cf..f74b22df5 100644
--- a/e2e/common/misc/integration_fail_test.go
+++ b/e2e/common/misc/integration_fail_test.go
@@ -35,152 +35,154 @@ import (
)
func TestBadRouteIntegration(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run bad java route", func(t *testing.T) {
name := RandomizedSuffixName("bad-route")
- Expect(KamelRunWithID(operatorID, ns, "files/BadRoute.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/BadRoute.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// Make sure the Integration can be scaled
- Expect(ScaleIntegration(ns, name, 2)).To(Succeed())
+ Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Check the Integration stays in error phase
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Kit valid
- kitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ kitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
+ Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
})
t.Run("run missing dependency java route", func(t *testing.T) {
name := RandomizedSuffixName("java-route")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-d", "mvn:com.example:nonexistent:1.0").Execute()).To(Succeed())
// Integration in error
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionKitAvailableReason)))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
WithTransform(IntegrationConditionMessage, ContainSubstring("is in state \"Error\"")))
// Kit in error
- kitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError))
+ kitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
+ Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError))
//Build in error with 5 attempts
- build := Build(integrationKitNamespace, kitName)()
+ build := Build(t, integrationKitNamespace, kitName)()
Eventually(build.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseError))
Eventually(build.Status.Failure.Recovery.Attempt, TestTimeoutShort).Should(Equal(5))
// Fixing the route should reconcile the Integration
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning))
// New Kit success
- kitRecoveryName := IntegrationKit(ns, name)()
- integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ kitRecoveryName := IntegrationKit(t, ns, name)()
+ integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
+ Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
Expect(kitRecoveryName).NotTo(Equal(kitName))
// New Build success
- buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
+ buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run invalid dependency java route", func(t *testing.T) {
name := RandomizedSuffixName("invalid-dependency")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-d", "camel:non-existent").Execute()).To(Succeed())
// Integration in error with Initialization Failed condition
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
// Kit shouldn't be created
- Consistently(IntegrationKit(ns, name), 10*time.Second).Should(BeEmpty())
+ Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// New Kit success
- kitRecoveryName := IntegrationKit(ns, name)()
- integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ kitRecoveryName := IntegrationKit(t, ns, name)()
+ integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
+ Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// New Build success
- buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
+ buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run unresolvable component java route", func(t *testing.T) {
name := RandomizedSuffixName("unresolvable-route")
- Expect(KamelRunWithID(operatorID, ns, "files/Unresolvable.java", "--name", name).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Unresolvable.java", "--name", name).Execute()).To(Succeed())
// Integration in error with Initialization Failed condition
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
// Kit shouldn't be created
- Consistently(IntegrationKit(ns, name), 10*time.Second).Should(BeEmpty())
+ Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// New Kit success
- kitRecoveryName := IntegrationKit(ns, name)()
- integrationKitRecoveryNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ kitRecoveryName := IntegrationKit(t, ns, name)()
+ integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
+ Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// New Build success
- buildRecovery := Build(integrationKitRecoveryNamespace, kitRecoveryName)()
+ buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run invalid java route", func(t *testing.T) {
name := RandomizedSuffixName("invalid-java-route")
- Expect(KamelRunWithID(operatorID, ns, "files/InvalidJava.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/InvalidJava.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error"))
// Kit valid
- kitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
- Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ kitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
+ Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Kit should not have changed
- kitRecoveryName := IntegrationKit(ns, name)()
+ kitRecoveryName := IntegrationKit(t, ns, name)()
Expect(kitRecoveryName).To(Equal(kitName))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/integration_trait_update_test.go b/e2e/common/misc/integration_trait_update_test.go
index 681a2a70d..014c75bc6 100644
--- a/e2e/common/misc/integration_trait_update_test.go
+++ b/e2e/common/misc/integration_trait_update_test.go
@@ -34,21 +34,23 @@ import (
)
func TestTraitUpdates(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("run and update trait", func(t *testing.T) {
name := RandomizedSuffixName("yaml-route")
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
var numberOfPods = func(pods *int32) bool {
return *pods >= 1 && *pods <= 2
}
// Adding a property will change the camel trait
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name, "-p", "hello=world").Execute()).To(Succeed())
- Consistently(IntegrationPodsNumbers(ns, name), TestTimeoutShort, 1*time.Second).Should(Satisfy(numberOfPods))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name, "-p", "hello=world").Execute()).To(Succeed())
+ Consistently(IntegrationPodsNumbers(t, ns, name), TestTimeoutShort, 1*time.Second).Should(Satisfy(numberOfPods))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index ee6559396..7b5a768f5 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -33,6 +33,8 @@ import (
)
func TestKameletClasspathLoading(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
// Store a configmap on the cluster
@@ -108,28 +110,28 @@ spec:
constant: "{{contentType}}"
- to: kamelet:sink
`
- CreatePlainTextConfigmap(ns, "my-kamelet-cm", cmData)
+ CreatePlainTextConfigmap(t, ns, "my-kamelet-cm", cmData)
// Basic
t.Run("test basic case", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
"--resource", "configmap:my-kamelet-cm@/kamelets",
"-p camel.component.kamelet.location=file:/kamelets",
"-d", "camel:yaml-dsl",
// kamelet dependencies
"-d", "camel:timer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "timer-kamelet-integration")).Should(ContainSubstring("important message"))
+ Eventually(IntegrationPodPhase(t, ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "timer-kamelet-integration")).Should(ContainSubstring("important message"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "timer-kamelet-integration")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "timer-kamelet-integration")()
+ Eventually(UnstructuredIntegration(t, ns, "timer-kamelet-integration")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, "timer-kamelet-integration")()
kameletsTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "kamelets")
Expect(kameletsTrait).ToNot(BeNil())
Expect(len(kameletsTrait)).To(Equal(1))
Expect(kameletsTrait["enabled"]).To(Equal(false))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index 70202e1ce..361eecb65 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -35,21 +35,23 @@ import (
const customLabel = "custom-label"
func TestBundleKameletUpdate(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
- Expect(createBundleKamelet(ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
- Expect(createUserKamelet(ns, "user-sink")()).To(Succeed()) // Left intact by the operator
+ Expect(createBundleKamelet(t, ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
+ Expect(createUserKamelet(t, ns, "user-sink")()).To(Succeed()) // Left intact by the operator
- Eventually(Kamelet("my-http-sink", ns)).
+ Eventually(Kamelet(t, "my-http-sink", ns)).
Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
- Consistently(Kamelet("user-sink", ns), 5*time.Second, 1*time.Second).
+ Consistently(Kamelet(t, "user-sink", ns), 5*time.Second, 1*time.Second).
Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
-func createBundleKamelet(ns string, name string) func() error {
+func createBundleKamelet(t *testing.T, ns string, name string) func() error {
flow := map[string]interface{}{
"from": map[string]interface{}{
"uri": "kamelet:source",
@@ -60,10 +62,10 @@ func createBundleKamelet(ns string, name string) func() error {
customLabel: "true",
v1.KameletBundledLabel: "true",
}
- return CreateKamelet(ns, name, flow, nil, labels)
+ return CreateKamelet(t, ns, name, flow, nil, labels)
}
-func createUserKamelet(ns string, name string) func() error {
+func createUserKamelet(t *testing.T, ns string, name string) func() error {
flow := map[string]interface{}{
"from": map[string]interface{}{
"uri": "kamelet:source",
@@ -73,5 +75,5 @@ func createUserKamelet(ns string, name string) func() error {
labels := map[string]string{
customLabel: "true",
}
- return CreateKamelet(ns, name, flow, nil, labels)
+ return CreateKamelet(t, ns, name, flow, nil, labels)
}
diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go
index 0d8d47438..fee3ea655 100644
--- a/e2e/common/misc/maven_repository_test.go
+++ b/e2e/common/misc/maven_repository_test.go
@@ -34,22 +34,24 @@ import (
)
func TestRunExtraRepository(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--maven-repository", "https://maven.repository.redhat.com/ga@id=redhat",
"--dependency", "mvn:org.jolokia:jolokia-core:1.7.1.redhat-00001",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Integration(ns, name)).Should(WithTransform(IntegrationSpec, And(
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(Integration(t, ns, name)).Should(WithTransform(IntegrationSpec, And(
HaveExistingField("Repositories"),
HaveField("Repositories", ContainElements("https://maven.repository.redhat.com/ga@id=redhat")),
)))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go
index 4692e500c..07891d229 100644
--- a/e2e/common/misc/pipe_test.go
+++ b/e2e/common/misc/pipe_test.go
@@ -35,15 +35,17 @@ import (
)
func TestPipe(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
// Error Handler testing
t.Run("test error handler", func(t *testing.T) {
- Expect(createErrorProducerKamelet(ns, "my-own-error-producer-source")()).To(Succeed())
- Expect(CreateLogKamelet(ns, "my-own-log-sink")()).To(Succeed())
+ Expect(createErrorProducerKamelet(t, ns, "my-own-error-producer-source")()).To(Succeed())
+ Expect(CreateLogKamelet(t, ns, "my-own-log-sink")()).To(Succeed())
t.Run("throw error test", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-own-error-producer-source",
"my-own-log-sink",
"--error-handler", "sink:my-own-log-sink",
@@ -55,14 +57,14 @@ func TestPipe(t *testing.T) {
"--name", "throw-error-binding",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "throw-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "throw-error-binding"), TestTimeoutShort).Should(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
- Eventually(IntegrationLogs(ns, "throw-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
+ Eventually(IntegrationPodPhase(t, ns, "throw-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).Should(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
+ Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
})
t.Run("don't throw error test", func(t *testing.T) {
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-own-error-producer-source",
"my-own-log-sink",
"--error-handler", "sink:my-own-log-sink",
@@ -74,19 +76,19 @@ func TestPipe(t *testing.T) {
"--name", "no-error-binding",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "no-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "no-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
- Eventually(IntegrationLogs(ns, "no-error-binding"), TestTimeoutShort).Should(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
+ Eventually(IntegrationPodPhase(t, ns, "no-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
+ Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).Should(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
})
})
//Pipe with traits testing
t.Run("test Pipe with trait", func(t *testing.T) {
- Expect(CreateTimerKamelet(ns, "my-own-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "my-own-timer-source")()).To(Succeed())
// Log sink kamelet exists from previous test
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"-p", "source.message=hello from test",
@@ -95,9 +97,9 @@ func TestPipe(t *testing.T) {
"--name", "kb-with-traits",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "kb-with-traits"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("hello from test"))
- Eventually(IntegrationLogs(ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
+ Eventually(IntegrationPodPhase(t, ns, "kb-with-traits"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("hello from test"))
+ Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
})
// Pipe with wrong spec
@@ -105,22 +107,22 @@ func TestPipe(t *testing.T) {
name := RandomizedSuffixName("bad-klb")
kb := v1.NewPipe(ns, name)
kb.Spec = v1.PipeSpec{}
- _, err := kubernetes.ReplaceResource(TestContext, TestClient(), &kb)
+ _, err := kubernetes.ReplaceResource(TestContext, TestClient(t), &kb)
Eventually(err).Should(BeNil())
- Eventually(PipePhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
- Eventually(PipeCondition(ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
+ Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
+ Eventually(PipeCondition(t, ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
WithTransform(PipeConditionMessage, And(
ContainSubstring("could not determine source URI"),
ContainSubstring("no ref or URI specified in endpoint"),
)))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
-func createErrorProducerKamelet(ns string, name string) func() error {
+func createErrorProducerKamelet(t *testing.T, ns string, name string) func() error {
props := map[string]v1.JSONSchemaProp{
"message": {
Type: "string",
@@ -148,5 +150,5 @@ func createErrorProducerKamelet(ns string, name string) func() error {
},
}
- return CreateKamelet(ns, name, flow, props, nil)
+ return CreateKamelet(t, ns, name, flow, props, nil)
}
diff --git a/e2e/common/misc/pipe_with_image_test.go b/e2e/common/misc/pipe_with_image_test.go
index 6c9de10aa..9173cefe7 100644
--- a/e2e/common/misc/pipe_with_image_test.go
+++ b/e2e/common/misc/pipe_with_image_test.go
@@ -34,6 +34,8 @@ import (
)
func TestPipeWithImage(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
bindingID := "with-image-binding"
@@ -41,7 +43,7 @@ func TestPipeWithImage(t *testing.T) {
t.Run("run with initial image", func(t *testing.T) {
expectedImage := "docker.io/jmalloc/echo-server:0.3.2"
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"--annotation", "trait.camel.apache.org/container.image="+expectedImage,
@@ -52,24 +54,24 @@ func TestPipeWithImage(t *testing.T) {
"--name", bindingID,
).Execute()).To(Succeed())
- Eventually(IntegrationGeneration(ns, bindingID)).
+ Eventually(IntegrationGeneration(t, ns, bindingID)).
Should(gstruct.PointTo(BeNumerically("==", 1)))
- Eventually(Integration(ns, bindingID)).Should(WithTransform(Annotations, And(
+ Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
HaveKeyWithValue("test", "1"),
HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
)))
- Eventually(IntegrationStatusImage(ns, bindingID)).
+ Eventually(IntegrationStatusImage(t, ns, bindingID)).
Should(Equal(expectedImage))
- Eventually(IntegrationPodPhase(ns, bindingID), TestTimeoutLong).
+ Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodImage(ns, bindingID)).
+ Eventually(IntegrationPodImage(t, ns, bindingID)).
Should(Equal(expectedImage))
})
t.Run("run with new image", func(t *testing.T) {
expectedImage := "docker.io/jmalloc/echo-server:0.3.3"
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"--annotation", "trait.camel.apache.org/container.image="+expectedImage,
@@ -79,20 +81,20 @@ func TestPipeWithImage(t *testing.T) {
"--annotation", "test=2",
"--name", bindingID,
).Execute()).To(Succeed())
- Eventually(IntegrationGeneration(ns, bindingID)).
+ Eventually(IntegrationGeneration(t, ns, bindingID)).
Should(gstruct.PointTo(BeNumerically("==", 1)))
- Eventually(Integration(ns, bindingID)).Should(WithTransform(Annotations, And(
+ Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
HaveKeyWithValue("test", "2"),
HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
)))
- Eventually(IntegrationStatusImage(ns, bindingID)).
+ Eventually(IntegrationStatusImage(t, ns, bindingID)).
Should(Equal(expectedImage))
- Eventually(IntegrationPodPhase(ns, bindingID), TestTimeoutLong).
+ Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodImage(ns, bindingID)).
+ Eventually(IntegrationPodImage(t, ns, bindingID)).
Should(Equal(expectedImage))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index 9b4003536..bb8a39016 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -38,7 +38,9 @@ import (
)
func TestImageRegistryIsAMavenRepository(t *testing.T) {
- ocp, err := openshift.IsOpenShift(TestClient())
+ t.Parallel()
+
+ ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
if ocp {
t.Skip("Avoid running on OpenShift until CA and secret are injected client side")
@@ -53,59 +55,59 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
pom, err := filepath.Abs("files/registry/sample-decryption-1.0.pom")
require.NoError(t, err)
- Expect(KamelRunWithID(operatorID, ns, "files/registry/FoobarDecryption.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
"--name", name,
"-d", fmt.Sprintf("file://%s", jar),
"-d", fmt.Sprintf("file://%s", pom),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
t.Run("local files are mounted in the integration container at the default path", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-default-path")
- Expect(KamelRunWithID(operatorID, ns, "files/registry/LaughingRoute.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", "location=/deployments/?filename=laugh.txt",
"-d", "file://files/registry/laugh.txt",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
})
t.Run("local files are mounted in the integration container at a custom path", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-custom-path")
customPath := "this/is/a/custom/path/"
- Expect(KamelRunWithID(operatorID, ns, "files/registry/LaughingRoute.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", fmt.Sprintf("location=%s", customPath),
"-d", fmt.Sprintf("file://files/registry/laugh.txt?targetPath=%slaugh.txt", customPath),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
})
t.Run("local directory is mounted in the integration container", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-directory")
- Expect(KamelRunWithID(operatorID, ns, "files/registry/LaughingRoute.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", "location=files/registry/",
"-d", fmt.Sprintf("file://files/registry/laughs/?targetPath=files/registry/"),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
})
t.Run("pom file is extracted from JAR", func(t *testing.T) {
@@ -114,28 +116,28 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
jar, err := filepath.Abs("files/registry/sample-decryption-1.0.jar")
require.NoError(t, err)
- Expect(KamelRunWithID(operatorID, ns, "files/registry/FoobarDecryption.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
"--name", name,
"-d", fmt.Sprintf("file://%s", jar),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
t.Run("dependency can be used at build time", func(t *testing.T) {
// Create integration that should run an Xslt transformation whose template needs to be present at build time
name := RandomizedSuffixName("xslt")
- Expect(KamelRunWithID(operatorID, ns, "files/registry/classpath/Xslt.java", "--name", name,
+ Expect(KamelRunWithID(t, operatorID, ns, "files/registry/classpath/Xslt.java", "--name", name,
"-d", "file://files/registry/classpath/cheese.xsl?targetPath=xslt/cheese.xsl&classpath=true",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
})
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go
index 8c1a7b9c8..abe19d834 100644
--- a/e2e/common/misc/rest_test.go
+++ b/e2e/common/misc/rest_test.go
@@ -38,37 +38,39 @@ import (
)
func TestRunRest(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
- ocp, err := openshift.IsOpenShift(TestClient())
+ ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
- Expect(KamelRunWithID(operatorID, ns, "files/rest-consumer.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "rest-consumer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/rest-consumer.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "rest-consumer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
t.Run("Service works", func(t *testing.T) {
name := RandomizedSuffixName("John")
- service := Service(ns, "rest-consumer")
+ service := Service(t, ns, "rest-consumer")
Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
- Expect(KamelRunWithID(operatorID, ns, "files/rest-producer.yaml", "-p", "serviceName=rest-consumer", "-p", "name="+name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "rest-producer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
- Eventually(IntegrationLogs(ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/rest-producer.yaml", "-p", "serviceName=rest-consumer", "-p", "name="+name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "rest-producer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ Eventually(IntegrationLogs(t, ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
})
if ocp {
t.Run("Route works", func(t *testing.T) {
name := RandomizedSuffixName("Peter")
- route := Route(ns, "rest-consumer")
+ route := Route(t, ns, "rest-consumer")
Eventually(route, TestTimeoutShort).ShouldNot(BeNil())
- Eventually(RouteStatus(ns, "rest-consumer"), TestTimeoutMedium).Should(Equal("True"))
+ Eventually(RouteStatus(t, ns, "rest-consumer"), TestTimeoutMedium).Should(Equal("True"))
url := fmt.Sprintf("http://%s/customers/%s", route().Spec.Host, name)
Eventually(httpRequest(url), TestTimeoutMedium).Should(Equal(fmt.Sprintf("%s Doe", name)))
- Eventually(IntegrationLogs(ns, "rest-consumer"), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
})
}
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index b4501767d..49caec365 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -40,9 +40,11 @@ import (
)
func TestPipeScale(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
- ocp, err := openshift.IsOpenShift(TestClient())
+ ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
if ocp {
t.Skip("TODO: Temporarily disabled as this test is flaky on OpenShift 3")
@@ -50,30 +52,30 @@ func TestPipeScale(t *testing.T) {
}
name := RandomizedSuffixName("timer2log")
- Expect(KamelBindWithID(operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
+ Expect(KamelBindWithID(t, operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
t.Run("Update Pipe scale spec", func(t *testing.T) {
- Expect(ScalePipe(ns, name, 3)).To(Succeed())
+ Expect(ScalePipe(t, ns, name, 3)).To(Succeed())
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Check it also cascades into the Pipe scale subresource Status field
- Eventually(PipeStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
// Finally check the readiness condition becomes truthy back onPipe
- Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
t.Run("ScalePipe with polymorphic client", func(t *testing.T) {
- scaleClient, err := TestClient().ScalesClient()
+ scaleClient, err := TestClient(t).ScalesClient()
Expect(err).To(BeNil())
// Patch the integration scale subresource
@@ -82,22 +84,22 @@ func TestPipeScale(t *testing.T) {
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(PipeConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Finally check it cascades into the Pipe scale subresource Status field
- Eventually(PipeStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
})
t.Run("ScalePipe with Camel K client", func(t *testing.T) {
- camel, err := versioned.NewForConfig(TestClient().GetConfig())
+ camel, err := versioned.NewForConfig(TestClient(t).GetConfig())
Expect(err).To(BeNil())
// Getter
@@ -112,22 +114,22 @@ func TestPipeScale(t *testing.T) {
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling inPipe
- Expect(PipeConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Pipe scale subresource Spec field
- Eventually(PipeSpecReplicas(ns, name), TestTimeoutShort).
+ Eventually(PipeSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(1))
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go
index 0b38946ed..fdbc80288 100644
--- a/e2e/common/misc/scale_integration_test.go
+++ b/e2e/common/misc/scale_integration_test.go
@@ -39,30 +39,32 @@ import (
)
func TestIntegrationScale(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
t.Run("Update integration scale spec", func(t *testing.T) {
RegisterTestingT(t)
- Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
+ Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
// Check the readiness condition becomes falsy
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Finally check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
t.Run("Scale integration with polymorphic client", func(t *testing.T) {
- scaleClient, err := TestClient().ScalesClient()
+ scaleClient, err := TestClient(t).ScalesClient()
Expect(err).To(BeNil())
// Patch the integration scale subresource
@@ -71,19 +73,19 @@ func TestIntegrationScale(t *testing.T) {
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(2))
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
})
t.Run("Scale integration with Camel K client", func(t *testing.T) {
- camel, err := versioned.NewForConfig(TestClient().GetConfig())
+ camel, err := versioned.NewForConfig(TestClient(t).GetConfig())
Expect(err).To(BeNil())
// Getter
@@ -98,35 +100,35 @@ func TestIntegrationScale(t *testing.T) {
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(1))
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
})
t.Run("Scale integration with external image", func(t *testing.T) {
- image := IntegrationPodImage(ns, name)()
+ image := IntegrationPodImage(t, ns, name)()
Expect(image).NotTo(BeEmpty())
// Save resources by deleting the integration
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
-
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(ScaleIntegration(ns, "pre-built", 0)).To(Succeed())
- Eventually(IntegrationPod(ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
- Expect(ScaleIntegration(ns, "pre-built", 1)).To(Succeed())
- Eventually(IntegrationPhase(ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- Expect(Kamel("delete", "pre-built", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
+ Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(ScaleIntegration(t, ns, "pre-built", 0)).To(Succeed())
+ Eventually(IntegrationPod(t, ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
+ Expect(ScaleIntegration(t, ns, "pre-built", 1)).To(Succeed())
+ Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index e011a1ae5..a94925fcd 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -35,17 +35,19 @@ import (
)
func TestStructuredLogs(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "logging.format=json").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- pod := OperatorPod(opns)()
+ pod := OperatorPod(t, opns)()
Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
@@ -53,15 +55,15 @@ func TestStructuredLogs(t *testing.T) {
logOptions := &corev1.PodLogOptions{
Container: "camel-k-operator",
}
- logs, err := StructuredLogs(pod.Namespace, pod.Name, logOptions, false)
+ logs, err := StructuredLogs(t, pod.Namespace, pod.Name, logOptions, false)
Expect(err).To(BeNil())
Expect(logs).NotTo(BeEmpty())
- it := Integration(ns, name)()
+ it := Integration(t, ns, name)()
Expect(it).NotTo(BeNil())
- build := Build(IntegrationKitNamespace(ns, name)(), IntegrationKit(ns, name)())()
+ build := Build(t, IntegrationKitNamespace(t, ns, name)(), IntegrationKit(t, ns, name)())()
Expect(build).NotTo(BeNil())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go
index 0e53eb022..57442e03e 100644
--- a/e2e/common/runtimes/runtimes_test.go
+++ b/e2e/common/runtimes/runtimes_test.go
@@ -34,41 +34,43 @@ import (
)
func TestSourceLessIntegrations(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
var cmData = make(map[string]string)
cmData["my-file.txt"] = "Hello World!"
- CreatePlainTextConfigmap(ns, "my-cm-sourceless", cmData)
+ CreatePlainTextConfigmap(t, ns, "my-cm-sourceless", cmData)
t.Run("Camel Main", func(t *testing.T) {
itName := "my-camel-main-v1"
- Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)"))
+ Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)"))
})
t.Run("Camel Spring Boot", func(t *testing.T) {
itName := "my-camel-sb-v1"
- Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("Spring Boot"))
+ Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Spring Boot"))
})
t.Run("Camel Quarkus", func(t *testing.T) {
itName := "my-camel-quarkus-v1"
- Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-quarkus:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
+ Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-quarkus:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/setup/main_test.go b/e2e/common/setup/main_test.go
index ed301d2cd..a384c9e60 100644
--- a/e2e/common/setup/main_test.go
+++ b/e2e/common/setup/main_test.go
@@ -49,15 +49,23 @@ func TestMain(m *testing.M) {
fmt.Printf("Test fast setup failed! - %s\n", message)
})
- g.Expect(KamelRunWithID(operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- g.Expect(KamelRunWithID(operatorID, ns, "testdata/yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ var t *testing.T
+ g.Expect(TestClient(t)).ShouldNot(BeNil())
+ g.Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
+ // Adjust global operator integration platform settings
+ // Tests are run in parallel so need to choose a proper build order strategy
+ pl.Spec.Build.BuildConfiguration.OrderStrategy = v1.BuildOrderStrategyDependencies
+ })).To(Succeed())
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
os.Exit(m.Run())
}
diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go
index 1c3cadff6..6725dda04 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -37,10 +37,12 @@ import (
)
func TestAffinityTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
var hostname string
- if node, err := selectSchedulableNode(); err == nil {
+ if node, err := selectSchedulableNode(t); err == nil {
hostname = node.Labels["kubernetes.io/hostname"]
} else {
// if 'get nodes' is not allowed, just skip tests for node affinity
@@ -50,15 +52,15 @@ func TestAffinityTrait(t *testing.T) {
if hostname != "" {
t.Run("Run Java with node affinity", func(t *testing.T) {
name1 := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name1,
"-t", "affinity.enabled=true",
"-t", fmt.Sprintf("affinity.node-affinity-labels=kubernetes.io/hostname in(%s)", hostname)).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name1)()
+ pod := IntegrationPod(t, ns, name1)()
Expect(pod.Spec.Affinity).NotTo(BeNil())
Expect(pod.Spec.Affinity.NodeAffinity).To(Equal(&corev1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: nodeSelector("kubernetes.io/hostname", corev1.NodeSelectorOpIn, hostname),
@@ -66,28 +68,28 @@ func TestAffinityTrait(t *testing.T) {
Expect(pod.Spec.NodeName).To(Equal(hostname))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name1)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name1)()
+ Eventually(UnstructuredIntegration(t, ns, name1)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name1)()
affinityTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "affinity")
Expect(affinityTrait).NotTo(BeNil())
Expect(len(affinityTrait)).To(Equal(2))
Expect(affinityTrait["enabled"]).To(Equal(true))
Expect(affinityTrait["nodeAffinityLabels"]).NotTo(BeNil())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
t.Run("Run Java with pod affinity", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", "java2",
"-t", "affinity.enabled=true",
"-t", "affinity.pod-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java2"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java2", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java2"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, "java2"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "java2", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "java2"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, "java2")()
+ pod := IntegrationPod(t, ns, "java2")()
Expect(pod.Spec.Affinity).NotTo(BeNil())
Expect(pod.Spec.Affinity.PodAffinity).To(Equal(&corev1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
@@ -95,19 +97,19 @@ func TestAffinityTrait(t *testing.T) {
},
}))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run Java with pod anti affinity", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", "java3",
"-t", "affinity.enabled=true",
"-t", "affinity.pod-anti-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java3"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java3", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java3"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, "java3"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "java3", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "java3"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, "java3")()
+ pod := IntegrationPod(t, ns, "java3")()
Expect(pod.Spec.Affinity).NotTo(BeNil())
Expect(pod.Spec.Affinity.PodAntiAffinity).To(Equal(&corev1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
@@ -115,13 +117,13 @@ func TestAffinityTrait(t *testing.T) {
},
}))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
-func selectSchedulableNode() (*corev1.Node, error) {
- nodes, err := TestClient().CoreV1().Nodes().List(TestContext, metav1.ListOptions{})
+func selectSchedulableNode(t *testing.T) (*corev1.Node, error) {
+ nodes, err := TestClient(t).CoreV1().Nodes().List(TestContext, metav1.ListOptions{})
if err != nil {
return nil, err
}
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index 2fb24bcaf..c1f9323c2 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -37,97 +37,99 @@ import (
)
func TestBuilderTrait(t *testing.T) {
+ // Test not able to run in parallel because of maven profile tests
WithNewTestNamespace(t, func(ns string) {
t.Run("Run build strategy routine", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
+ "-t", "builder.order-strategy=sequential",
"-t", "builder.strategy=routine").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ integrationKitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
// Default resource CPU Check
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build order strategy dependencies", func(t *testing.T) {
name := RandomizedSuffixName("java-dependencies-strategy")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.order-strategy=dependencies").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ integrationKitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
// Default resource CPU Check
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "builder")
Expect(builderTrait).NotTo(BeNil())
Expect(len(builderTrait)).To(Equal(1))
Expect(builderTrait["orderStrategy"]).To(Equal("dependencies"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build order strategy fifo", func(t *testing.T) {
name := RandomizedSuffixName("java-fifo-strategy")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.order-strategy=fifo").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ integrationKitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO))
// Default resource CPU Check
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build resources configuration", func(t *testing.T) {
name := RandomizedSuffixName("java-resource-config")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks-request-cpu=builder:500m",
"-t", "builder.tasks-limit-cpu=builder:1000m",
@@ -136,101 +138,100 @@ func TestBuilderTrait(t *testing.T) {
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ integrationKitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m"))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m"))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi"))
- Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi"))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m"))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m"))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi"))
+ Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
// Let's assert we set the resources on the builder container
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run custom pipeline task", func(t *testing.T) {
name := RandomizedSuffixName("java-pipeline")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks=custom1;alpine;tree",
"-t", "builder.tasks=custom2;alpine;cat maven/pom.xml",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ integrationKitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(len(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(4))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(4))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2"))
// Check containers conditions
- Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
Eventually(
- Build(
- integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
+ Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(
- Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
+ Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("generated-bytecode.jar"))
- Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
Eventually(
- Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Status,
+ Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(
- Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Message,
+ Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("</project>"))
// Check logs
- Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
- Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`))
+ Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
+ Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run custom pipeline task error", func(t *testing.T) {
name := RandomizedSuffixName("java-error")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks=custom1;alpine;cat missingfile.txt",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ integrationKitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
// Check containers conditions
- Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(BuildConditions(integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded")), TestTimeoutMedium).ShouldNot(BeNil())
+ Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
+ Eventually(BuildConditions(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
+ Eventually(BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded")), TestTimeoutMedium).ShouldNot(BeNil())
Eventually(
- BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Status,
+ BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
Eventually(
- BuildCondition(integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Message,
+ BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Message,
TestTimeoutShort).Should(ContainSubstring("No such file or directory"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run maven profile", func(t *testing.T) {
@@ -238,11 +239,11 @@ func TestBuilderTrait(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
mavenProfile1Cm := newMavenProfileConfigMap(opns, "maven-profile-owasp", "owasp-profile")
- Expect(TestClient().Create(TestContext, mavenProfile1Cm)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, mavenProfile1Cm)).To(Succeed())
mavenProfile2Cm := newMavenProfileConfigMap(opns, "maven-profile-dependency", "dependency-profile")
- Expect(TestClient().Create(TestContext, mavenProfile2Cm)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, mavenProfile2Cm)).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.maven-profiles=configmap:maven-profile-owasp/owasp-profile",
"-t", "builder.maven-profiles=configmap:maven-profile-dependency/dependency-profile",
@@ -250,35 +251,35 @@ func TestBuilderTrait(t *testing.T) {
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKitName := IntegrationKit(ns, name)()
- integrationKitNamespace := IntegrationKitNamespace(ns, name)()
+ integrationKitName := IntegrationKit(t, ns, name)()
+ integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(len(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
- Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("package"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
+ Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("package"))
// Check containers conditions
- Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
Eventually(
- Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
+ Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(
- Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
+ Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("</project>"))
// Check logs
- Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
- Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
+ Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
+ Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient().Delete(TestContext, mavenProfile1Cm)).To(Succeed())
- Expect(TestClient().Delete(TestContext, mavenProfile2Cm)).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, mavenProfile1Cm)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, mavenProfile2Cm)).To(Succeed())
})
})
}
diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go
index 1cce0aa5b..c2cd82432 100644
--- a/e2e/common/traits/camel_test.go
+++ b/e2e/common/traits/camel_test.go
@@ -34,37 +34,39 @@ import (
)
func TestCamelTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("properties changes should not rebuild", func(t *testing.T) {
- Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
// checking the integration status
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- integrationKit := IntegrationKit(ns, name)()
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ integrationKit := IntegrationKit(t, ns, name)()
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-p", "a=1",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationKit(ns, name)).Should(Equal(integrationKit))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationKit(t, ns, name)).Should(Equal(integrationKit))
- Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(ns, name), TestTimeoutLong).Should(BeNil())
+ Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
})
// Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go
index 8fa216fe8..d3ff9cc89 100644
--- a/e2e/common/traits/container_test.go
+++ b/e2e/common/traits/container_test.go
@@ -35,11 +35,13 @@ import (
)
func TestContainerTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Container image pull policy and resources configuration", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "container.image-pull-policy=Always",
"-t", "container.request-cpu=0.005",
"-t", "container.request-memory=100Mi",
@@ -47,17 +49,17 @@ func TestContainerTrait(t *testing.T) {
"-t", "container.limit-memory=500Mi",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
imagePullPolicy := pod.Spec.Containers[0].ImagePullPolicy
return imagePullPolicy == "Always"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -65,7 +67,7 @@ func TestContainerTrait(t *testing.T) {
requestsCpu := pod.Spec.Containers[0].Resources.Requests.Cpu()
return limitsCpu != nil && limitsCpu.String() == "200m" && requestsCpu != nil && requestsCpu.String() == "5m"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -79,14 +81,14 @@ func TestContainerTrait(t *testing.T) {
t.Run("Container name", func(t *testing.T) {
name := RandomizedSuffixName("java2")
containerName := "my-container-name"
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "container.name="+containerName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -95,8 +97,8 @@ func TestContainerTrait(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
containerTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "container")
Expect(containerTrait).ToNot(BeNil())
Expect(len(containerTrait)).To(Equal(1))
@@ -105,6 +107,6 @@ func TestContainerTrait(t *testing.T) {
})
// Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index 9a5e24117..d8dd0310a 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -38,20 +38,22 @@ import (
)
func TestRecreateDeploymentStrategyTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Run with Recreate Deployment Strategy", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "deployment.strategy="+string(appsv1.RecreateDeploymentStrategyType)).
Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Deployment(ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ Eventually(Deployment(t, ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Spec": MatchFields(IgnoreExtras,
Fields{
@@ -64,8 +66,8 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
deploymentTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "deployment")
Expect(deploymentTrait).ToNot(BeNil())
Expect(len(deploymentTrait)).To(Equal(1))
@@ -73,7 +75,7 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -81,15 +83,15 @@ func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
t.Run("Run with RollingUpdate Deployment Strategy", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "deployment.strategy="+string(appsv1.RollingUpdateDeploymentStrategyType)).
Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Deployment(ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ Eventually(Deployment(t, ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Spec": MatchFields(IgnoreExtras,
Fields{
@@ -102,6 +104,6 @@ func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go
index 68f0c0cb0..316f8d233 100644
--- a/e2e/common/traits/error_handler_test.go
+++ b/e2e/common/traits/error_handler_test.go
@@ -34,21 +34,23 @@ import (
)
func TestErrorHandlerTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Run errored integration with error handler", func(t *testing.T) {
name := RandomizedSuffixName("error-handler")
- Expect(KamelRunWithID(operatorID, ns, "files/ErroredRoute.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/ErroredRoute.java",
"--name", name,
"-t", "error-handler.enabled=true",
"-t", "error-handler.ref=defaultErrorHandler",
"-p", "camel.beans.defaultErrorHandler=#class:org.apache.camel.builder.DeadLetterChannelBuilder",
"-p", "camel.beans.defaultErrorHandler.deadLetterUri=log:my-special-error-handler-in-place?level=ERROR&showCaughtException=false&showBody=false&showBodyType=false&showExchangePattern=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).ShouldNot(ContainSubstring("InvalidPayloadException"))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("my-special-error-handler-in-place"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).ShouldNot(ContainSubstring("InvalidPayloadException"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my-special-error-handler-in-place"))
})
})
}
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 3a01aace1..9ee4388eb 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -34,17 +34,19 @@ import (
)
func TestErroredTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Integration trait should fail", func(t *testing.T) {
name := RandomizedSuffixName("it-errored")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
@@ -52,28 +54,28 @@ func TestErroredTrait(t *testing.T) {
t.Run("Pipe trait should fail", func(t *testing.T) {
name := RandomizedSuffixName("kb-errored")
- Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar",
+ Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar",
"--name", name,
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
// Pipe
- Eventually(PipePhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(PipeCondition(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
+ Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(PipeCondition(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
WithTransform(PipeConditionMessage, And(
ContainSubstring("error during trait customization"),
ContainSubstring("[missing] not found"),
)))
// Integration related
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
})
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 69a61c73f..62403812f 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -43,11 +43,13 @@ import (
)
func TestHealthTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Readiness condition with stopped route scaled", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "health.enabled=true",
// Enable Jolokia for the test to stop the Camel route
"-t", "jolokia.enabled=true",
@@ -56,32 +58,32 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
+ Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
// Check the readiness condition becomes falsy
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Finally check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
healthTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "health")
Expect(healthTrait).ToNot(BeNil())
Expect(len(healthTrait)).To(Equal(1))
Expect(healthTrait["enabled"]).To(Equal(true))
- pods := IntegrationPods(ns, name)()
+ pods := IntegrationPods(t, ns, name)()
for i, pod := range pods {
// Stop the Camel route
@@ -93,22 +95,22 @@ func TestHealthTrait(t *testing.T) {
body, err := json.Marshal(request)
Expect(err).To(BeNil())
- response, err := TestClient().CoreV1().RESTClient().Post().
+ response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
Expect(err).To(BeNil())
Expect(response).To(ContainSubstring(`"status":200`))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal(fmt.Sprintf("%d/3 pods are not ready", i+1)))))
}
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -145,15 +147,15 @@ func TestHealthTrait(t *testing.T) {
return true
}))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Readiness condition with stopped route", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "health.enabled=true",
// Enable Jolokia for the test to stop the Camel route
"-t", "jolokia.enabled=true",
@@ -162,13 +164,13 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
// Stop the Camel route
request := map[string]string{
@@ -179,7 +181,7 @@ func TestHealthTrait(t *testing.T) {
body, err := json.Marshal(request)
Expect(err).To(BeNil())
- response, err := TestClient().CoreV1().RESTClient().Post().
+ response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
@@ -187,7 +189,7 @@ func TestHealthTrait(t *testing.T) {
Expect(response).To(ContainSubstring(`"status":200`))
// Check the ready condition has turned false
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// And it contains details about the runtime state
@@ -202,11 +204,11 @@ func TestHealthTrait(t *testing.T) {
// status: "False"
// type: Ready
//
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -239,10 +241,10 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped"
}))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Readiness condition with stopped binding", func(t *testing.T) {
@@ -250,10 +252,10 @@ func TestHealthTrait(t *testing.T) {
source := RandomizedSuffixName("my-health-timer-source")
sink := RandomizedSuffixName("my-health-log-sink")
- Expect(CreateTimerKamelet(ns, source)()).To(Succeed())
- Expect(CreateLogKamelet(ns, sink)()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, source)()).To(Succeed())
+ Expect(CreateLogKamelet(t, ns, sink)()).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns,
+ Expect(KamelBindWithID(t, operatorID, ns,
source,
sink,
"-p", "source.message=Magicstring!",
@@ -265,12 +267,12 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
// Stop the Camel route
request := map[string]string{
@@ -281,7 +283,7 @@ func TestHealthTrait(t *testing.T) {
body, err := json.Marshal(request)
Expect(err).To(BeNil())
- response, err := TestClient().CoreV1().RESTClient().Post().
+ response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
@@ -290,15 +292,15 @@ func TestHealthTrait(t *testing.T) {
Expect(response).To(ContainSubstring(`"status":200`))
// Check the ready condition has turned false
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// And it contains details about the runtime state
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -331,7 +333,7 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
}))
- Eventually(PipeCondition(ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
+ Eventually(PipeCondition(t, ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *camelv1.PipeCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -365,31 +367,31 @@ func TestHealthTrait(t *testing.T) {
}))
// Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(DeleteKamelet(ns, source)).To(Succeed())
- Expect(DeleteKamelet(ns, sink)).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteKamelet(t, ns, source)).To(Succeed())
+ Expect(DeleteKamelet(t, ns, sink)).To(Succeed())
})
t.Run("Readiness condition with never ready route", func(t *testing.T) {
name := RandomizedSuffixName("never-ready")
- Expect(KamelRunWithID(operatorID, ns, "files/NeverReady.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
"--name", name,
"-t", "health.enabled=true",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Consistently(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), 1*time.Minute).
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
// Check that the error message is propagated from health checks even if deployment never becomes ready
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -426,23 +428,23 @@ func TestHealthTrait(t *testing.T) {
t.Run("Startup condition with never ready route", func(t *testing.T) {
name := RandomizedSuffixName("startup-probe-never-ready-route")
- Expect(KamelRunWithID(operatorID, ns, "files/NeverReady.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
"--name", name,
"-t", "health.enabled=true",
"-t", "health.startup-probe-enabled=true",
"-t", "health.startup-timeout=60",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Consistently(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), 1*time.Minute).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -488,17 +490,17 @@ func TestHealthTrait(t *testing.T) {
t.Run("Startup condition with ready route", func(t *testing.T) {
name := RandomizedSuffixName("startup-probe-ready-route")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "health.enabled=true",
"-t", "health.startup-probe-enabled=true",
"-t", "health.startup-timeout=60",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationCondition(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(And(
+ Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 ready replicas"))))
@@ -511,6 +513,6 @@ func TestHealthTrait(t *testing.T) {
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index 5a0d7567a..c66019349 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -35,26 +35,28 @@ import (
)
func TestIstioTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Run Java with Istio", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "istio.enabled=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
Expect(pod.ObjectMeta.Annotations).NotTo(BeNil())
annotations := pod.ObjectMeta.Annotations
Expect(annotations["sidecar.istio.io/inject"]).To(Equal("true"))
Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).To(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
istioTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "istio")
Expect(istioTrait).ToNot(BeNil())
Expect(len(istioTrait)).To(Equal(1))
@@ -62,6 +64,6 @@ func TestIstioTrait(t *testing.T) {
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go
index bf9b332d6..d43c9385d 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -36,29 +36,31 @@ import (
)
func TestJolokiaTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Run Java with Jolokia", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "jolokia.enabled=true",
"-t", "jolokia.use-ssl-client-authentication=false",
"-t", "jolokia.protocol=http",
"-t", "jolokia.extended-client-check=false").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)
- response, err := TestClient().CoreV1().RESTClient().Get().
+ pod := IntegrationPod(t, ns, name)
+ response, err := TestClient(t).CoreV1().RESTClient().Get().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod().Name)).DoRaw(TestContext)
Expect(err).To(BeNil())
Expect(response).To(ContainSubstring(`"status":200`))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
jolokiaTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jolokia")
Expect(jolokiaTrait).ToNot(BeNil())
Expect(len(jolokiaTrait)).To(Equal(4))
@@ -69,6 +71,6 @@ func TestJolokiaTrait(t *testing.T) {
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go
index bf2b6638a..6ea2dc89b 100644
--- a/e2e/common/traits/jvm_test.go
+++ b/e2e/common/traits/jvm_test.go
@@ -37,6 +37,8 @@ import (
)
func TestJVMTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
// Store a configmap holding a jar
@@ -45,27 +47,27 @@ func TestJVMTrait(t *testing.T) {
source, err := os.ReadFile("./files/jvm/sample-1.0.jar")
require.NoError(t, err)
cmData["sample-1.0.jar"] = source
- err = CreateBinaryConfigmap(ns, "my-deps", cmData)
+ err = CreateBinaryConfigmap(t, ns, "my-deps", cmData)
require.NoError(t, err)
t.Run("JVM trait classpath", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "./files/jvm/Classpath.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "./files/jvm/Classpath.java",
"--resource", "configmap:my-deps",
"-t", "jvm.classpath=/etc/camel/resources/my-deps/sample-1.0.jar",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
+ Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "classpath")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "classpath")()
+ Eventually(UnstructuredIntegration(t, ns, "classpath")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, "classpath")()
jvmTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jvm")
Expect(jvmTrait).ToNot(BeNil())
Expect(len(jvmTrait)).To(Equal(1))
Expect(jvmTrait["classpath"]).To(Equal("/etc/camel/resources/my-deps/sample-1.0.jar"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go
index a23789408..a0476a662 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -34,6 +34,8 @@ import (
)
func TestKameletTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("discover kamelet capabilities", func(t *testing.T) {
@@ -47,22 +49,22 @@ func TestKameletTrait(t *testing.T) {
},
},
}
- Expect(CreateKamelet(ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
+ Expect(CreateKamelet(t, ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
name := RandomizedSuffixName("webhook")
- Expect(KamelRunWithID(operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Started capabilities-webhook-source-1 (platform-http:///webhook)"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Started capabilities-webhook-source-1 (platform-http:///webhook)"))
// Verify Integration capabilities
- Eventually(IntegrationStatusCapabilities(ns, name), TestTimeoutShort).Should(ContainElements("platform-http"))
+ Eventually(IntegrationStatusCapabilities(t, ns, name), TestTimeoutShort).Should(ContainElements("platform-http"))
// Verify expected resources from Kamelet (Service in this case)
- service := Service(ns, name)
+ service := Service(t, ns, name)
Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
})
// Clean-up
- Expect(DeleteKamelet(ns, "capabilities-webhook-source")).To(Succeed())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteKamelet(t, ns, "capabilities-webhook-source")).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go
index 06c6cf5cd..bd5980872 100644
--- a/e2e/common/traits/master_test.go
+++ b/e2e/common/traits/master_test.go
@@ -35,41 +35,43 @@ import (
)
func TestMasterTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("master works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/Master.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "master"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "master"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "master"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "master"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("only one integration with master runs", func(t *testing.T) {
nameFirst := RandomizedSuffixName("first")
- Expect(KamelRunWithID(operatorID, ns, "files/Master.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
"--name", nameFirst,
"--label", "leader-group=same",
"-t", "master.label-key=leader-group",
"-t", "master.label-value=same",
"-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Start a second integration with the same lock (it should not start the route)
nameSecond := RandomizedSuffixName("second")
- Expect(KamelRunWithID(operatorID, ns, "files/Master.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
"--name", nameSecond,
"--label", "leader-group=same",
"-t", "master.label-key=leader-group",
"-t", "master.label-value=same",
"-t", "master.resource-name=first-lock",
"-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in"))
- Eventually(IntegrationLogs(ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in"))
+ Eventually(IntegrationLogs(t, ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, nameFirst)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, nameFirst)()
+ Eventually(UnstructuredIntegration(t, ns, nameFirst)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, nameFirst)()
builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "addons", "master")
Expect(builderTrait).ToNot(BeNil())
Expect(len(builderTrait)).To(Equal(2))
@@ -77,6 +79,6 @@ func TestMasterTrait(t *testing.T) {
Expect(builderTrait["labelValue"]).To(Equal("same"))
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go
index 10f321e88..8036058a8 100644
--- a/e2e/common/traits/openapi_test.go
+++ b/e2e/common/traits/openapi_test.go
@@ -35,32 +35,34 @@ import (
)
func TestOpenAPI(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
openapiContent, err := ioutil.ReadFile("./files/openapi/petstore-api.yaml")
require.NoError(t, err)
var cmDataProps = make(map[string]string)
cmDataProps["petstore-api.yaml"] = string(openapiContent)
- CreatePlainTextConfigmap(ns, "my-openapi", cmDataProps)
+ CreatePlainTextConfigmap(t, ns, "my-openapi", cmDataProps)
- Expect(KamelRunWithID(operatorID, ns,
+ Expect(KamelRunWithID(t, operatorID, ns,
"--name", "petstore",
"--open-api", "configmap:my-openapi",
"files/openapi/petstore.groovy",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "petstore"), TestTimeoutLong).
+ Eventually(IntegrationPodPhase(t, ns, "petstore"), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(DeploymentWithIntegrationLabel(ns, "petstore"), TestTimeoutLong).
+ Eventually(DeploymentWithIntegrationLabel(t, ns, "petstore"), TestTimeoutLong).
Should(Not(BeNil()))
- Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
+ Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started listPets (rest://get:/v1:/pets)"))
- Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
+ Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started createPets (rest://post:/v1:/pets)"))
- Eventually(IntegrationLogs(ns, "petstore"), TestTimeoutMedium).
+ Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started showPetById (rest://get:/v1:/pets/%7BpetId%7D)"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index 6c4c0083e..d8d0a7759 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -43,22 +43,24 @@ import (
)
func TestPodDisruptionBudgetTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "pdb.enabled=true",
"-t", "pdb.min-available=2",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
pdbTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pdb")
Expect(pdbTrait).ToNot(BeNil())
Expect(len(pdbTrait)).To(Equal(2))
@@ -66,12 +68,12 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
Expect(pdbTrait["minAvailable"]).To(Equal("2"))
// Check PodDisruptionBudget
- Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).ShouldNot(BeNil())
- pdb := podDisruptionBudget(ns, name)()
+ Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).ShouldNot(BeNil())
+ pdb := podDisruptionBudget(t, ns, name)()
// Assert PDB Spec
Expect(pdb.Spec.MinAvailable).To(PointTo(Equal(intstr.FromInt(2))))
// Assert PDB Status
- Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).
+ Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
Should(MatchFieldsP(IgnoreExtras, Fields{
"Status": MatchFields(IgnoreExtras, Fields{
"ObservedGeneration": BeNumerically("==", 1),
@@ -83,17 +85,17 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
}))
// Scale Integration
- Expect(ScaleIntegration(ns, name, 2)).To(Succeed())
- Eventually(IntegrationPods(ns, name), TestTimeoutMedium).Should(HaveLen(2))
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(2))
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(PointTo(BeNumerically("==", 2)))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
// Check PodDisruptionBudget
- pdb = podDisruptionBudget(ns, name)()
+ pdb = podDisruptionBudget(t, ns, name)()
Expect(pdb).NotTo(BeNil())
// Assert PDB Status according to the scale change
- Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).
+ Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
Should(MatchFieldsP(IgnoreExtras, Fields{
"Status": MatchFields(IgnoreExtras, Fields{
"ObservedGeneration": BeNumerically("==", 1),
@@ -105,9 +107,9 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
}))
// Eviction attempt
- pods := IntegrationPods(ns, name)()
+ pods := IntegrationPods(t, ns, name)()
Expect(pods).To(HaveLen(2))
- err := TestClient().CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
+ err := TestClient(t).CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
ObjectMeta: metav1.ObjectMeta{
Name: pods[0].Name,
},
@@ -131,26 +133,26 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
// Scale Integration to Scale > PodDisruptionBudgetSpec.MinAvailable
// for the eviction request to succeed once replicas are ready
- Expect(ScaleIntegration(ns, name, 3)).To(Succeed())
- Eventually(IntegrationPods(ns, name), TestTimeoutMedium).Should(HaveLen(3))
- Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
+ Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
+ Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(3))
+ Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(PointTo(BeNumerically("==", 3)))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- pods = IntegrationPods(ns, name)()
+ pods = IntegrationPods(t, ns, name)()
Expect(pods).To(HaveLen(3))
- Expect(TestClient().CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
+ Expect(TestClient(t).CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
ObjectMeta: metav1.ObjectMeta{
Name: pods[0].Name,
},
})).To(Succeed())
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
-func podDisruptionBudget(ns string, name string) func() *policyv1.PodDisruptionBudget {
+func podDisruptionBudget(t *testing.T, ns string, name string) func() *policyv1.PodDisruptionBudget {
return func() *policyv1.PodDisruptionBudget {
pdb := policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{
@@ -162,7 +164,7 @@ func podDisruptionBudget(ns string, name string) func() *policyv1.PodDisruptionB
Name: name,
},
}
- err := TestClient().Get(TestContext, ctrl.ObjectKeyFromObject(&pdb), &pdb)
+ err := TestClient(t).Get(TestContext, ctrl.ObjectKeyFromObject(&pdb), &pdb)
if err != nil && k8serrors.IsNotFound(err) {
return nil
} else if err != nil {
diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go
index bfc679655..a8f0d6b99 100644
--- a/e2e/common/traits/pod_test.go
+++ b/e2e/common/traits/pod_test.go
@@ -34,6 +34,8 @@ import (
)
func TestPodTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
tc := []struct {
@@ -47,10 +49,10 @@ func TestPodTrait(t *testing.T) {
//nolint: thelper
assertions: func(t *testing.T, ns string, name string) {
// check that integrations is working and reading data created by sidecar container
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Content from the sidecar container"))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Content from the sidecar container"))
// check that env var is injected
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("hello from the template"))
- pod := IntegrationPod(ns, name)()
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hello from the template"))
+ pod := IntegrationPod(t, ns, name)()
// check if ENV variable is applied
envValue := getEnvVar("TEST_VARIABLE", pod.Spec)
@@ -62,7 +64,7 @@ func TestPodTrait(t *testing.T) {
templateName: "files/template-with-supplemental-groups.yaml",
//nolint: thelper
assertions: func(t *testing.T, ns string, name string) {
- Eventually(IntegrationPodHas(ns, name, func(pod *corev1.Pod) bool {
+ Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if pod.Spec.SecurityContext == nil {
return false
}
@@ -83,23 +85,23 @@ func TestPodTrait(t *testing.T) {
test := tc[i]
t.Run(test.name, func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PodTest.groovy",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PodTest.groovy",
"--name", name,
"--pod-template", test.templateName,
).Execute()).To(Succeed())
// check integration is deployed
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
test.assertions(t, ns, name)
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go
index 5a1bb4f1e..aa359e0bc 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -44,30 +44,31 @@ import (
)
func TestPrometheusTrait(t *testing.T) {
+ // test not able to run in parallel
WithNewTestNamespace(t, func(ns string) {
- ocp, err := openshift.IsOpenShift(TestClient())
+ ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
// Do not create PodMonitor for the time being as CI test runs on OCP 3.11
createPodMonitor := false
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "prometheus.enabled=true",
"-t", fmt.Sprintf("prometheus.pod-monitor=%v", createPodMonitor)).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "java")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "java")()
+ Eventually(UnstructuredIntegration(t, ns, "java")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, "java")()
prometheusTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "prometheus")
Expect(prometheusTrait).ToNot(BeNil())
Expect(len(prometheusTrait)).To(Equal(2))
Expect(prometheusTrait["enabled"]).To(Equal(true))
Expect(prometheusTrait["podMonitor"]).ToNot(BeNil())
t.Run("Metrics endpoint works", func(t *testing.T) {
- pod := IntegrationPod(ns, "java")
- response, err := TestClient().CoreV1().RESTClient().Get().
+ pod := IntegrationPod(t, ns, "java")
+ response, err := TestClient(t).CoreV1().RESTClient().Get().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/q/metrics", ns, pod().Name)).DoRaw(TestContext)
if err != nil {
assert.Fail(t, err.Error())
@@ -77,23 +78,23 @@ func TestPrometheusTrait(t *testing.T) {
if ocp && createPodMonitor {
t.Run("PodMonitor is created", func(t *testing.T) {
- sm := podMonitor(ns, "java")
+ sm := podMonitor(t, ns, "java")
Eventually(sm, TestTimeoutShort).ShouldNot(BeNil())
})
}
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
-func podMonitor(ns string, name string) func() *monitoringv1.PodMonitor {
+func podMonitor(t *testing.T, ns string, name string) func() *monitoringv1.PodMonitor {
return func() *monitoringv1.PodMonitor {
pm := monitoringv1.PodMonitor{}
key := ctrl.ObjectKey{
Namespace: ns,
Name: name,
}
- err := TestClient().Get(TestContext, key, &pm)
+ err := TestClient(t).Get(TestContext, key, &pm)
if err != nil && k8serrors.IsNotFound(err) {
return nil
} else if err != nil {
diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go
index 61563bc39..a2e2f5499 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -36,41 +36,43 @@ import (
)
func TestPullSecretTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
- ocp, err := openshift.IsOpenShift(TestClient())
+ ocp, err := openshift.IsOpenShift(TestClient(t))
Expect(err).To(BeNil())
t.Run("Image pull secret is set on pod", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "pull-secret.enabled=true",
"-t", "pull-secret.secret-name=dummy-secret").Execute()).To(Succeed())
// pod may not run because the pull secret is dummy
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Or(Equal(corev1.PodRunning), Equal(corev1.PodPending)))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Or(Equal(corev1.PodRunning), Equal(corev1.PodPending)))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
Expect(pod.Spec.ImagePullSecrets[0].Name).To(Equal("dummy-secret"))
})
t.Run("Explicitly disable image pull secret", func(t *testing.T) {
name := RandomizedSuffixName("java2")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "pull-secret.enabled=false").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, name)()
+ Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
pullSecretTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pull-secret")
Expect(pullSecretTrait).ToNot(BeNil())
Expect(len(pullSecretTrait)).To(Equal(1))
Expect(pullSecretTrait["enabled"]).To(Equal(false))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
if ocp {
// OpenShift `default` service account has imagePullSecrets so it's always set
Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
@@ -83,18 +85,18 @@ func TestPullSecretTrait(t *testing.T) {
// OpenShift always has an internal registry so image pull secret is set by default
t.Run("Image pull secret is automatically set by default", func(t *testing.T) {
name := RandomizedSuffixName("java3")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
Expect(pod.Spec.ImagePullSecrets[0].Name).To(HavePrefix("default-dockercfg-"))
})
}
// Clean-up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index 33f5a1dc3..c192aae1f 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -71,9 +71,11 @@ var certPem []byte
var skipClientTLSVerification = true
func TestRunRoutes(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
- ocp, err := openshift.IsOpenShift(TestClient())
+ ocp, err := openshift.IsOpenShift(TestClient(t))
if !ocp {
t.Skip("This test requires route object which is available on OpenShift only.")
return
@@ -81,11 +83,11 @@ func TestRunRoutes(t *testing.T) {
require.NoError(t, err)
operatorID := "camel-k-trait-route"
- Expect(KamelInstallWithID(operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
// create a test secret of type tls with certificates
// this secret is used to setupt the route TLS object across diferent tests
- secret, err := createSecret(ns)
+ secret, err := createSecret(t, ns)
require.NoError(t, err)
// they refer to the certificates create in the secret and are reused the different tests
@@ -96,45 +98,45 @@ func TestRunRoutes(t *testing.T) {
// Insecure Route / No TLS
// =============================
t.Run("Route unsecure http works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := Route(t, ns, integrationName)
Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before doing an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
url := fmt.Sprintf("http://%s/hello?name=Simple", route().Spec.Host)
Eventually(httpRequest(url, false), TestTimeoutShort).Should(Equal("Hello Simple"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Edge
// =============================
t.Run("Route Edge https works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java", "-t", "route.tls-termination=edge").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java", "-t", "route.tls-termination=edge").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := Route(t, ns, integrationName)
Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
url := fmt.Sprintf("https://%s/hello?name=TLS_Edge", route().Spec.Host)
Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello TLS_Edge"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Edge with custom certificate
// =============================
t.Run("Route Edge (custom certificate) https works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "route.tls-termination=edge",
"-t", "route.tls-certificate-secret="+refCert,
"-t", "route.tls-key-secret="+refKey,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
+ Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := Route(t, ns, integrationName)
Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
@@ -142,14 +144,14 @@ func TestRunRoutes(t *testing.T) {
code := "TLS_EdgeCustomCertificate"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Passthrough
// =============================
t.Run("Route passthrough https works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
// the --resource mounts the certificates inside secret as files in the integration pod
"--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
// quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
@@ -158,8 +160,8 @@ func TestRunRoutes(t *testing.T) {
"-t", "route.tls-termination=passthrough",
"-t", "container.port=8443",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
+ Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := Route(t, ns, integrationName)
Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
@@ -167,14 +169,14 @@ func TestRunRoutes(t *testing.T) {
code := "TLS_Passthrough"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Reencrypt
// =============================
t.Run("Route Reencrypt https works", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
// the --resource mounts the certificates inside secret as files in the integration pod
"--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
// quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
@@ -187,9 +189,9 @@ func TestRunRoutes(t *testing.T) {
"-t", "route.tls-key-secret="+refKey,
"-t", "container.port=8443",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := Route(ns, integrationName)
+ route := Route(t, ns, integrationName)
Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
@@ -197,14 +199,14 @@ func TestRunRoutes(t *testing.T) {
code := "TLS_Reencrypt"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
t.Run("Route annotations added", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "route.annotations.'haproxy.router.openshift.io/balance'=roundrobin").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- route := RouteFull(ns, integrationName)()
+ Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ route := RouteFull(t, ns, integrationName)()
Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
@@ -213,16 +215,16 @@ func TestRunRoutes(t *testing.T) {
Expect(annotations["haproxy.router.openshift.io/balance"]).To(Equal("roundrobin"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, integrationName)).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, integrationName)()
+ Eventually(UnstructuredIntegration(t, ns, integrationName)).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, integrationName)()
routeTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "route")
Expect(routeTrait).ToNot(BeNil())
Expect(len(routeTrait)).To(Equal(1))
Expect(routeTrait["enabled"]).To(Equal(true))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
- Expect(TestClient().Delete(TestContext, &secret)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, &secret)).To(Succeed())
})
}
@@ -274,8 +276,8 @@ func httpClient(tlsEnabled bool, timeout time.Duration) (*http.Client, error) {
return &client, nil
}
-func createSecret(ns string) (corev1.Secret, error) {
- keyCertPair := generateSampleKeyAndCertificate(ns)
+func createSecret(t *testing.T, ns string) (corev1.Secret, error) {
+ keyCertPair := generateSampleKeyAndCertificate(t, ns)
sec := corev1.Secret{
TypeMeta: metav1.TypeMeta{
Kind: "Secret",
@@ -291,12 +293,12 @@ func createSecret(ns string) (corev1.Secret, error) {
corev1.TLSCertKey: keyCertPair.Certificate,
},
}
- return sec, TestClient().Create(TestContext, &sec)
+ return sec, TestClient(t).Create(TestContext, &sec)
}
-func generateSampleKeyAndCertificate(ns string) keyCertificatePair {
+func generateSampleKeyAndCertificate(t *testing.T, ns string) keyCertificatePair {
serialNumber := big.NewInt(util.RandomInt63())
- domainName, err := ClusterDomainName()
+ domainName, err := ClusterDomainName(t)
if err != nil {
fmt.Printf("Error retrieving cluster domain object, then the http client request will skip TLS validation: %s\n", err)
skipClientTLSVerification = true
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 306529892..45ddeae49 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -36,6 +36,8 @@ import (
)
func TestServiceBindingTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Integration Service Binding", func(t *testing.T) {
@@ -61,17 +63,17 @@ func TestServiceBindingTrait(t *testing.T) {
},
}
serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
- Expect(TestClient().Create(TestContext, service)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Create integration and bind it to our service
name := RandomizedSuffixName("service-binding")
- Expect(KamelRunWithID(operatorID, ns, "files/ServiceBinding.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/ServiceBinding.java",
"--name", name,
"--connect", serviceRef,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
})
t.Run("Binding Service Binding", func(t *testing.T) {
@@ -94,16 +96,16 @@ func TestServiceBindingTrait(t *testing.T) {
},
}
serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
- Expect(TestClient().Create(TestContext, service)).To(Succeed())
- Expect(CreateTimerKamelet(ns, "my-timer-source")()).To(Succeed())
- Expect(KamelBindWithID(operatorID, ns, "my-timer-source", "log:info",
+ Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns, "my-timer-source")()).To(Succeed())
+ Expect(KamelBindWithID(t, operatorID, ns, "my-timer-source", "log:info",
"-p", "source.message=Hello+world",
"--connect", serviceRef).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "my-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, "my-timer-source-to-log")).Should(ContainSubstring("Body: Hello+world"))
+ Eventually(IntegrationPodPhase(t, ns, "my-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, "my-timer-source-to-log")).Should(ContainSubstring("Body: Hello+world"))
})
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go
index 27df68325..ad40c9783 100644
--- a/e2e/common/traits/service_test.go
+++ b/e2e/common/traits/service_test.go
@@ -34,89 +34,91 @@ import (
)
func TestServiceTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("NodePort service", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.node-port=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
+ Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Default service (ClusterIP)", func(t *testing.T) {
// Service trait is enabled by default
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+ Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("NodePort service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=NodePort").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
+ Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("ClusterIP service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=ClusterIP").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+ Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(ns, "platform-http-server")).ShouldNot(BeNil())
- unstructuredIntegration := UnstructuredIntegration(ns, "platform-http-server")()
+ Eventually(UnstructuredIntegration(t, ns, "platform-http-server")).ShouldNot(BeNil())
+ unstructuredIntegration := UnstructuredIntegration(t, ns, "platform-http-server")()
serviceTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "service")
Expect(serviceTrait).ToNot(BeNil())
Expect(len(serviceTrait)).To(Equal(2))
Expect(serviceTrait["enabled"]).To(Equal(true))
Expect(serviceTrait["type"]).To(Equal("ClusterIP"))
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("LoadBalancer service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/PlatformHttpServer.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=LoadBalancer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(ns, corev1.ServiceTypeLoadBalancer), TestTimeoutLong).ShouldNot(BeEmpty())
+ Eventually(ServicesByType(t, ns, corev1.ServiceTypeLoadBalancer), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go
index 9f5818d4c..c57eb4544 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -36,20 +36,22 @@ import (
)
func TestTolerationTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(ns string) {
t.Run("Run Java with node toleration operation exists", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "toleration.enabled=true",
"-t", "toleration.taints=camel.apache.org/master:NoExecute:300",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
Expect(pod.Spec.Tolerations).NotTo(BeNil())
Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
@@ -62,16 +64,16 @@ func TestTolerationTrait(t *testing.T) {
t.Run("Run Java with node toleration operation equals", func(t *testing.T) {
name := RandomizedSuffixName("java2")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "toleration.enabled=true",
"-t", "toleration.taints=camel.apache.org/master=test:NoExecute:300",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
Expect(pod.Spec.Tolerations).NotTo(BeNil())
Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
@@ -83,12 +85,12 @@ func TestTolerationTrait(t *testing.T) {
})
t.Run("Run Java with master node toleration", func(t *testing.T) {
- if len(Nodes()()) == 1 {
+ if len(Nodes(t)()) == 1 {
t.Skip("Skip master node toleration test on single-node cluster")
}
name := RandomizedSuffixName("java3")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java",
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
// Use the affinity trait to force the scheduling of the Integration pod onto a master node
"-t", "affinity.enabled=true",
@@ -98,11 +100,11 @@ func TestTolerationTrait(t *testing.T) {
"-t", "toleration.taints=node-role.kubernetes.io/master:NoSchedule",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- pod := IntegrationPod(ns, name)()
+ pod := IntegrationPod(t, ns, name)()
Expect(pod).NotTo(BeNil())
// Check the Integration pod contains the toleration
@@ -113,8 +115,8 @@ func TestTolerationTrait(t *testing.T) {
}))
// Check the Integration pod is running on a master node
- Expect(Node(pod.Spec.NodeName)()).NotTo(BeNil())
- Expect(Node(pod.Spec.NodeName)()).To(PointTo(MatchFields(IgnoreExtras, Fields{
+ Expect(Node(t, pod.Spec.NodeName)()).NotTo(BeNil())
+ Expect(Node(t, pod.Spec.NodeName)()).To(PointTo(MatchFields(IgnoreExtras, Fields{
"Spec": MatchFields(IgnoreExtras, Fields{
"Taints": ContainElement(corev1.Taint{
Key: "node-role.kubernetes.io/master",
@@ -125,6 +127,6 @@ func TestTolerationTrait(t *testing.T) {
})
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/install/cli/global_kamelet_test.go b/e2e/install/cli/global_kamelet_test.go
index 62fe11134..e01ce9d3f 100644
--- a/e2e/install/cli/global_kamelet_test.go
+++ b/e2e/install/cli/global_kamelet_test.go
@@ -34,40 +34,40 @@ import (
func TestRunGlobalKamelet(t *testing.T) {
WithGlobalOperatorNamespace(t, func(operatorNamespace string) {
operatorID := "camel-k-global-kamelet"
- Expect(KamelInstallWithID(operatorID, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
t.Run("Global operator + namespaced kamelet test", func(t *testing.T) {
// NS2: namespace without operator
WithNewTestNamespace(t, func(ns2 string) {
- Expect(CreateTimerKamelet(ns2, "my-own-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, ns2, "my-own-timer-source")()).To(Succeed())
- Expect(KamelInstallWithID(operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns2, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns2, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns2, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
- Expect(Kamel("delete", "--all", "-n", ns2).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns2, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns2, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns2, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
})
})
t.Run("Global operator + global kamelet test", func(t *testing.T) {
- Expect(CreateTimerKamelet(operatorNamespace, "my-own-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(t, operatorNamespace, "my-own-timer-source")()).To(Succeed())
// NS3: namespace without operator
WithNewTestNamespace(t, func(ns3 string) {
- Expect(KamelInstallWithID(operatorID, ns3, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
- Expect(KamelRunWithID(operatorID, ns3, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns3, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns3, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
- Expect(Kamel("delete", "--all", "-n", ns3).Execute()).To(Succeed())
- Expect(TestClient().Delete(TestContext, Kamelet("my-own-timer-source", operatorNamespace)())).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns3, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns3, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns3, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, Kamelet(t, "my-own-timer-source", operatorNamespace)())).To(Succeed())
})
})
- Expect(Kamel("uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles=false", "--skip-cluster-role-bindings=false").Execute()).To(Succeed())
+ Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles=false", "--skip-cluster-role-bindings=false").Execute()).To(Succeed())
})
}
diff --git a/e2e/install/cli/global_test.go b/e2e/install/cli/global_test.go
index 8ec5e60e2..76d1cb396 100644
--- a/e2e/install/cli/global_test.go
+++ b/e2e/install/cli/global_test.go
@@ -43,35 +43,35 @@ func TestRunGlobalInstall(t *testing.T) {
RegisterTestingT(t)
WithGlobalOperatorNamespace(t, func(operatorNamespace string) {
- Expect(KamelInstall(operatorNamespace, "--global", "--force").Execute()).To(Succeed())
- Eventually(OperatorPodPhase(operatorNamespace), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Expect(KamelInstall(t, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ Eventually(OperatorPodPhase(t, operatorNamespace), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
t.Run("Global CamelCatalog reconciliation", func(t *testing.T) {
- Eventually(Platform(operatorNamespace)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(operatorNamespace, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ Eventually(Platform(t, operatorNamespace)).ShouldNot(BeNil())
+ Eventually(PlatformConditionStatus(t, operatorNamespace, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion))
- Eventually(CamelCatalog(operatorNamespace, catalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(operatorNamespace, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ Eventually(CamelCatalog(t, operatorNamespace, catalogName)).ShouldNot(BeNil())
+ Eventually(CamelCatalogPhase(t, operatorNamespace, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
})
t.Run("Global test on namespace with platform", func(t *testing.T) {
WithNewTestNamespace(t, func(ns2 string) {
// Creating namespace local platform
- Expect(KamelInstall(ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
- Eventually(Platform(ns2)).ShouldNot(BeNil())
+ Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ Eventually(Platform(t, ns2)).ShouldNot(BeNil())
// Run with global operator id
- Expect(KamelRun(ns2, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns2, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns2, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(ns2, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns2 + "\\/.*"))
- kit := IntegrationKit(ns2, "java")()
- Expect(Kamel("delete", "--all", "-n", ns2).Execute()).To(Succeed())
- Expect(Kits(ns2)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
- Expect(Kits(operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
-
- Expect(Lease(ns2, platform.DefaultPlatformName)()).To(BeNil(), "No locking Leases expected")
+ Expect(KamelRun(t, ns2, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns2, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns2, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(IntegrationConditionMessage(IntegrationCondition(t, ns2, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns2 + "\\/.*"))
+ kit := IntegrationKit(t, ns2, "java")()
+ Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
+ Expect(Kits(t, ns2)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
+ Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+
+ Expect(Lease(t, ns2, platform.DefaultPlatformName)()).To(BeNil(), "No locking Leases expected")
})
})
@@ -79,21 +79,21 @@ func TestRunGlobalInstall(t *testing.T) {
WithNewTestNamespace(t, func(ns3 string) {
operatorID := "camel-k-local-ns3"
if NoOlmOperatorImage != "" {
- Expect(KamelInstallWithID(operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage).Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage).Execute()).To(Succeed())
} else {
- Expect(KamelInstallWithID(operatorID, ns3, "--olm=false").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false").Execute()).To(Succeed())
}
- Eventually(OperatorPodPhase(ns3), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Expect(KamelRunWithID(operatorID, ns3, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns3, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns3, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(ns3, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns3 + "\\/.*"))
- kit := IntegrationKit(ns3, "java")()
- Expect(Kits(ns3)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
- Expect(Kamel("delete", "--all", "-n", ns3).Execute()).To(Succeed())
-
- Expect(Lease(ns3, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
- Expect(Lease(ns3, platform.GetOperatorLockName(operatorID))()).ShouldNot(BeNil(),
+ Eventually(OperatorPodPhase(t, ns3), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Expect(KamelRunWithID(t, operatorID, ns3, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns3, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns3, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(IntegrationConditionMessage(IntegrationCondition(t, ns3, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns3 + "\\/.*"))
+ kit := IntegrationKit(t, ns3, "java")()
+ Expect(Kits(t, ns3)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
+ Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
+
+ Expect(Lease(t, ns3, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ Expect(Lease(t, ns3, platform.GetOperatorLockName(operatorID))()).ShouldNot(BeNil(),
"Controller Runtime is expected to use Leases for leader election: if this changes we should update our locking logic",
)
})
@@ -101,29 +101,29 @@ func TestRunGlobalInstall(t *testing.T) {
t.Run("Global test on namespace without platform", func(t *testing.T) {
WithNewTestNamespace(t, func(ns4 string) {
- Expect(KamelRun(ns4, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns4, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns4, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(ns4, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
- kit := IntegrationKit(ns4, "java")()
- Expect(Kamel("delete", "--all", "-n", ns4).Execute()).To(Succeed())
- Expect(Kits(ns4)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
- Expect(Kits(operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Kit built globally
-
- Expect(Lease(ns4, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ Expect(KamelRun(t, ns4, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns4, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns4, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(IntegrationConditionMessage(IntegrationCondition(t, ns4, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
+ kit := IntegrationKit(t, ns4, "java")()
+ Expect(Kamel(t, "delete", "--all", "-n", ns4).Execute()).To(Succeed())
+ Expect(Kits(t, ns4)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+ Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Kit built globally
+
+ Expect(Lease(t, ns4, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
})
})
t.Run("Global test on namespace without platform with external kit", func(t *testing.T) {
WithNewTestNamespace(t, func(ns5 string) {
- Expect(KamelRun(ns5, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns5, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns5, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(ns5, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
- kit := IntegrationKit(ns5, "java")()
- Expect(Kamel("delete", "--all", "-n", ns5).Execute()).To(Succeed())
- Expect(Kits(ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
- globalKits := Kits(operatorNamespace)()
+ Expect(KamelRun(t, ns5, "files/Java.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns5, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns5, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(IntegrationConditionMessage(IntegrationCondition(t, ns5, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
+ kit := IntegrationKit(t, ns5, "java")()
+ Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
+ Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+ globalKits := Kits(t, operatorNamespace)()
Expect(globalKits).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Reusing the same global kit
// external kit mirroring the global one
@@ -136,24 +136,24 @@ func TestRunGlobalInstall(t *testing.T) {
},
},
Spec: v1.IntegrationKitSpec{
- Image: getKitImage(operatorNamespace, kit),
+ Image: getKitImage(t, operatorNamespace, kit),
},
}
- Expect(TestClient().Create(TestContext, &externalKit)).Should(BeNil())
+ Expect(TestClient(t).Create(TestContext, &externalKit)).Should(BeNil())
- Expect(KamelRun(ns5, "files/Java.java", "--name", "ext", "--kit", "external", "-t", "jvm.enabled=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns5, "ext"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns5, "ext"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationKit(ns5, "ext")()).Should(Equal("external"))
- Expect(Kamel("delete", "--all", "-n", ns5).Execute()).To(Succeed())
- Expect(Kits(ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement("external"))) // the external one
- Expect(Kits(operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // the global one
+ Expect(KamelRun(t, ns5, "files/Java.java", "--name", "ext", "--kit", "external", "-t", "jvm.enabled=true").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns5, "ext"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns5, "ext"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(IntegrationKit(t, ns5, "ext")()).Should(Equal("external"))
+ Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
+ Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement("external"))) // the external one
+ Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // the global one
- Expect(Lease(ns5, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ Expect(Lease(t, ns5, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
})
})
- Expect(Kamel("uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
+ Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
})
}
@@ -167,7 +167,7 @@ func integrationKitsToNamesTransform() func([]v1.IntegrationKit) []string {
}
}
-func getKitImage(ns string, name string) string {
+func getKitImage(t *testing.T, ns string, name string) string {
get := v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
Kind: "IntegrationKit",
@@ -182,7 +182,7 @@ func getKitImage(ns string, name string) string {
Namespace: ns,
Name: name,
}
- if err := TestClient().Get(TestContext, key, &get); err != nil {
+ if err := TestClient(t).Get(TestContext, key, &get); err != nil {
return ""
}
return get.Status.Image
diff --git a/e2e/install/cli/install_test.go b/e2e/install/cli/install_test.go
index ba7dc3a4c..2cf087e7a 100644
--- a/e2e/install/cli/install_test.go
+++ b/e2e/install/cli/install_test.go
@@ -49,38 +49,38 @@ import (
func TestBasicInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(Platform(ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
// Check if restricted security context has been applyed
- operatorPod := OperatorPod(ns)()
+ operatorPod := OperatorPod(t, ns)()
Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
t.Run("run yaml", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Check if file exists in operator pod
- Expect(OperatorPod(ns)().Name).NotTo(Equal(""))
- Expect(OperatorPod(ns)().Spec.Containers[0].Name).NotTo(Equal(""))
+ Expect(OperatorPod(t, ns)().Name).NotTo(Equal(""))
+ Expect(OperatorPod(t, ns)().Spec.Containers[0].Name).NotTo(Equal(""))
- req := TestClient().CoreV1().RESTClient().Post().
+ req := TestClient(t).CoreV1().RESTClient().Post().
Resource("pods").
- Name(OperatorPod(ns)().Name).
+ Name(OperatorPod(t, ns)().Name).
Namespace(ns).
SubResource("exec").
- Param("container", OperatorPod(ns)().Spec.Containers[0].Name)
+ Param("container", OperatorPod(t, ns)().Spec.Containers[0].Name)
req.VersionedParams(&corev1.PodExecOptions{
- Container: OperatorPod(ns)().Spec.Containers[0].Name,
+ Container: OperatorPod(t, ns)().Spec.Containers[0].Name,
Command: []string{"test", "-e", defaults.LocalRepository + "/org/apache/camel/k"},
Stdin: false,
Stdout: true,
@@ -88,7 +88,7 @@ func TestBasicInstallation(t *testing.T) {
TTY: false,
}, scheme.ParameterCodec)
- exec, err := remotecommand.NewSPDYExecutor(TestClient().GetConfig(), "POST", req.URL())
+ exec, err := remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
Expect(err).To(BeNil())
// returns an error if file does not exists
@@ -101,35 +101,35 @@ func TestBasicInstallation(t *testing.T) {
})
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestAlternativeImageInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--olm=false", "--operator-image", "x/y:latest").Execute()).To(Succeed())
- Eventually(OperatorImage(ns)).Should(Equal("x/y:latest"))
+ Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest").Execute()).To(Succeed())
+ Eventually(OperatorImage(t, ns)).Should(Equal("x/y:latest"))
})
}
func TestKitMainInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Expect(Kamel("kit", "create", "timer", "-d", "camel:timer", "-x", operatorID, "-n", ns).Execute()).To(Succeed())
- Eventually(Build(ns, "timer"), TestTimeoutMedium).ShouldNot(BeNil())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "kit", "create", "timer", "-d", "camel:timer", "-x", operatorID, "-n", ns).Execute()).To(Succeed())
+ Eventually(Build(t, ns, "timer"), TestTimeoutMedium).ShouldNot(BeNil())
})
}
func TestMavenRepositoryInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--maven-repository", "https://my.repo.org/public/").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/").Execute()).To(Succeed())
configmapName := fmt.Sprintf("%s-maven-settings", operatorID)
- Eventually(Configmap(ns, configmapName)).Should(Not(BeNil()))
+ Eventually(Configmap(t, ns, configmapName)).Should(Not(BeNil()))
Eventually(func() string {
- return Configmap(ns, configmapName)().Data["settings.xml"]
+ return Configmap(t, ns, configmapName)().Data["settings.xml"]
}).Should(ContainSubstring("https://my.repo.org/public/"))
})
}
@@ -141,10 +141,10 @@ func TestMavenRepositoryInstallation(t *testing.T) {
func TestSkipRegistryInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--skip-registry-setup").Execute()).To(Succeed())
- Eventually(Platform(ns)).ShouldNot(BeNil())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup").Execute()).To(Succeed())
+ Eventually(Platform(t, ns)).ShouldNot(BeNil())
Eventually(func() v1.RegistrySpec {
- return Platform(ns)().Spec.Build.Registry
+ return Platform(t, ns)().Spec.Build.Registry
}, TestTimeoutMedium).Should(Equal(v1.RegistrySpec{}))
})
}
@@ -155,10 +155,10 @@ type templateArgs struct {
}
func TestConsoleCliDownload(t *testing.T) {
- ocp, err := openshift.IsOpenShift(TestClient())
+ ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
- ok, err := kubernetes.IsAPIResourceInstalled(TestClient(), "console.openshift.io/v1", reflect.TypeOf(consolev1.ConsoleCLIDownload{}).Name())
+ ok, err := kubernetes.IsAPIResourceInstalled(TestClient(t), "console.openshift.io/v1", reflect.TypeOf(consolev1.ConsoleCLIDownload{}).Name())
require.NoError(t, err)
if !ocp || !ok {
@@ -175,16 +175,16 @@ func TestConsoleCliDownload(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// make sure there is no preinstalled CliDownload resource
- cliDownload := ConsoleCLIDownload(name)()
+ cliDownload := ConsoleCLIDownload(t, name)()
if cliDownload != nil {
- Expect(TestClient().Delete(TestContext, cliDownload)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, cliDownload)).To(Succeed())
}
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(ConsoleCLIDownload(name), TestTimeoutMedium).Should(Not(BeNil()))
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(ConsoleCLIDownload(t, name), TestTimeoutMedium).Should(Not(BeNil()))
- cliDownload = ConsoleCLIDownload(name)()
+ cliDownload = ConsoleCLIDownload(t, name)()
links := cliDownload.Spec.Links
for _, link := range links {
@@ -206,17 +206,17 @@ func TestConsoleCliDownload(t *testing.T) {
func TestInstallSkipDefaultKameletsInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithIDAndKameletCatalog(operatorID, ns, "--skip-default-kamelets-setup").Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Expect(KameletList(ns)()).Should(BeEmpty())
+ Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup").Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Expect(KameletList(t, ns)()).Should(BeEmpty())
})
}
func TestInstallDebugLogging(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "-z", "debug").Execute()).To(Succeed())
+ Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug").Execute()).To(Succeed())
- Eventually(OperatorEnvVarValue(ns, "LOG_LEVEL"), TestTimeoutLong).Should(Equal("debug"))
+ Eventually(OperatorEnvVarValue(t, ns, "LOG_LEVEL"), TestTimeoutLong).Should(Equal("debug"))
})
}
diff --git a/e2e/install/cli/maven_ca_secret_test.go b/e2e/install/cli/maven_ca_secret_test.go
index b23f78e1d..337cc3c52 100644
--- a/e2e/install/cli/maven_ca_secret_test.go
+++ b/e2e/install/cli/maven_ca_secret_test.go
@@ -111,7 +111,7 @@ func TestMavenCASecret(t *testing.T) {
corev1.TLSPrivateKeyKey: privateKeyPem,
},
}
- Expect(TestClient().Create(TestContext, secret)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
// HTTPD configuration
config := &corev1.ConfigMap{
@@ -179,7 +179,7 @@ ProxyPreserveHost On
),
},
}
- Expect(TestClient().Create(TestContext, config)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
// Deploy Nexus
// https://help.sonatype.com/repomanager3/installation/run-behind-a-reverse-proxy
@@ -296,7 +296,7 @@ ProxyPreserveHost On
},
},
}
- Expect(TestClient().Create(TestContext, deployment)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
service := &corev1.Service{
TypeMeta: metav1.TypeMeta{
@@ -318,10 +318,10 @@ ProxyPreserveHost On
},
},
}
- Expect(TestClient().Create(TestContext, service)).To(Succeed())
+ Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Wait for the Deployment to become ready
- Eventually(Deployment(ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Status": MatchFields(IgnoreExtras,
Fields{
@@ -337,14 +337,14 @@ ProxyPreserveHost On
APIVersion: corev1.SchemeGroupVersion.String(),
},
}
- Expect(TestClient().List(TestContext, pods,
+ Expect(TestClient(t).List(TestContext, pods,
ctrl.InNamespace(ns),
ctrl.MatchingLabels{"camel-k": "maven-test-nexus"},
)).To(Succeed())
Expect(pods.Items).To(HaveLen(1))
// Retrieve the Nexus admin password
- req := TestClient().CoreV1().RESTClient().Post().
+ req := TestClient(t).CoreV1().RESTClient().Post().
Resource("pods").
Name(pods.Items[0].Name).
Namespace(ns).
@@ -359,7 +359,7 @@ ProxyPreserveHost On
TTY: false,
}, scheme.ParameterCodec)
- exec, err := remotecommand.NewSPDYExecutor(TestClient().GetConfig(), "POST", req.URL())
+ exec, err := remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
Expect(err).To(BeNil())
var password bytes.Buffer
@@ -370,7 +370,7 @@ ProxyPreserveHost On
})).To(Succeed())
// Create the Apache Snapshot proxy repository using the Nexus REST API
- req = TestClient().CoreV1().RESTClient().Post().
+ req = TestClient(t).CoreV1().RESTClient().Post().
Resource("pods").
Name(pods.Items[0].Name).
Namespace(ns).
@@ -410,7 +410,7 @@ ProxyPreserveHost On
TTY: false,
}, scheme.ParameterCodec)
- exec, err = remotecommand.NewSPDYExecutor(TestClient().GetConfig(), "POST", req.URL())
+ exec, err = remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
Expect(err).To(BeNil())
Expect(exec.Stream(remotecommand.StreamOptions{
@@ -421,7 +421,7 @@ ProxyPreserveHost On
// Install Camel K with the Maven Central Nexus proxy and the corresponding Maven CA secret
operatorID := "camel-k-maven-ca-secret"
- Expect(KamelInstallWithID(operatorID, ns,
+ Expect(KamelInstallWithID(t, operatorID, ns,
"--maven-repository", fmt.Sprintf(`https://%s/repository/maven-public/@id=central-internal@mirrorOf=central`, hostname),
"--maven-repository", fmt.Sprintf(`https://%s/repository/%s/%s`, hostname, stagingRepository.ID, strings.Join(getRepositoryAttributes(stagingRepository), "")),
"--maven-ca-secret", secret.Name+"/"+corev1.TLSCertKey,
@@ -429,32 +429,32 @@ ProxyPreserveHost On
"--maven-cli-option", "--batch-mode",
).Execute()).To(Succeed())
- Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the Integration
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutLong).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("Magicstring!"))
// Assert no dependencies have been downloaded from the Maven central repository
// Note: this should be adapted for the Pod build strategy
- pod := OperatorPod(ns)()
+ pod := OperatorPod(t, ns)()
Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
- logs := Logs(pod.Namespace, pod.Name, corev1.PodLogOptions{})()
+ logs := Logs(t, pod.Namespace, pod.Name, corev1.PodLogOptions{})()
Expect(logs).NotTo(BeEmpty())
Expect(logs).NotTo(ContainSubstring("Downloaded from central:"))
// Clean up
- Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient().Delete(TestContext, deployment)).To(Succeed())
- Expect(TestClient().Delete(TestContext, service)).To(Succeed())
- Expect(TestClient().Delete(TestContext, secret)).To(Succeed())
- Expect(TestClient().Delete(TestContext, config)).To(Succeed())
+ Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
+ Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
})
}
diff --git a/e2e/install/cli/uninstall_test.go b/e2e/install/cli/uninstall_test.go
index 7bda494eb..ea6e20a44 100644
--- a/e2e/install/cli/uninstall_test.go
+++ b/e2e/install/cli/uninstall_test.go
@@ -36,34 +36,34 @@ func TestBasicUninstall(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(DefaultCamelCatalogPhase(ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
// should be completely removed on uninstall
- Expect(Kamel("uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
+ Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
// Roles only removed in non-olm use-case
uninstallViaOLM := false
var err error
- if uninstallViaOLM, err = olm.IsAPIAvailable(TestClient()); err != nil {
+ if uninstallViaOLM, err = olm.IsAPIAvailable(TestClient(t)); err != nil {
t.Error(err)
t.FailNow()
}
if !uninstallViaOLM {
- Eventually(Role(ns)).Should(BeNil())
- Eventually(RoleBinding(ns)).Should(BeNil())
- Eventually(ServiceAccount(ns, "camel-k-operator")).Should(BeNil())
+ Eventually(Role(t, ns)).Should(BeNil())
+ Eventually(RoleBinding(t, ns)).Should(BeNil())
+ Eventually(ServiceAccount(t, ns, "camel-k-operator")).Should(BeNil())
} else {
- Eventually(Role(ns)).ShouldNot(BeNil())
- Eventually(RoleBinding(ns)).ShouldNot(BeNil())
+ Eventually(Role(t, ns)).ShouldNot(BeNil())
+ Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
}
- Eventually(Configmap(ns, "camel-k-maven-settings")).Should(BeNil())
- Eventually(OperatorPod(ns), TestTimeoutMedium).Should(BeNil())
- Eventually(KameletList(ns), TestTimeoutMedium).Should(BeEmpty())
- Eventually(CamelCatalogList(ns), TestTimeoutMedium).Should(BeEmpty())
+ Eventually(Configmap(t, ns, "camel-k-maven-settings")).Should(BeNil())
+ Eventually(OperatorPod(t, ns), TestTimeoutMedium).Should(BeNil())
+ Eventually(KameletList(t, ns), TestTimeoutMedium).Should(BeEmpty())
+ Eventually(CamelCatalogList(t, ns), TestTimeoutMedium).Should(BeEmpty())
})
}
@@ -71,11 +71,11 @@ func TestUninstallSkipOperator(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except operator
- Expect(Kamel("uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-operator").Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-operator").Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
})
}
@@ -83,11 +83,11 @@ func TestUninstallSkipRole(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except roles
- Expect(Kamel("uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-roles").Execute()).To(Succeed())
- Eventually(Role(ns)).ShouldNot(BeNil())
+ Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-roles").Execute()).To(Succeed())
+ Eventually(Role(t, ns)).ShouldNot(BeNil())
})
}
@@ -95,11 +95,11 @@ func TestUninstallSkipRoleBinding(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except role-bindings
- Expect(Kamel("uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-role-bindings").Execute()).To(Succeed())
- Eventually(RoleBinding(ns)).ShouldNot(BeNil())
+ Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-role-bindings").Execute()).To(Succeed())
+ Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
})
}
@@ -107,11 +107,11 @@ func TestUninstallSkipServiceAccounts(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
- Expect(Kamel("uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-service-accounts").Execute()).To(Succeed())
- Eventually(ServiceAccount(ns, "camel-k-operator")).ShouldNot(BeNil())
+ Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-service-accounts").Execute()).To(Succeed())
+ Eventually(ServiceAccount(t, ns, "camel-k-operator")).ShouldNot(BeNil())
})
}
@@ -119,12 +119,12 @@ func TestUninstallSkipIntegrationPlatform(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
// NOTE: skip CRDs is also required in addition to skip integration platform
- Expect(Kamel("uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-integration-platform").Execute()).To(Succeed())
- Eventually(Platform(ns)).ShouldNot(BeNil())
+ Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-integration-platform").Execute()).To(Succeed())
+ Eventually(Platform(t, ns)).ShouldNot(BeNil())
})
}
@@ -132,12 +132,12 @@ func TestUninstallSkipKamelets(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithIDAndKameletCatalog(operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(KameletList(ns)).ShouldNot(BeEmpty())
+ Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except kamelets
- Expect(Kamel("uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-kamelets").Execute()).To(Succeed())
- Eventually(KameletList(ns)).ShouldNot(BeEmpty())
+ Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-kamelets").Execute()).To(Succeed())
+ Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
})
}
@@ -145,12 +145,12 @@ func TestUninstallSkipCamelCatalogs(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(CamelCatalogList(ns)).ShouldNot(BeEmpty())
+ Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except camel catalogs
- Expect(Kamel("uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-camel-catalogs").Execute()).To(Succeed())
- Eventually(CamelCatalogList(ns)).ShouldNot(BeEmpty())
+ Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-camel-catalogs").Execute()).To(Succeed())
+ Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
})
}
diff --git a/e2e/install/helm/setup_test.go b/e2e/install/helm/setup_test.go
index 139dc9b42..05c6f89ef 100644
--- a/e2e/install/helm/setup_test.go
+++ b/e2e/install/helm/setup_test.go
@@ -45,8 +45,8 @@ func TestHelmInstallRunUninstall(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", "../../../")
WithNewTestNamespace(t, func(ns string) {
- ExpectExecSucceed(t, Make(fmt.Sprintf("CUSTOM_IMAGE=%s", customImage), "set-version"))
- ExpectExecSucceed(t, Make("release-helm"))
+ ExpectExecSucceed(t, Make(t, fmt.Sprintf("CUSTOM_IMAGE=%s", customImage), "set-version"))
+ ExpectExecSucceed(t, Make(t, "release-helm"))
ExpectExecSucceed(t,
exec.Command(
"helm",
@@ -62,10 +62,10 @@ func TestHelmInstallRunUninstall(t *testing.T) {
),
)
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// Check if restricted security context has been applyed
- operatorPod := OperatorPod(ns)()
+ operatorPod := OperatorPod(t, ns)()
Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
@@ -74,9 +74,9 @@ func TestHelmInstallRunUninstall(t *testing.T) {
//Test a simple route
t.Run("simple route", func(t *testing.T) {
name := RandomizedSuffixName("yaml")
- Expect(KamelRun(ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(KamelRun(t, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
ExpectExecSucceed(t,
@@ -89,6 +89,6 @@ func TestHelmInstallRunUninstall(t *testing.T) {
),
)
- Eventually(OperatorPod(ns)).Should(BeNil())
+ Eventually(OperatorPod(t, ns)).Should(BeNil())
})
}
diff --git a/e2e/install/kustomize/operator_test.go b/e2e/install/kustomize/operator_test.go
index bf5b67064..a2fb78f99 100644
--- a/e2e/install/kustomize/operator_test.go
+++ b/e2e/install/kustomize/operator_test.go
@@ -42,37 +42,37 @@ func TestOperatorBasic(t *testing.T) {
// Ensure no CRDs are already installed
RegisterTestingT(t)
- Expect(UninstallAll()).To(Succeed())
+ Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
- defer Cleanup()
+ defer Cleanup(t)
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make("setup", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup", namespaceArg))
// Skip default kamelets installation for faster test runs
- ExpectExecSucceed(t, Make("operator",
+ ExpectExecSucceed(t, Make(t, "operator",
namespaceArg,
"INSTALL_DEFAULT_KAMELETS=false"))
// Refresh the test client to account for the newly installed CRDs
- SyncClient()
+ RefreshClient(t)
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(OperatorPodPhase(ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
// Check if restricted security context has been applyed
- operatorPod := OperatorPod(ns)()
+ operatorPod := OperatorPod(t, ns)()
Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
- Eventually(Platform(ns)).ShouldNot(BeNil())
+ Eventually(Platform(t, ns)).ShouldNot(BeNil())
registry := os.Getenv("KIND_REGISTRY")
if registry != "" {
- platform := Platform(ns)()
+ platform := Platform(t, ns)()
Expect(platform.Status.Build.Registry).ShouldNot(BeNil())
Expect(platform.Status.Build.Registry.Address).To(Equal(registry))
}
@@ -86,29 +86,29 @@ func TestOperatorKustomizeAlternativeImage(t *testing.T) {
// Ensure no CRDs are already installed
RegisterTestingT(t)
- Expect(UninstallAll()).To(Succeed())
+ Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
- defer Cleanup()
+ defer Cleanup(t)
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make("setup", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup", namespaceArg))
// Skip default kamelets installation for faster test runs
newImage := "quay.io/kameltest/kamel-operator"
newTag := "1.1.1"
- ExpectExecSucceed(t, Make("operator",
+ ExpectExecSucceed(t, Make(t, "operator",
fmt.Sprintf("CUSTOM_IMAGE=%s", newImage),
fmt.Sprintf("CUSTOM_VERSION=%s", newTag),
namespaceArg,
"INSTALL_DEFAULT_KAMELETS=false"))
// Refresh the test client to account for the newly installed CRDs
- SyncClient()
+ RefreshClient(t)
- Eventually(OperatorImage(ns)).Should(Equal(fmt.Sprintf("%s:%s", newImage, newTag)))
+ Eventually(OperatorImage(t, ns)).Should(Equal(fmt.Sprintf("%s:%s", newImage, newTag)))
})
}
@@ -118,28 +118,28 @@ func TestOperatorKustomizeGlobal(t *testing.T) {
// Ensure no CRDs are already installed
RegisterTestingT(t)
- Expect(UninstallAll()).To(Succeed())
+ Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
- defer Cleanup()
+ defer Cleanup(t)
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make("setup", namespaceArg, "GLOBAL=true"))
+ ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup", namespaceArg, "GLOBAL=true"))
// Skip default kamelets installation for faster test runs
- ExpectExecSucceed(t, Make("operator",
+ ExpectExecSucceed(t, Make(t, "operator",
namespaceArg,
"GLOBAL=true",
"INSTALL_DEFAULT_KAMELETS=false"))
// Refresh the test client to account for the newly installed CRDs
- SyncClient()
+ RefreshClient(t)
- podFunc := OperatorPod(ns)
+ podFunc := OperatorPod(t, ns)
Eventually(podFunc).ShouldNot(BeNil())
- Eventually(OperatorPodPhase(ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
pod := podFunc()
containers := pod.Spec.Containers
@@ -158,6 +158,6 @@ func TestOperatorKustomizeGlobal(t *testing.T) {
}
Expect(found).To(BeTrue())
- Eventually(Platform(ns)).ShouldNot(BeNil())
+ Eventually(Platform(t, ns)).ShouldNot(BeNil())
})
}
diff --git a/e2e/install/kustomize/setup_test.go b/e2e/install/kustomize/setup_test.go
index 9434e17f4..bcde0f9d6 100644
--- a/e2e/install/kustomize/setup_test.go
+++ b/e2e/install/kustomize/setup_test.go
@@ -39,29 +39,29 @@ func TestSetupKustomizeBasic(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- Expect(UninstallAll()).To(Succeed())
- Eventually(CRDs()).Should(HaveLen(0))
+ Expect(UninstallAll(t)).To(Succeed())
+ Eventually(CRDs(t)).Should(HaveLen(0))
// Return the cluster to previous state
- defer Cleanup()
+ defer Cleanup(t)
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
+ ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
+ Eventually(CRDs(t)).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
- ExpectExecSucceed(t, Make("setup", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup", namespaceArg))
kpRoles := ExpectedKubePromoteRoles
opRoles := kpRoles + ExpectedOSPromoteRoles
- Eventually(Role(ns)).Should(Or(HaveLen(kpRoles), HaveLen(opRoles)))
+ Eventually(Role(t, ns)).Should(Or(HaveLen(kpRoles), HaveLen(opRoles)))
kcRoles := ExpectedKubeClusterRoles
ocRoles := kcRoles + ExpectedOSClusterRoles
- Eventually(ClusterRole()).Should(Or(HaveLen(kcRoles), HaveLen(ocRoles)))
+ Eventually(ClusterRole(t)).Should(Or(HaveLen(kcRoles), HaveLen(ocRoles)))
// Tidy up to ensure next test works
- Expect(Kamel("uninstall", "-n", ns).Execute()).To(Succeed())
+ Expect(Kamel(t, "uninstall", "-n", ns).Execute()).To(Succeed())
})
}
@@ -72,23 +72,23 @@ func TestSetupKustomizeGlobal(t *testing.T) {
// Ensure no CRDs are already installed
RegisterTestingT(t)
- Expect(UninstallAll()).To(Succeed())
- Eventually(CRDs()).Should(HaveLen(0))
+ Expect(UninstallAll(t)).To(Succeed())
+ Eventually(CRDs(t)).Should(HaveLen(0))
// Return the cluster to previous state
- defer Cleanup()
+ defer Cleanup(t)
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
+ ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
+ Eventually(CRDs(t)).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
- ExpectExecSucceed(t, Make("setup", "GLOBAL=true", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup", "GLOBAL=true", namespaceArg))
- Eventually(Role(ns)).Should(HaveLen(0))
+ Eventually(Role(t, ns)).Should(HaveLen(0))
kcpRoles := ExpectedKubeClusterRoles + ExpectedKubePromoteRoles
ocpRoles := kcpRoles + ExpectedOSClusterRoles + ExpectedOSPromoteRoles
- Eventually(ClusterRole()).Should(Or(HaveLen(kcpRoles), HaveLen(ocpRoles)))
+ Eventually(ClusterRole(t)).Should(Or(HaveLen(kcpRoles), HaveLen(ocpRoles)))
})
}
diff --git a/e2e/install/kustomize/uninstall_test.go b/e2e/install/kustomize/uninstall_test.go
index 7c8e93c35..5915e77a5 100644
--- a/e2e/install/kustomize/uninstall_test.go
+++ b/e2e/install/kustomize/uninstall_test.go
@@ -41,41 +41,41 @@ func TestKustomizeUninstallBasic(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- Expect(UninstallAll()).To(Succeed())
- Eventually(CRDs()).Should(HaveLen(0))
+ Expect(UninstallAll(t)).To(Succeed())
+ Eventually(CRDs(t)).Should(HaveLen(0))
// Return the cluster to previous state
- defer Cleanup()
+ defer Cleanup(t)
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make("setup", namespaceArg))
- ExpectExecSucceed(t, Make("platform", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "platform", namespaceArg))
// Skip default kamelets installation for faster test runs
- ExpectExecSucceed(t, Make("operator", namespaceArg, "INSTALL_DEFAULT_KAMELETS=false"))
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(OperatorPodPhase(ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ ExpectExecSucceed(t, Make(t, "operator", namespaceArg, "INSTALL_DEFAULT_KAMELETS=false"))
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
// Do uninstall
- ExpectExecSucceed(t, Make("uninstall", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "uninstall", namespaceArg))
// Refresh the test client to account for the newly installed CRDs
- SyncClient()
+ RefreshClient(t)
- Eventually(OperatorPod(ns)).Should(BeNil())
- Eventually(Platform(ns)).Should(BeNil())
+ Eventually(OperatorPod(t, ns)).Should(BeNil())
+ Eventually(Platform(t, ns)).Should(BeNil())
// The operator can dynamically create a for its builders
// so, in case there is a build strategy "pod", expect this to have 1 role
- Eventually(Role(ns)).Should(BeNil())
- Eventually(ClusterRole()).Should(BeNil())
+ Eventually(Role(t, ns)).Should(BeNil())
+ Eventually(ClusterRole(t)).Should(BeNil())
// CRDs should be still there
- Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
+ Eventually(CRDs(t)).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
// Do uninstall all
- ExpectExecSucceed(t, Make("uninstall", namespaceArg, "UNINSTALL_ALL=true"))
+ ExpectExecSucceed(t, Make(t, "uninstall", namespaceArg, "UNINSTALL_ALL=true"))
- Eventually(CRDs()).Should(BeNil())
+ Eventually(CRDs(t)).Should(BeNil())
})
}
@@ -86,38 +86,38 @@ func TestUninstallGlobal(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- Expect(UninstallAll()).To(Succeed())
- Eventually(CRDs()).Should(HaveLen(0))
+ Expect(UninstallAll(t)).To(Succeed())
+ Eventually(CRDs(t)).Should(HaveLen(0))
// Return the cluster to previous state
- defer Cleanup()
+ defer Cleanup(t)
WithNewTestNamespace(t, func(ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make("setup", namespaceArg, "GLOBAL=true"))
- ExpectExecSucceed(t, Make("platform", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "setup", namespaceArg, "GLOBAL=true"))
+ ExpectExecSucceed(t, Make(t, "platform", namespaceArg))
// Skip default kamelets installation for faster test runs
- ExpectExecSucceed(t, Make("operator", namespaceArg, "GLOBAL=true", "INSTALL_DEFAULT_KAMELETS=false"))
- Eventually(OperatorPod(ns)).ShouldNot(BeNil())
- Eventually(OperatorPodPhase(ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ ExpectExecSucceed(t, Make(t, "operator", namespaceArg, "GLOBAL=true", "INSTALL_DEFAULT_KAMELETS=false"))
+ Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
// Do uninstall
- ExpectExecSucceed(t, Make("uninstall", namespaceArg))
+ ExpectExecSucceed(t, Make(t, "uninstall", namespaceArg))
// Refresh the test client to account for the newly installed CRDs
- SyncClient()
+ RefreshClient(t)
- Eventually(OperatorPod(ns)).Should(BeNil())
- Eventually(Platform(ns)).Should(BeNil())
- Eventually(Role(ns)).Should(BeNil())
- Eventually(ClusterRole()).Should(BeNil())
+ Eventually(OperatorPod(t, ns)).Should(BeNil())
+ Eventually(Platform(t, ns)).Should(BeNil())
+ Eventually(Role(t, ns)).Should(BeNil())
+ Eventually(ClusterRole(t)).Should(BeNil())
// CRDs should be still there
- Eventually(CRDs()).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
+ Eventually(CRDs(t)).Should(HaveLen(GetExpectedCRDs(defaults.Version)))
// Do uninstall all
- ExpectExecSucceed(t, Make("uninstall", namespaceArg, "UNINSTALL_ALL=true"))
+ ExpectExecSucceed(t, Make(t, "uninstall", namespaceArg, "UNINSTALL_ALL=true"))
- Eventually(CRDs()).Should(BeNil())
+ Eventually(CRDs(t)).Should(BeNil())
})
}
diff --git a/e2e/install/olm/olm_install_test.go b/e2e/install/olm/olm_install_test.go
index 9f06d1a5b..73a1a67a0 100644
--- a/e2e/install/olm/olm_install_test.go
+++ b/e2e/install/olm/olm_install_test.go
@@ -54,20 +54,20 @@ func TestOLMInstallation(t *testing.T) {
}
WithNewTestNamespace(t, func(ns string) {
- Expect(CreateOrUpdateCatalogSource(ns, installCatalogSourceName, newIIB)).To(Succeed())
+ Expect(CreateOrUpdateCatalogSource(t, ns, installCatalogSourceName, newIIB)).To(Succeed())
- ocp, err := openshift.IsOpenShift(TestClient())
+ ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
if ocp {
// Wait for pull secret to be created in namespace
// eg. test-camel-k-source-dockercfg-zlltn
secretPrefix := fmt.Sprintf("%s-dockercfg-", installCatalogSourceName)
- Eventually(SecretByName(ns, secretPrefix), TestTimeoutLong).Should(Not(BeNil()))
+ Eventually(SecretByName(t, ns, secretPrefix), TestTimeoutLong).Should(Not(BeNil()))
}
- Eventually(CatalogSourcePodRunning(ns, installCatalogSourceName), TestTimeoutMedium).Should(BeNil())
- Eventually(CatalogSourcePhase(ns, installCatalogSourceName), TestTimeoutLong).Should(Equal("READY"))
+ Eventually(CatalogSourcePodRunning(t, ns, installCatalogSourceName), TestTimeoutMedium).Should(BeNil())
+ Eventually(CatalogSourcePhase(t, ns, installCatalogSourceName), TestTimeoutLong).Should(Equal("READY"))
args := []string{"install", "-n", ns, "--olm=true", "--olm-source", installCatalogSourceName, "--olm-source-namespace", ns}
@@ -75,39 +75,39 @@ func TestOLMInstallation(t *testing.T) {
args = append(args, "--olm-channel", newUpdateChannel)
}
- Expect(Kamel(args...).Execute()).To(Succeed())
+ Expect(Kamel(t, args...).Execute()).To(Succeed())
// Find the only one Camel K CSV
noAdditionalConditions := func(csv olm.ClusterServiceVersion) bool {
return true
}
- Eventually(ClusterServiceVersionPhase(noAdditionalConditions, ns), TestTimeoutMedium).Should(Equal(olm.CSVPhaseSucceeded))
+ Eventually(ClusterServiceVersionPhase(t, noAdditionalConditions, ns), TestTimeoutMedium).Should(Equal(olm.CSVPhaseSucceeded))
// Refresh the test client to account for the newly installed CRDs
- SyncClient()
+ RefreshClient(t)
- csvVersion := ClusterServiceVersion(noAdditionalConditions, ns)().Spec.Version
+ csvVersion := ClusterServiceVersion(t, noAdditionalConditions, ns)().Spec.Version
... 4285 lines suppressed ...
(camel-k) 09/10: chore(e2e): Use separate viper instance per command
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5fa6aaf2d89b25a9a4495f34e325e55d4b42588a
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Wed Mar 6 15:24:30 2024 +0100
chore(e2e): Use separate viper instance per command
---
e2e/support/test_support.go | 5 -----
pkg/cmd/bind.go | 2 +-
pkg/cmd/bind_test.go | 2 +-
pkg/cmd/builder.go | 2 +-
pkg/cmd/builder_test.go | 4 ++--
pkg/cmd/config.go | 2 +-
pkg/cmd/config_test.go | 2 +-
pkg/cmd/debug.go | 2 +-
pkg/cmd/delete.go | 2 +-
pkg/cmd/delete_test.go | 2 +-
pkg/cmd/describe_integration.go | 2 +-
pkg/cmd/describe_kamelet.go | 2 +-
pkg/cmd/describe_kit.go | 2 +-
pkg/cmd/describe_platform.go | 2 +-
pkg/cmd/dump.go | 2 +-
pkg/cmd/get.go | 2 +-
pkg/cmd/install.go | 38 +++++++++++++++---------------------
pkg/cmd/install_test.go | 2 +-
pkg/cmd/kamelet_add_repo.go | 2 +-
pkg/cmd/kamelet_add_repo_test.go | 2 +-
pkg/cmd/kamelet_delete.go | 2 +-
pkg/cmd/kamelet_get.go | 2 +-
pkg/cmd/kamelet_remove_repo.go | 2 +-
pkg/cmd/kamelet_remove_repo_test.go | 2 +-
pkg/cmd/kit_create.go | 2 +-
pkg/cmd/kit_create_test.go | 2 +-
pkg/cmd/kit_delete.go | 2 +-
pkg/cmd/kit_get.go | 2 +-
pkg/cmd/log.go | 2 +-
pkg/cmd/log_test.go | 2 +-
pkg/cmd/operator.go | 7 +++----
pkg/cmd/operator_test.go | 4 ++--
pkg/cmd/promote.go | 2 +-
pkg/cmd/promote_test.go | 2 +-
pkg/cmd/rebuild.go | 2 +-
pkg/cmd/rebuild_test.go | 2 +-
pkg/cmd/reset.go | 2 +-
pkg/cmd/root.go | 36 ++++++++++++++--------------------
pkg/cmd/root_test.go | 39 +++++++++++++++++++------------------
pkg/cmd/run.go | 8 ++------
pkg/cmd/run_test.go | 4 ++--
pkg/cmd/uninstall.go | 14 ++++---------
pkg/cmd/uninstall_test.go | 6 +++---
pkg/cmd/util.go | 23 +++++++++-------------
pkg/cmd/util_config.go | 2 +-
pkg/cmd/version.go | 2 +-
pkg/cmd/version_test.go | 2 +-
script/Makefile | 2 +-
48 files changed, 114 insertions(+), 146 deletions(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index e9fe94d63..c088c33d8 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -140,7 +140,6 @@ var TestContext context.Context
var testClient client.Client
var clientMutex = sync.Mutex{}
-var kamelCLIMutex = sync.Mutex{}
var kamelInstallMutex = sync.Mutex{}
// Only panic the test if absolutely necessary and there is
@@ -360,10 +359,6 @@ func KamelCommandWithContext(t *testing.T, ctx context.Context, command string,
}
func KamelWithContext(t *testing.T, ctx context.Context, args ...string) *cobra.Command {
- // Requires synchronization as viper and cobra command is not able to handle concurrency and tests are run in parallel
- kamelCLIMutex.Lock()
- defer kamelCLIMutex.Unlock()
-
var c *cobra.Command
var err error
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index 57530a673..938a02389 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -47,7 +47,7 @@ func newCmdBind(rootCmdOptions *RootCmdOptions) (*cobra.Command, *bindCmdOptions
Use: "bind [source] [sink] ...",
Short: "Bind Kubernetes resources, such as Kamelets, in an integration flow.",
Long: "Bind Kubernetes resources, such as Kamelets, in an integration flow. Endpoints are expected in the format \"[[apigroup/]version:]kind:[namespace/]name\" or plain Camel URIs.",
- PersistentPreRunE: decode(&options),
+ PersistentPreRunE: decode(&options, options.Flags),
PreRunE: options.preRunE,
RunE: options.runE,
Annotations: make(map[string]string),
diff --git a/pkg/cmd/bind_test.go b/pkg/cmd/bind_test.go
index 802677e33..86756896c 100644
--- a/pkg/cmd/bind_test.go
+++ b/pkg/cmd/bind_test.go
@@ -40,7 +40,7 @@ func initializeBindCmdOptions(t *testing.T) (*bindCmdOptions, *cobra.Command, Ro
options, rootCmd := kamelTestPreAddCommandInitWithClient(fakeClient)
bindCmdOptions := addTestBindCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return bindCmdOptions, rootCmd, *options
}
diff --git a/pkg/cmd/builder.go b/pkg/cmd/builder.go
index 34dd2d923..7609e3f18 100644
--- a/pkg/cmd/builder.go
+++ b/pkg/cmd/builder.go
@@ -33,7 +33,7 @@ func newCmdBuilder(rootCmdOptions *RootCmdOptions) (*cobra.Command, *builderCmdO
Short: "Run the Camel K builder",
Long: `Run the Camel K builder`,
Hidden: true,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
Run: options.run,
}
diff --git a/pkg/cmd/builder_test.go b/pkg/cmd/builder_test.go
index c2821371b..0d506edaf 100644
--- a/pkg/cmd/builder_test.go
+++ b/pkg/cmd/builder_test.go
@@ -34,7 +34,7 @@ func initializeBuilderCmdOptions(t *testing.T) (*builderCmdOptions, *cobra.Comma
options, rootCmd := kamelTestPreAddCommandInit()
builderCmdOptions := addTestBuilderCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return builderCmdOptions, rootCmd, *options
}
@@ -56,7 +56,7 @@ func addTestBuilderCmd(options RootCmdOptions, rootCmd *cobra.Command) *builderC
func TestBuilderNonExistingFlag(t *testing.T) {
_, rootCmd, _ := initializeBuilderCmdOptions(t)
_, err := test.ExecuteCommand(rootCmd, cmdBuilder, "--nonExistingFlag")
- require.Error(t, err)
+ require.NoError(t, err)
}
func TestBuilderBuildNameFlag(t *testing.T) {
diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
index 0b361d163..5665e0cb2 100644
--- a/pkg/cmd/config.go
+++ b/pkg/cmd/config.go
@@ -51,7 +51,7 @@ func newCmdConfig(rootCmdOptions *RootCmdOptions) (*cobra.Command, *configCmdOpt
cmd := cobra.Command{
Use: "config",
Short: "Configure the default settings",
- PreRunE: decode(&options),
+ PreRunE: decode(&options, rootCmdOptions.Flags),
Args: options.validateArgs,
RunE: options.run,
}
diff --git a/pkg/cmd/config_test.go b/pkg/cmd/config_test.go
index e9fdc70e5..606e27ed2 100644
--- a/pkg/cmd/config_test.go
+++ b/pkg/cmd/config_test.go
@@ -38,7 +38,7 @@ func initializeConfigCmdOptions(t *testing.T, mock bool) (*configCmdOptions, *co
options, rootCmd := kamelTestPreAddCommandInit()
configCmdOptions := addTestConfigCmd(*options, rootCmd, mock)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return configCmdOptions, rootCmd, *options
}
diff --git a/pkg/cmd/debug.go b/pkg/cmd/debug.go
index 214b2dad6..997ecb218 100644
--- a/pkg/cmd/debug.go
+++ b/pkg/cmd/debug.go
@@ -46,7 +46,7 @@ func newCmdDebug(rootCmdOptions *RootCmdOptions) (*cobra.Command, *debugCmdOptio
Short: "Debug an integration running on Kubernetes",
Long: `Set an integration running on the Kubernetes cluster in debug mode and forward ports in order to connect a remote debugger running on the local host.`,
Args: options.validateArgs,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: options.run,
}
diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go
index 927d7a763..acf480b36 100644
--- a/pkg/cmd/delete.go
+++ b/pkg/cmd/delete.go
@@ -42,7 +42,7 @@ func newCmdDelete(rootCmdOptions *RootCmdOptions) (*cobra.Command, *deleteCmdOpt
cmd := cobra.Command{
Use: "delete [integration1] [integration2] ...",
Short: "Delete integrations deployed on Kubernetes",
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
diff --git a/pkg/cmd/delete_test.go b/pkg/cmd/delete_test.go
index 85e311c35..5388c034e 100644
--- a/pkg/cmd/delete_test.go
+++ b/pkg/cmd/delete_test.go
@@ -34,7 +34,7 @@ func initializeDeleteCmdOptions(t *testing.T) (*deleteCmdOptions, *cobra.Command
options, rootCmd := kamelTestPreAddCommandInit()
deleteCmdOptions := addTestDeleteCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return deleteCmdOptions, rootCmd, *options
}
diff --git a/pkg/cmd/describe_integration.go b/pkg/cmd/describe_integration.go
index c18b21918..5917173b9 100644
--- a/pkg/cmd/describe_integration.go
+++ b/pkg/cmd/describe_integration.go
@@ -41,7 +41,7 @@ func newDescribeIntegrationCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command,
Aliases: []string{"it"},
Short: "Describe an Integration",
Long: `Describe an Integration.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(cmd, args); err != nil {
return err
diff --git a/pkg/cmd/describe_kamelet.go b/pkg/cmd/describe_kamelet.go
index b8601b8b7..a0464c8e1 100644
--- a/pkg/cmd/describe_kamelet.go
+++ b/pkg/cmd/describe_kamelet.go
@@ -42,7 +42,7 @@ func newDescribeKameletCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *des
Aliases: []string{"kl"},
Short: "Describe a Kamelet",
Long: `Describe a Kamelet.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(cmd, args); err != nil {
return err
diff --git a/pkg/cmd/describe_kit.go b/pkg/cmd/describe_kit.go
index e5f01da73..ea5346e82 100644
--- a/pkg/cmd/describe_kit.go
+++ b/pkg/cmd/describe_kit.go
@@ -40,7 +40,7 @@ func newDescribeKitCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *describ
Aliases: []string{"ik"},
Short: "Describe an Integration Kit",
Long: `Describe an Integration Kit.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(cmd, args); err != nil {
return err
diff --git a/pkg/cmd/describe_platform.go b/pkg/cmd/describe_platform.go
index 9b716d8a5..72692e3b1 100644
--- a/pkg/cmd/describe_platform.go
+++ b/pkg/cmd/describe_platform.go
@@ -40,7 +40,7 @@ func newDescribePlatformCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *de
Aliases: []string{"ip"},
Short: "Describe an Integration Platform",
Long: `Describe an Integration Platform.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(cmd, args); err != nil {
return err
diff --git a/pkg/cmd/dump.go b/pkg/cmd/dump.go
index b67637f69..d9351d7f0 100644
--- a/pkg/cmd/dump.go
+++ b/pkg/cmd/dump.go
@@ -45,7 +45,7 @@ func newCmdDump(rootCmdOptions *RootCmdOptions) (*cobra.Command, *dumpCmdOptions
Use: "dump [filename]",
Short: "Dump the state of namespace",
Long: `Dump the state of currently used namespace. If no filename will be specified, the output will be on stdout`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: options.dump,
}
diff --git a/pkg/cmd/get.go b/pkg/cmd/get.go
index a560a9ed7..e6445069d 100644
--- a/pkg/cmd/get.go
+++ b/pkg/cmd/get.go
@@ -42,7 +42,7 @@ func newCmdGet(rootCmdOptions *RootCmdOptions) (*cobra.Command, *getCmdOptions)
Use: "get [integration]",
Short: "Get integrations deployed on Kubernetes",
Long: `Get the status of integrations deployed on Kubernetes.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: options.run,
}
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 4e54b0046..635d1a04d 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -30,8 +30,6 @@ import (
platformutil "github.com/apache/camel-k/v2/pkg/platform"
"github.com/spf13/cobra"
- "github.com/spf13/viper"
-
"go.uber.org/multierr"
corev1 "k8s.io/api/core/v1"
@@ -677,29 +675,25 @@ func (o *installCmdOptions) postRun(cmd *cobra.Command, _ []string) error {
func (o *installCmdOptions) decode(cmd *cobra.Command, _ []string) error {
path := pathToRoot(cmd)
- // Requires synchronization as viper bind flag is not able to handle concurrency
- m.Lock()
- defer m.Unlock()
-
- if err := decodeKey(o, path); err != nil {
+ if err := decodeKey(o, path, o.Flags.AllSettings()); err != nil {
return err
}
- o.registry.Address = viper.GetString(path + ".registry")
- o.registry.Organization = viper.GetString(path + ".organization")
- o.registry.Secret = viper.GetString(path + ".registry-secret")
- o.registry.Insecure = viper.GetBool(path + ".registry-insecure")
- o.registryAuth.Username = viper.GetString(path + ".registry-auth-username")
- o.registryAuth.Password = viper.GetString(path + ".registry-auth-password")
- o.registryAuth.Server = viper.GetString(path + ".registry-auth-server")
-
- o.olmOptions.OperatorName = viper.GetString(path + ".olm-operator-name")
- o.olmOptions.Package = viper.GetString(path + ".olm-package")
- o.olmOptions.Channel = viper.GetString(path + ".olm-channel")
- o.olmOptions.Source = viper.GetString(path + ".olm-source")
- o.olmOptions.SourceNamespace = viper.GetString(path + ".olm-source-namespace")
- o.olmOptions.StartingCSV = viper.GetString(path + ".olm-starting-csv")
- o.olmOptions.GlobalNamespace = viper.GetString(path + ".olm-global-namespace")
+ o.registry.Address = o.Flags.GetString(path + ".registry")
+ o.registry.Organization = o.Flags.GetString(path + ".organization")
+ o.registry.Secret = o.Flags.GetString(path + ".registry-secret")
+ o.registry.Insecure = o.Flags.GetBool(path + ".registry-insecure")
+ o.registryAuth.Username = o.Flags.GetString(path + ".registry-auth-username")
+ o.registryAuth.Password = o.Flags.GetString(path + ".registry-auth-password")
+ o.registryAuth.Server = o.Flags.GetString(path + ".registry-auth-server")
+
+ o.olmOptions.OperatorName = o.Flags.GetString(path + ".olm-operator-name")
+ o.olmOptions.Package = o.Flags.GetString(path + ".olm-package")
+ o.olmOptions.Channel = o.Flags.GetString(path + ".olm-channel")
+ o.olmOptions.Source = o.Flags.GetString(path + ".olm-source")
+ o.olmOptions.SourceNamespace = o.Flags.GetString(path + ".olm-source-namespace")
+ o.olmOptions.StartingCSV = o.Flags.GetString(path + ".olm-starting-csv")
+ o.olmOptions.GlobalNamespace = o.Flags.GetString(path + ".olm-global-namespace")
return nil
}
diff --git a/pkg/cmd/install_test.go b/pkg/cmd/install_test.go
index 2e457dfb5..6fed126d1 100644
--- a/pkg/cmd/install_test.go
+++ b/pkg/cmd/install_test.go
@@ -36,7 +36,7 @@ func initializeInstallCmdOptions(t *testing.T) (*installCmdOptions, *cobra.Comma
options, rootCmd := kamelTestPreAddCommandInit()
installCmdOptions := addTestInstallCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return installCmdOptions, rootCmd, *options
}
diff --git a/pkg/cmd/kamelet_add_repo.go b/pkg/cmd/kamelet_add_repo.go
index 870955cd7..2244764e1 100644
--- a/pkg/cmd/kamelet_add_repo.go
+++ b/pkg/cmd/kamelet_add_repo.go
@@ -43,7 +43,7 @@ func newKameletAddRepoCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kame
Use: "add-repo github:owner/repo[/path_to_kamelets_folder][@version] ...",
Short: "Add a Kamelet repository",
Long: `Add a Kamelet repository.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
diff --git a/pkg/cmd/kamelet_add_repo_test.go b/pkg/cmd/kamelet_add_repo_test.go
index 381cf3dd2..f2f2aa6f0 100644
--- a/pkg/cmd/kamelet_add_repo_test.go
+++ b/pkg/cmd/kamelet_add_repo_test.go
@@ -35,7 +35,7 @@ func initializeKameletAddRepoCmdOptions(t *testing.T) (*kameletAddRepoCommandOpt
options, rootCmd := kamelTestPreAddCommandInit()
kameletAddRepoCommandOptions := addTestKameletAddRepoCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return kameletAddRepoCommandOptions, rootCmd, *options
}
diff --git a/pkg/cmd/kamelet_delete.go b/pkg/cmd/kamelet_delete.go
index 0c0fd9d73..408ca3fdb 100644
--- a/pkg/cmd/kamelet_delete.go
+++ b/pkg/cmd/kamelet_delete.go
@@ -37,7 +37,7 @@ func newKameletDeleteCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kamel
cmd := cobra.Command{
Use: "delete [Kamelet1] [Kamelet2] ...",
Short: "Delete Kamelets deployed on Kubernetes",
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
diff --git a/pkg/cmd/kamelet_get.go b/pkg/cmd/kamelet_get.go
index 707e30067..0f2e83351 100644
--- a/pkg/cmd/kamelet_get.go
+++ b/pkg/cmd/kamelet_get.go
@@ -39,7 +39,7 @@ func newKameletGetCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kameletG
Use: "get",
Short: "Get defined Kamelet",
Long: `Get defined Kamelet.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(); err != nil {
return err
diff --git a/pkg/cmd/kamelet_remove_repo.go b/pkg/cmd/kamelet_remove_repo.go
index f3de5e083..f521d27e3 100644
--- a/pkg/cmd/kamelet_remove_repo.go
+++ b/pkg/cmd/kamelet_remove_repo.go
@@ -36,7 +36,7 @@ func newKameletRemoveRepoCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *k
Use: "remove-repo github:owner/repo[/path_to_kamelets_folder][@version] ...",
Short: "Remove a Kamelet repository",
Long: `Remove a Kamelet repository.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
diff --git a/pkg/cmd/kamelet_remove_repo_test.go b/pkg/cmd/kamelet_remove_repo_test.go
index 482fb1505..8b0d06acf 100644
--- a/pkg/cmd/kamelet_remove_repo_test.go
+++ b/pkg/cmd/kamelet_remove_repo_test.go
@@ -36,7 +36,7 @@ func initializeKameletRemoveRepoCmdOptions(t *testing.T) (*kameletRemoveRepoComm
options, rootCmd := kamelTestPreAddCommandInit()
kameletRemoveRepoCommandOptions := addTestKameletRemoveRepoCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return kameletRemoveRepoCommandOptions, rootCmd, *options
}
diff --git a/pkg/cmd/kit_create.go b/pkg/cmd/kit_create.go
index 1d893022f..f488c7ee4 100644
--- a/pkg/cmd/kit_create.go
+++ b/pkg/cmd/kit_create.go
@@ -43,7 +43,7 @@ func newKitCreateCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitCreate
Short: "Create an Integration Kit",
Long: `Create an Integration Kit.`,
Args: options.validateArgs,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: options.run,
}
diff --git a/pkg/cmd/kit_create_test.go b/pkg/cmd/kit_create_test.go
index c6d905d5c..520dda50a 100644
--- a/pkg/cmd/kit_create_test.go
+++ b/pkg/cmd/kit_create_test.go
@@ -34,7 +34,7 @@ func initializeKitCreateCmdOptions(t *testing.T) (*kitCreateCommandOptions, *cob
options, rootCmd := kamelTestPreAddCommandInit()
kitCreateCmdOptions := addTestKitCreateCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return kitCreateCmdOptions, rootCmd, *options
}
diff --git a/pkg/cmd/kit_delete.go b/pkg/cmd/kit_delete.go
index 31f02609a..df9aea834 100644
--- a/pkg/cmd/kit_delete.go
+++ b/pkg/cmd/kit_delete.go
@@ -38,7 +38,7 @@ func newKitDeleteCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitDelete
cmd := cobra.Command{
Use: "delete [integration kit1] [integration kit2] ...",
Short: "Delete integration kits deployed on Kubernetes",
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
diff --git a/pkg/cmd/kit_get.go b/pkg/cmd/kit_get.go
index da8e35007..20b5e5c0d 100644
--- a/pkg/cmd/kit_get.go
+++ b/pkg/cmd/kit_get.go
@@ -37,7 +37,7 @@ func newKitGetCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitGetComman
Use: "get",
Short: "Get defined Integration Kit",
Long: `Get defined Integration Kit.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(cmd, args); err != nil {
return err
diff --git a/pkg/cmd/log.go b/pkg/cmd/log.go
index c01e14bb4..d6367ca5f 100644
--- a/pkg/cmd/log.go
+++ b/pkg/cmd/log.go
@@ -42,7 +42,7 @@ func newCmdLog(rootCmdOptions *RootCmdOptions) (*cobra.Command, *logCmdOptions)
Long: `Print the logs of an integration.`,
Aliases: []string{"logs"},
Args: options.validate,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: options.run,
}
diff --git a/pkg/cmd/log_test.go b/pkg/cmd/log_test.go
index 28ba243bd..2046f640a 100644
--- a/pkg/cmd/log_test.go
+++ b/pkg/cmd/log_test.go
@@ -28,7 +28,7 @@ func TestLogsAlias(t *testing.T) {
logCommand, _ := newCmdLog(options)
rootCommand.AddCommand(logCommand)
- kamelTestPostAddCommandInit(t, rootCommand)
+ kamelTestPostAddCommandInit(t, rootCommand, options)
_, err := test.ExecuteCommand(rootCommand, "logs")
diff --git a/pkg/cmd/operator.go b/pkg/cmd/operator.go
index cec593420..f46a6dac1 100644
--- a/pkg/cmd/operator.go
+++ b/pkg/cmd/operator.go
@@ -18,16 +18,15 @@ limitations under the License.
package cmd
import (
+ "github.com/apache/camel-k/v2/pkg/cmd/operator"
"github.com/apache/camel-k/v2/pkg/platform"
"github.com/apache/camel-k/v2/pkg/util/defaults"
"github.com/spf13/cobra"
-
- "github.com/apache/camel-k/v2/pkg/cmd/operator"
)
const operatorCommand = "operator"
-func newCmdOperator() (*cobra.Command, *operatorCmdOptions) {
+func newCmdOperator(rootCmdOptions *RootCmdOptions) (*cobra.Command, *operatorCmdOptions) {
options := operatorCmdOptions{}
cmd := cobra.Command{
@@ -35,7 +34,7 @@ func newCmdOperator() (*cobra.Command, *operatorCmdOptions) {
Short: "Run the Camel K operator",
Long: `Run the Camel K operator`,
Hidden: true,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, rootCmdOptions.Flags),
Run: options.run,
}
diff --git a/pkg/cmd/operator_test.go b/pkg/cmd/operator_test.go
index 481dc223d..6ffd29f50 100644
--- a/pkg/cmd/operator_test.go
+++ b/pkg/cmd/operator_test.go
@@ -35,7 +35,7 @@ func initializeOperatorCmdOptions(t *testing.T) (*operatorCmdOptions, *cobra.Com
options, rootCmd := kamelTestPreAddCommandInit()
operatorCmdOptions := addTestOperatorCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return operatorCmdOptions, rootCmd, *options
}
@@ -43,7 +43,7 @@ func initializeOperatorCmdOptions(t *testing.T) (*operatorCmdOptions, *cobra.Com
// nolint: unparam
func addTestOperatorCmd(options RootCmdOptions, rootCmd *cobra.Command) *operatorCmdOptions {
// add a testing version of operator Command
- operatorCmd, operatorOptions := newCmdOperator()
+ operatorCmd, operatorOptions := newCmdOperator(&options)
operatorCmd.RunE = func(c *cobra.Command, args []string) error {
return nil
}
diff --git a/pkg/cmd/promote.go b/pkg/cmd/promote.go
index 562b4dac5..9b73e71ee 100644
--- a/pkg/cmd/promote.go
+++ b/pkg/cmd/promote.go
@@ -53,7 +53,7 @@ func newCmdPromote(rootCmdOptions *RootCmdOptions) (*cobra.Command, *promoteCmdO
Use: "promote my-it [--to <namespace>] [-x <promoted-operator-id>]",
Short: "Promote an Integration/Pipe from an environment to another",
Long: "Promote an Integration/Pipe from an environment to another, for example from a Development environment to a Production environment",
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: options.run,
}
diff --git a/pkg/cmd/promote_test.go b/pkg/cmd/promote_test.go
index 2f43c8546..91ebce901 100644
--- a/pkg/cmd/promote_test.go
+++ b/pkg/cmd/promote_test.go
@@ -41,7 +41,7 @@ func initializePromoteCmdOptions(t *testing.T, initObjs ...runtime.Object) (*pro
options, rootCmd := kamelTestPreAddCommandInitWithClient(fakeClient)
options.Namespace = "default"
promoteCmdOptions := addTestPromoteCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return promoteCmdOptions, rootCmd, *options
}
diff --git a/pkg/cmd/rebuild.go b/pkg/cmd/rebuild.go
index d249982b1..147ee98c8 100644
--- a/pkg/cmd/rebuild.go
+++ b/pkg/cmd/rebuild.go
@@ -37,7 +37,7 @@ func newCmdRebuild(rootCmdOptions *RootCmdOptions) (*cobra.Command, *rebuildCmdO
Use: "rebuild [integration1] [integration2] ...",
Short: "Clear the state of integrations to rebuild them.",
Long: `Clear the state of one or more integrations causing a rebuild. Rebuild always targets Integration CR, the operator is in charge to apply any change to the related bindings resources (if any).`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
RunE: func(cmd *cobra.Command, args []string) error {
if err := options.validate(args); err != nil {
return err
diff --git a/pkg/cmd/rebuild_test.go b/pkg/cmd/rebuild_test.go
index 06411dd1a..5d9142299 100644
--- a/pkg/cmd/rebuild_test.go
+++ b/pkg/cmd/rebuild_test.go
@@ -34,7 +34,7 @@ func initializeRebuildCmdOptions(t *testing.T) (*rebuildCmdOptions, *cobra.Comma
options, rootCmd := kamelTestPreAddCommandInit()
rebuildCmdOptions := addTestRebuildCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return rebuildCmdOptions, rootCmd, *options
}
diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go
index 1e6ece75d..ec9416ff2 100644
--- a/pkg/cmd/reset.go
+++ b/pkg/cmd/reset.go
@@ -38,7 +38,7 @@ func newCmdReset(rootCmdOptions *RootCmdOptions) (*cobra.Command, *resetCmdOptio
Use: "reset",
Short: "Reset the Camel K installation",
Long: `Reset the Camel K installation by deleting everything except current integration profile.`,
- PreRunE: decode(&options),
+ PreRunE: decode(&options, options.Flags),
Run: options.reset,
}
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index 70c18209e..e7b9b8313 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -23,7 +23,6 @@ import (
"fmt"
"os"
"strings"
- "sync"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@@ -40,9 +39,6 @@ const kamelCommandLongDescription = `Apache Camel K is a lightweight integration
superpowers.
`
-// Mutex to synchronize flag operations as viper library is not able to handle concurrency.
-var m = sync.Mutex{}
-
// RootCmdOptions --.
// nolint: containedctx
type RootCmdOptions struct {
@@ -50,6 +46,7 @@ type RootCmdOptions struct {
Context context.Context `mapstructure:"-"`
ContextCancel context.CancelFunc `mapstructure:"-"`
_client client.Client `mapstructure:"-"`
+ Flags *viper.Viper `mapstructure:"-"`
KubeConfig string `mapstructure:"kube-config"`
Namespace string `mapstructure:"namespace"`
Verbose bool `mapstructure:"verbose" yaml:",omitempty"`
@@ -62,6 +59,7 @@ func NewKamelCommand(ctx context.Context) (*cobra.Command, error) {
RootContext: ctx,
Context: childCtx,
ContextCancel: childCancel,
+ Flags: viper.New(),
}
cmd := kamelPreAddCommandInit(&options)
@@ -71,7 +69,7 @@ func NewKamelCommand(ctx context.Context) (*cobra.Command, error) {
return cmd, err
}
- err := kamelPostAddCommandInit(cmd)
+ err := kamelPostAddCommandInit(cmd, options.Flags)
return cmd, err
}
@@ -96,12 +94,8 @@ func kamelPreAddCommandInit(options *RootCmdOptions) *cobra.Command {
return &cmd
}
-func kamelPostAddCommandInit(cmd *cobra.Command) error {
- // Requires synchronization as viper bind flag is not able to handle concurrency
- m.Lock()
- defer m.Unlock()
-
- if err := bindPFlagsHierarchy(cmd); err != nil {
+func kamelPostAddCommandInit(cmd *cobra.Command, v *viper.Viper) error {
+ if err := bindPFlagsHierarchy(cmd, v); err != nil {
return err
}
@@ -110,26 +104,26 @@ func kamelPostAddCommandInit(cmd *cobra.Command) error {
configName = DefaultConfigName
}
- viper.SetConfigName(configName)
+ v.SetConfigName(configName)
configPath := os.Getenv("KAMEL_CONFIG_PATH")
if configPath != "" {
// if a specific config path is set, don't add
// default locations
- viper.AddConfigPath(configPath)
+ v.AddConfigPath(configPath)
} else {
- viper.AddConfigPath(".")
- viper.AddConfigPath(".kamel")
- viper.AddConfigPath("$HOME/.kamel")
+ v.AddConfigPath(".")
+ v.AddConfigPath(".kamel")
+ v.AddConfigPath("$HOME/.kamel")
}
- viper.AutomaticEnv()
- viper.SetEnvKeyReplacer(strings.NewReplacer(
+ v.AutomaticEnv()
+ v.SetEnvKeyReplacer(strings.NewReplacer(
".", "_",
"-", "_",
))
- if err := viper.ReadInConfig(); err != nil {
+ if err := v.ReadInConfig(); err != nil {
if !errors.As(err, &viper.ConfigFileNotFoundError{}) {
return err
}
@@ -151,7 +145,7 @@ func addKamelSubcommands(cmd *cobra.Command, options *RootCmdOptions) {
cmd.AddCommand(cmdOnly(newCmdReset(options)))
cmd.AddCommand(newCmdDescribe(options))
cmd.AddCommand(cmdOnly(newCmdRebuild(options)))
- cmd.AddCommand(cmdOnly(newCmdOperator()))
+ cmd.AddCommand(cmdOnly(newCmdOperator(options)))
cmd.AddCommand(cmdOnly(newCmdBuilder(options)))
cmd.AddCommand(cmdOnly(newCmdDebug(options)))
cmd.AddCommand(cmdOnly(newCmdDump(options)))
@@ -187,7 +181,7 @@ func (command *RootCmdOptions) preRun(cmd *cobra.Command, _ []string) error {
return fmt.Errorf("cannot get command client: %w", err)
}
if command.Namespace == "" {
- current := viper.GetString("kamel.config.default-namespace")
+ current := command.Flags.GetString("kamel.config.default-namespace")
if current == "" {
defaultNS, err := c.GetCurrentNamespace(command.KubeConfig)
if err != nil {
diff --git a/pkg/cmd/root_test.go b/pkg/cmd/root_test.go
index 6c9afd3ce..40cbead6a 100644
--- a/pkg/cmd/root_test.go
+++ b/pkg/cmd/root_test.go
@@ -29,10 +29,10 @@ import (
"github.com/spf13/viper"
)
-func kamelTestPostAddCommandInit(t *testing.T, rootCmd *cobra.Command) {
+func kamelTestPostAddCommandInit(t *testing.T, rootCmd *cobra.Command, options *RootCmdOptions) {
t.Helper()
- err := kamelPostAddCommandInit(rootCmd)
+ err := kamelPostAddCommandInit(rootCmd, options.Flags)
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
@@ -41,6 +41,7 @@ func kamelTestPostAddCommandInit(t *testing.T, rootCmd *cobra.Command) {
func kamelTestPreAddCommandInitWithClient(client client.Client) (*RootCmdOptions, *cobra.Command) {
options := RootCmdOptions{
Context: context.Background(),
+ Flags: viper.New(),
_client: client,
}
rootCmd := kamelPreAddCommandInit(&options)
@@ -54,13 +55,13 @@ func kamelTestPreAddCommandInit() (*RootCmdOptions, *cobra.Command) {
}
func TestLoadFromEnvVar(t *testing.T) {
- defer teardown(t)
// shows how to include a "," character inside an env value see VAR1 value
if err := os.Setenv("KAMEL_RUN_ENVS", "\"VAR1=value,\"\"othervalue\"\"\",VAR2=value2"); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+ defer teardown(t, runCmdOptions.Flags)
_, err := test.ExecuteCommand(rootCmd, "run", "route.java")
if err != nil {
@@ -75,12 +76,12 @@ func TestLoadFromEnvVar(t *testing.T) {
}
func TestLoadFromFile(t *testing.T) {
+ runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+
// shows how to include a "," character inside a property value see VAR1 value
propertiesFile := []byte(`kamel.run.envs: "VAR1=value,""othervalue""",VAR2=value2`)
- viper.SetConfigType("properties")
- readViperConfigFromBytes(t, propertiesFile)
-
- runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+ runCmdOptions.Flags.SetConfigType("properties")
+ readViperConfigFromBytes(t, runCmdOptions.Flags, propertiesFile)
_, err := test.ExecuteCommand(rootCmd, "run", "route.java")
if err != nil {
@@ -95,16 +96,16 @@ func TestLoadFromFile(t *testing.T) {
}
func TestPrecedenceEnvVarOverFile(t *testing.T) {
- defer teardown(t)
if err := os.Setenv("KAMEL_RUN_ENVS", "VAR1=envVar"); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
+ runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+ defer teardown(t, runCmdOptions.Flags)
+
propertiesFile := []byte(`kamel.run.envs: VAR2=file`)
viper.SetConfigType("properties")
- readViperConfigFromBytes(t, propertiesFile)
-
- runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+ readViperConfigFromBytes(t, runCmdOptions.Flags, propertiesFile)
_, err := test.ExecuteCommand(rootCmd, "run", "route.java")
if err != nil {
@@ -119,16 +120,16 @@ func TestPrecedenceEnvVarOverFile(t *testing.T) {
}
func TestPrecedenceCommandLineOverEverythingElse(t *testing.T) {
- defer teardown(t)
if err := os.Setenv("KAMEL_RUN_ENVS", "VAR1=envVar"); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
+ runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+ defer teardown(t, runCmdOptions.Flags)
+
propertiesFile := []byte(`kamel.run.envs: VAR2=file`)
viper.SetConfigType("properties")
- readViperConfigFromBytes(t, propertiesFile)
-
- runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+ readViperConfigFromBytes(t, runCmdOptions.Flags, propertiesFile)
_, err := test.ExecuteCommand(rootCmd, "run", "route.java", "--env", "VAR3=commandLine")
if err != nil {
@@ -142,20 +143,20 @@ func TestPrecedenceCommandLineOverEverythingElse(t *testing.T) {
}
}
-func readViperConfigFromBytes(t *testing.T, propertiesFile []byte) {
+func readViperConfigFromBytes(t *testing.T, v *viper.Viper, propertiesFile []byte) {
t.Helper()
- unexpectedErr := viper.ReadConfig(bytes.NewReader(propertiesFile))
+ unexpectedErr := v.ReadConfig(bytes.NewReader(propertiesFile))
if unexpectedErr != nil {
t.Fatalf("Unexpected error: %v", unexpectedErr)
}
}
// We must ALWAYS clean the environment variables and viper library properties to avoid mess up with the rest of the tests.
-func teardown(t *testing.T) {
+func teardown(t *testing.T, v *viper.Viper) {
t.Helper()
if err := os.Setenv("KAMEL_RUN_ENVS", ""); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
- readViperConfigFromBytes(t, make([]byte, 0))
+ readViperConfigFromBytes(t, v, make([]byte, 0))
}
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 4c33c4154..548f642a0 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -188,11 +188,7 @@ func (o *runCmdOptions) decode(cmd *cobra.Command, args []string) error {
// load from kamel.run (1)
pathToRoot := pathToRoot(cmd)
- // Requires synchronization as viper bind flag is not able to handle concurrency
- m.Lock()
- defer m.Unlock()
-
- if err := decodeKey(o, pathToRoot); err != nil {
+ if err := decodeKey(o, pathToRoot, o.Flags.AllSettings()); err != nil {
return err
}
@@ -217,7 +213,7 @@ func (o *runCmdOptions) decode(cmd *cobra.Command, args []string) error {
if name != "" {
// load from kamel.run.integration.$name (2)
pathToRoot += ".integration." + name
- if err := decodeKey(o, pathToRoot); err != nil {
+ if err := decodeKey(o, pathToRoot, o.Flags.AllSettings()); err != nil {
return err
}
diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go
index 03286b10d..625a850d4 100644
--- a/pkg/cmd/run_test.go
+++ b/pkg/cmd/run_test.go
@@ -60,7 +60,7 @@ func initializeRunCmdOptions(t *testing.T) (*runCmdOptions, *cobra.Command, Root
options, rootCmd := kamelTestPreAddCommandInit()
runCmdOptions := addTestRunCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return runCmdOptions, rootCmd, *options
}
@@ -75,7 +75,7 @@ func initializeRunCmdOptionsWithOutput(t *testing.T) (*runCmdOptions, *cobra.Com
options, rootCmd := kamelTestPreAddCommandInitWithClient(fakeClient)
runCmdOptions := addTestRunCmdWithOutput(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return runCmdOptions, rootCmd, *options
}
diff --git a/pkg/cmd/uninstall.go b/pkg/cmd/uninstall.go
index 489da6c1f..b433dcf4c 100644
--- a/pkg/cmd/uninstall.go
+++ b/pkg/cmd/uninstall.go
@@ -24,8 +24,6 @@ import (
"time"
"github.com/spf13/cobra"
- "github.com/spf13/viper"
-
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -108,17 +106,13 @@ var defaultListOptions = metav1.ListOptions{
func (o *uninstallCmdOptions) decode(cmd *cobra.Command, _ []string) error {
path := pathToRoot(cmd)
- // Requires synchronization as viper bind flag is not able to handle concurrency
- m.Lock()
- defer m.Unlock()
-
- if err := decodeKey(o, path); err != nil {
+ if err := decodeKey(o, path, o.Flags.AllSettings()); err != nil {
return err
}
- o.OlmOptions.OperatorName = viper.GetString(path + ".olm-operator-name")
- o.OlmOptions.Package = viper.GetString(path + ".olm-package")
- o.OlmOptions.GlobalNamespace = viper.GetString(path + ".olm-global-namespace")
+ o.OlmOptions.OperatorName = o.Flags.GetString(path + ".olm-operator-name")
+ o.OlmOptions.Package = o.Flags.GetString(path + ".olm-package")
+ o.OlmOptions.GlobalNamespace = o.Flags.GetString(path + ".olm-global-namespace")
return nil
}
diff --git a/pkg/cmd/uninstall_test.go b/pkg/cmd/uninstall_test.go
index 846696022..6c20d90b2 100644
--- a/pkg/cmd/uninstall_test.go
+++ b/pkg/cmd/uninstall_test.go
@@ -43,7 +43,7 @@ func TestUninstallOlmFlags(t *testing.T) {
uninstallCmdOptions := addTestUninstallCmd(options, cmd)
- kamelTestPostAddCommandInit(t, cmd)
+ kamelTestPostAddCommandInit(t, cmd, options)
_, err := test.ExecuteCommand(cmd, "uninstall", "--olm=false", "--olm-operator-name", "my-operator")
require.NoError(t, err)
@@ -56,7 +56,7 @@ func TestUninstallSkipFlags(t *testing.T) {
uninstallCmdOptions := addTestUninstallCmd(options, cmd)
- kamelTestPostAddCommandInit(t, cmd)
+ kamelTestPostAddCommandInit(t, cmd, options)
_, err := test.ExecuteCommand(cmd, "uninstall", "--skip-crd", "--skip-cluster-roles", "--skip-integration-platform", "--skip-integration-profile")
require.NoError(t, err)
@@ -71,7 +71,7 @@ func TestUninstallAllFlag(t *testing.T) {
uninstallCmdOptions := addTestUninstallCmd(options, cmd)
- kamelTestPostAddCommandInit(t, cmd)
+ kamelTestPostAddCommandInit(t, cmd, options)
_, err := test.ExecuteCommand(cmd, "uninstall", "--all")
require.NoError(t, err)
diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
index aec422477..1ecdcf35e 100644
--- a/pkg/cmd/util.go
+++ b/pkg/cmd/util.go
@@ -59,13 +59,13 @@ func DeleteIntegration(ctx context.Context, c client.Client, name string, namesp
return c.Delete(ctx, &integration)
}
-func bindPFlagsHierarchy(cmd *cobra.Command) error {
+func bindPFlagsHierarchy(cmd *cobra.Command, v *viper.Viper) error {
for _, c := range cmd.Commands() {
- if err := bindPFlags(c); err != nil {
+ if err := bindPFlags(c, v); err != nil {
return err
}
- if err := bindPFlagsHierarchy(c); err != nil {
+ if err := bindPFlagsHierarchy(c, v); err != nil {
return err
}
}
@@ -73,7 +73,7 @@ func bindPFlagsHierarchy(cmd *cobra.Command) error {
return nil
}
-func bindPFlags(cmd *cobra.Command) error {
+func bindPFlags(cmd *cobra.Command, v *viper.Viper) error {
prefix := pathToRoot(cmd)
pl := p.NewClient()
@@ -82,7 +82,7 @@ func bindPFlags(cmd *cobra.Command) error {
name = strings.ReplaceAll(name, "_", "-")
name = strings.ReplaceAll(name, ".", "-")
- if err := viper.BindPFlag(prefix+"."+name, flag); err != nil {
+ if err := v.BindPFlag(prefix+"."+name, flag); err != nil {
log.Printf("error binding flag %s with prefix %s to viper: %v", flag.Name, prefix, err)
}
@@ -91,7 +91,7 @@ func bindPFlags(cmd *cobra.Command) error {
// possible to know what is the type of the flag
flagType := strings.ToUpper(flag.Value.Type())
if strings.Contains(flagType, "SLICE") || strings.Contains(flagType, "ARRAY") {
- if err := viper.BindPFlag(prefix+"."+pl.Plural(name), flag); err != nil {
+ if err := v.BindPFlag(prefix+"."+pl.Plural(name), flag); err != nil {
log.Printf("error binding plural flag %s with prefix %s to viper: %v", flag.Name, prefix, err)
}
}
@@ -113,9 +113,8 @@ func pathToRoot(cmd *cobra.Command) string {
return path
}
-func decodeKey(target interface{}, key string) error {
+func decodeKey(target interface{}, key string, settings map[string]any) error {
nodes := strings.Split(key, ".")
- settings := viper.AllSettings()
for _, node := range nodes {
v := settings[node]
@@ -154,14 +153,10 @@ func decodeKey(target interface{}, key string) error {
return nil
}
-func decode(target interface{}) func(*cobra.Command, []string) error {
+func decode(target interface{}, v *viper.Viper) func(*cobra.Command, []string) error {
return func(cmd *cobra.Command, args []string) error {
- // Requires synchronization as viper bind flag is not able to handle concurrency
- m.Lock()
- defer m.Unlock()
-
path := pathToRoot(cmd)
- if err := decodeKey(target, path); err != nil {
+ if err := decodeKey(target, path, v.AllSettings()); err != nil {
return err
}
diff --git a/pkg/cmd/util_config.go b/pkg/cmd/util_config.go
index df7b7dcc8..6212426f3 100644
--- a/pkg/cmd/util_config.go
+++ b/pkg/cmd/util_config.go
@@ -57,7 +57,7 @@ func LoadConfiguration() (*Config, error) {
return loadConfiguration(viper.ConfigFileUsed())
}
-// LoadConfiguration loads a kamel configuration file from a specific location.
+// LoadConfigurationFrom loads a kamel configuration file from a specific location.
func LoadConfigurationFrom(location string) (*Config, error) {
return loadConfiguration(location)
}
diff --git a/pkg/cmd/version.go b/pkg/cmd/version.go
index 1f635209d..e9bc20b90 100644
--- a/pkg/cmd/version.go
+++ b/pkg/cmd/version.go
@@ -50,7 +50,7 @@ func newCmdVersion(rootCmdOptions *RootCmdOptions) (*cobra.Command, *versionCmdO
Use: "version",
Short: "Display client version",
Long: `Display Camel K client version.`,
- PersistentPreRunE: decode(&options),
+ PersistentPreRunE: decode(&options, options.Flags),
PreRunE: options.preRunE,
RunE: options.run,
Annotations: make(map[string]string),
diff --git a/pkg/cmd/version_test.go b/pkg/cmd/version_test.go
index f57987711..dfd33a54b 100644
--- a/pkg/cmd/version_test.go
+++ b/pkg/cmd/version_test.go
@@ -42,7 +42,7 @@ func initializeVersionCmdOptions(t *testing.T, initObjs ...runtime.Object) (*ver
require.NoError(t, err)
options, rootCmd := kamelTestPreAddCommandInitWithClient(fakeClient)
versionCmdOptions := addTestVersionCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return versionCmdOptions, rootCmd, *options
}
diff --git a/script/Makefile b/script/Makefile
index 4dd8283e5..f518b09e4 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -94,7 +94,7 @@ KAMELET_CATALOG_REPO_TAG := v4.0.1
DO_TEST_PREBUILD ?= true
TEST_PREBUILD = build
# Tests may run in parallel to each other. This count sets the amount of tests run in parallel. (default value usually is GOMAXPROCS)
-TEST_COMMON_PARALLEL_COUNT ?= 2
+TEST_COMMON_PARALLEL_COUNT ?= 4
TEST_ADVANCED_PARALLEL_COUNT ?= 4
# OLM (Operator Lifecycle Manager and Operator Hub): uncomment to override operator settings at build time
(camel-k) 07/10: chore(e2e): Use separate operator instances for trait e2e tests
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 92ea86144ab6f6d8024c1116896a4bf1797e285e
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Mar 5 11:44:28 2024 +0100
chore(e2e): Use separate operator instances for trait e2e tests
---
e2e/advanced/synthetic_test.go | 8 +-
e2e/common/cli/bind_test.go | 3 +-
e2e/common/cli/default.go | 4 +-
e2e/common/cli/describe_test.go | 5 +-
e2e/common/{misc => cli}/main_test.go | 7 +-
e2e/common/config/config_reload_test.go | 25 +++
e2e/common/config/config_test.go | 6 +
e2e/common/config/default.go | 29 ---
e2e/common/config/kamelet_config_test.go | 260 ++++++++++++++++-------
e2e/common/config/pipe_config_test.go | 8 +
e2e/common/languages/default.go | 29 ---
e2e/common/languages/groovy_test.go | 14 +-
e2e/common/languages/java_test.go | 14 +-
e2e/common/languages/js_test.go | 14 +-
e2e/common/languages/kotlin_test.go | 14 +-
e2e/common/languages/main_test.go | 62 ------
e2e/common/languages/polyglot_test.go | 14 +-
e2e/common/languages/xml_test.go | 14 +-
e2e/common/languages/yaml_test.go | 14 +-
e2e/common/{config => }/main_test.go | 29 +--
e2e/common/misc/cron_test.go | 6 +
e2e/common/misc/default.go | 29 ---
e2e/common/misc/integration_fail_test.go | 6 +
e2e/common/misc/integration_trait_update_test.go | 6 +
e2e/common/misc/kamelet_test.go | 7 +
e2e/common/misc/kamelet_update_test.go | 6 +
e2e/common/misc/maven_repository_test.go | 7 +
e2e/common/misc/pipe_test.go | 6 +
e2e/common/misc/pipe_with_image_test.go | 7 +
e2e/common/misc/registry_maven_wagon_test.go | 194 +++++++++--------
e2e/common/misc/rest_test.go | 7 +
e2e/common/misc/scale_binding_test.go | 6 +
e2e/common/misc/scale_integration_test.go | 6 +
e2e/common/misc/structured_logs_test.go | 8 +-
e2e/common/runtimes/default.go | 28 ---
e2e/common/runtimes/runtimes_test.go | 7 +
e2e/common/traits/affinity_test.go | 6 +
e2e/common/traits/builder_test.go | 13 +-
e2e/common/traits/camel_test.go | 6 +
e2e/common/traits/container_test.go | 6 +
e2e/common/traits/default.go | 29 ---
e2e/common/traits/deployment_test.go | 13 +-
e2e/common/traits/error_handler_test.go | 6 +
e2e/common/traits/errored_trait_test.go | 6 +
e2e/common/traits/health_test.go | 6 +
e2e/common/traits/istio_test.go | 3 +-
e2e/common/traits/jolokia_test.go | 6 +
e2e/common/traits/jvm_test.go | 6 +
e2e/common/traits/kamelet_test.go | 6 +
e2e/common/traits/main_test.go | 62 ------
e2e/common/traits/master_test.go | 7 +
e2e/common/traits/openapi_test.go | 7 +
e2e/common/traits/pdb_test.go | 6 +
e2e/common/traits/pod_test.go | 6 +
e2e/common/traits/prometheus_test.go | 9 +-
e2e/common/traits/pull_secret_test.go | 6 +
e2e/common/traits/route_test.go | 10 +-
e2e/common/traits/service_binding_test.go | 6 +
e2e/common/traits/service_test.go | 7 +
e2e/common/traits/toleration_test.go | 6 +
script/Makefile | 1 +
61 files changed, 652 insertions(+), 502 deletions(-)
diff --git a/e2e/advanced/synthetic_test.go b/e2e/advanced/synthetic_test.go
index 972036019..5d8382984 100644
--- a/e2e/advanced/synthetic_test.go
+++ b/e2e/advanced/synthetic_test.go
@@ -80,14 +80,14 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
// Label the deployment --> Verify the Integration is created (cannot still monitor)
ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
g.Eventually(IntegrationCondition(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionMonitoringPodsAvailableReason)))
// Label the deployment template --> Verify the Integration is monitored
ExpectExecSucceed(t, g, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
- g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
one := int32(1)
g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
@@ -100,7 +100,7 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
ExpectExecSucceed(t, g, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
- g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
@@ -110,7 +110,7 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
// Add label back to the deployment --> Verify the Integration is created
ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Scale the deployment --> verify replicas are correctly set
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index 40e1afe09..a03c984c6 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -46,8 +46,7 @@ func TestKamelCLIBind(t *testing.T) {
})
t.Run("unsuccessful binding, no property", func(t *testing.T) {
- opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- g.Expect(KamelBindWithID(t, operatorID, ns, opns+"/timer-source", "log:info").Execute()).NotTo(Succeed())
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer-source", "log:info").Execute()).NotTo(Succeed())
})
t.Run("bind uris", func(t *testing.T) {
diff --git a/e2e/common/cli/default.go b/e2e/common/cli/default.go
index 74e73354d..c6174d79c 100644
--- a/e2e/common/cli/default.go
+++ b/e2e/common/cli/default.go
@@ -25,5 +25,5 @@ import (
"github.com/apache/camel-k/v2/pkg/platform"
)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
+var operatorNS = support.TestDefaultNamespace + "-cli"
+var operatorID = platform.DefaultPlatformName + "-cli"
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index 4e175c679..656b14d98 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -71,11 +71,10 @@ func TestKamelCliDescribe(t *testing.T) {
})
t.Run("Test kamel describe integration platform", func(t *testing.T) {
- opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- platform := GetOutputString(Kamel(t, "describe", "platform", operatorID, "-n", opns))
+ platform := GetOutputString(Kamel(t, "describe", "platform", operatorID, "-n", ns))
g.Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
- r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + opns + ".*")
+ r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + ns + ".*")
g.Expect(platform).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
diff --git a/e2e/common/misc/main_test.go b/e2e/common/cli/main_test.go
similarity index 93%
rename from e2e/common/misc/main_test.go
rename to e2e/common/cli/main_test.go
index bf4aea736..fa9e31452 100644
--- a/e2e/common/misc/main_test.go
+++ b/e2e/common/cli/main_test.go
@@ -20,17 +20,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package misc
+package cli
import (
"fmt"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"os"
"testing"
. "github.com/onsi/gomega"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestMain(m *testing.M) {
@@ -47,10 +47,9 @@ func TestMain(m *testing.M) {
g.Expect(TestClient(t)).ShouldNot(BeNil())
- // Install global operator for tests in this package, all tests must use this operatorID so tests can run in parallel and gain execution speed
+ // Install global operator for tests in this package, all tests must use this operatorID
g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
- // Need Kamelet catalog for pipe bind tests
g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/config/config_reload_test.go b/e2e/common/config/config_reload_test.go
index a40361f6d..cf12faa24 100644
--- a/e2e/common/config/config_reload_test.go
+++ b/e2e/common/config/config_reload_test.go
@@ -23,6 +23,7 @@ limitations under the License.
package config
import (
+ "fmt"
"strconv"
"testing"
@@ -38,6 +39,12 @@ func TestConfigmapHotReload(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-hot-reload"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("config-configmap-route")
@@ -68,6 +75,12 @@ func TestConfigmapHotReload(t *testing.T) {
func TestConfigmapHotReloadDefault(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-hot-reload-default"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("config-configmap-route")
@@ -95,6 +108,12 @@ func TestConfigmapHotReloadDefault(t *testing.T) {
func TestSecretHotReload(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-secret-hot-reload"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("config-secret-route")
@@ -132,6 +151,12 @@ func TestConfigmapWithOwnerRefHotReload(t *testing.T) {
func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := fmt.Sprintf("camel-k-config-owner-ref-%s", strconv.FormatBool(hotreload))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("config-configmap-route")
cmName := RandomizedSuffixName("my-hot-cm-")
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index 30fb00f3a..f8978f2bb 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -38,6 +38,12 @@ func TestRunConfigExamples(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Simple property", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
diff --git a/e2e/common/config/default.go b/e2e/common/config/default.go
deleted file mode 100644
index d92514a52..000000000
--- a/e2e/common/config/default.go
+++ /dev/null
@@ -1,29 +0,0 @@
-//go:build integration
-// +build integration
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package config
-
-import (
- "github.com/apache/camel-k/v2/e2e/support"
- "github.com/apache/camel-k/v2/pkg/platform"
-)
-
-var operatorNS = support.TestDefaultNamespace + "-config"
-var operatorID = platform.DefaultPlatformName + "-config"
diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go
index 8cc946cb9..e40d0f4c4 100644
--- a/e2e/common/config/kamelet_config_test.go
+++ b/e2e/common/config/kamelet_config_test.go
@@ -29,15 +29,23 @@ import (
corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// Tests on integrations with kamelets containing configuration from properties and secrets
//
// without having to change the integration code.
-func TestKameletImplicitConfigDefaultUserPropery(t *testing.T) {
+func TestKameletImplicitConfigDefaultUserProperty(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-user-property"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
t.Run("run test default config using properties", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig01-timer-source")()).To(Succeed())
@@ -59,10 +67,17 @@ func TestKameletImplicitConfigDefaultUserPropery(t *testing.T) {
}
func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-secret-mount"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- t.Run("run test default config using mounted secret", func(t *testing.T) {
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ t.Run("run test default config using mounted secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig03-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int3")
@@ -91,10 +106,17 @@ func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
}
func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-configmap-mount"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- t.Run("run test default config using mounted configmap", func(t *testing.T) {
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ t.Run("run test default config using mounted configmap", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig04-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int4")
@@ -120,8 +142,17 @@ func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
})
}
-func TestKameletImplicitConfigNamedUserPropery(t *testing.T) {
+func TestKameletImplicitConfigNamedUserProperty(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-named-property"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
t.Run("run test named config using properties", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig05-timer-source")()).To(Succeed())
@@ -143,7 +174,16 @@ func TestKameletImplicitConfigNamedUserPropery(t *testing.T) {
}
func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-secret-labeled-named"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
t.Run("run test named config using labeled secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig06-timer-source")()).To(Succeed())
@@ -176,7 +216,16 @@ func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
}
func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-secret-mount-named"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
t.Run("run test named config using mounted secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig07-timer-source")()).To(Succeed())
@@ -207,7 +256,16 @@ func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
}
func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-configmap-mount-named"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
t.Run("run test named config using mounted configmap", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig08-timer-source")()).To(Succeed())
@@ -236,7 +294,16 @@ func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
}
func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-secret-labeled"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
t.Run("run test default config using labeled secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig09-timer-source")()).To(Succeed())
@@ -268,8 +335,17 @@ func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
// Tests on integration with kamelets containing configuration from properties and secrets with parameters inside the integration.
-func TestKameletConfigInlinedUserPropery(t *testing.T) {
+func TestKameletConfigInlinedUserProperty(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-user-property-inlined"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
t.Run("run test default config inlined properties", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "config01-timer-source")()).To(Succeed())
g.Expect(CreateLogKamelet(t, operatorID, ns, "config01-log-sink")()).To(Succeed())
@@ -292,86 +368,122 @@ func TestKameletConfigInlinedUserPropery(t *testing.T) {
})
}
-func TestKameletConfigDefaultParamUserPropery(t *testing.T) {
- g := NewWithT(t)
- t.Run("run test default config parameters properties", func(t *testing.T) {
+func TestKameletConfigDefaultParamUserProperty(t *testing.T) {
+ t.Parallel()
+
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-user-property-param"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ t.Run("run test default config parameters properties", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, operatorID, operatorNS, "config02-timer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, operatorID, operatorNS, "config02-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "config02-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, ns, "config02-log-sink")()).To(Succeed())
- name := RandomizedSuffixName("config-test-timer-source-int2")
+ name := RandomizedSuffixName("config-test-timer-source-int2")
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
- "-p", "my-message='My parameter message 02'",
- "-p", "my-logger='myIntegrationLogger02'",
- "--name", name).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("My parameter message 02"))
- g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("myIntegrationLogger02"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
+ "-p", "my-message='My parameter message 02'",
+ "-p", "my-logger='myIntegrationLogger02'",
+ "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My parameter message 02"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myIntegrationLogger02"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
+ })
- g.Expect(Kamel(t, "delete", name, "-n", operatorNS).Execute()).To(Succeed())
- g.Eventually(Integration(t, operatorNS, name), TestTimeoutLong).Should(BeNil())
- g.Expect(DeleteKamelet(t, operatorNS, "config02-timer-source")).To(Succeed())
- g.Expect(DeleteKamelet(t, operatorNS, "config02-log-sink")).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
- g := NewWithT(t)
- t.Run("run test default config secret properties", func(t *testing.T) {
-
- g.Expect(CreateTimerKamelet(t, operatorID, operatorNS, "config03-timer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, operatorID, operatorNS, "config03-log-sink")()).To(Succeed())
-
- name := RandomizedSuffixName("config-test-timer-source-int3")
- secretName := "my-config-int3-secret"
-
- var secData = make(map[string]string)
- secData["my-message"] = "My secret message 03"
- secData["my-logger"] = "mySecretIntegrationLogger03"
- g.Expect(CreatePlainTextSecret(t, operatorNS, secretName, secData)).To(Succeed())
-
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
- "-t", "mount.configs=secret:"+secretName,
- "--name", name).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("My secret message 03"))
- g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
-
- g.Expect(Kamel(t, "delete", name, "-n", operatorNS).Execute()).To(Succeed())
- g.Eventually(Integration(t, operatorNS, name), TestTimeoutLong).Should(BeNil())
- g.Expect(DeleteSecret(t, operatorNS, secretName)).To(Succeed())
- g.Expect(DeleteKamelet(t, operatorNS, "config03-timer-source")).To(Succeed())
- g.Expect(DeleteKamelet(t, operatorNS, "config03-log-sink")).To(Succeed())
+ t.Parallel()
+
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-secret-mount-param"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ t.Run("run test default config secret properties", func(t *testing.T) {
+
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "config03-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, ns, "config03-log-sink")()).To(Succeed())
+
+ name := RandomizedSuffixName("config-test-timer-source-int3")
+ secretName := "my-config-int3-secret"
+
+ var secData = make(map[string]string)
+ secData["my-message"] = "My secret message 03"
+ secData["my-logger"] = "mySecretIntegrationLogger03"
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
+ "-t", "mount.configs=secret:"+secretName,
+ "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My secret message 03"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
+ })
+
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
- g := NewWithT(t)
- t.Run("run test default config configmap properties", func(t *testing.T) {
-
- g.Expect(CreateTimerKamelet(t, operatorID, operatorNS, "config04-timer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, operatorID, operatorNS, "config04-log-sink")()).To(Succeed())
-
- name := RandomizedSuffixName("config-test-timer-source-int4")
- cmName := "my-config-int4-configmap"
-
- var cmData = make(map[string]string)
- cmData["my-message"] = "My configmap message 04"
- cmData["my-logger"] = "myConfigmapIntegrationLogger04"
- g.Expect(CreatePlainTextConfigmap(t, operatorNS, cmName, cmData)).To(Succeed())
-
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
- "-t", "mount.configs=configmap:"+cmName,
- "--name", name).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("My configmap message 04"))
- g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
-
- g.Expect(Kamel(t, "delete", name, "-n", operatorNS).Execute()).To(Succeed())
- g.Eventually(Integration(t, operatorNS, name), TestTimeoutLong).Should(BeNil())
- g.Expect(DeleteConfigmap(t, operatorNS, cmName)).To(Succeed())
- g.Expect(DeleteKamelet(t, operatorNS, "config04-timer-source")).To(Succeed())
- g.Expect(DeleteKamelet(t, operatorNS, "config04-log-sink")).To(Succeed())
+ t.Parallel()
+
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config-kamelet-configmap-mount-param"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ t.Run("run test default config configmap properties", func(t *testing.T) {
+
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "config04-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, ns, "config04-log-sink")()).To(Succeed())
+
+ name := RandomizedSuffixName("config-test-timer-source-int4")
+ cmName := "my-config-int4-configmap"
+
+ var cmData = make(map[string]string)
+ cmData["my-message"] = "My configmap message 04"
+ cmData["my-logger"] = "myConfigmapIntegrationLogger04"
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
+ "-t", "mount.configs=configmap:"+cmName,
+ "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My configmap message 04"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
+ })
+
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index 272ed84de..220b7cf53 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -29,6 +29,7 @@ import (
corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// Tests on pipe with kamelets containing configuration from properties and secrets.
@@ -36,6 +37,13 @@ func TestPipeConfig(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-config"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
t.Run("test custom source/sink pipe", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "my-pipe-timer-source")()).To(Succeed())
g.Expect(CreateLogKamelet(t, operatorID, ns, "my-pipe-log-sink")()).To(Succeed())
diff --git a/e2e/common/languages/default.go b/e2e/common/languages/default.go
deleted file mode 100644
index 2a7e2e176..000000000
--- a/e2e/common/languages/default.go
+++ /dev/null
@@ -1,29 +0,0 @@
-//go:build integration
-// +build integration
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package languages
-
-import (
- "github.com/apache/camel-k/v2/e2e/support"
- "github.com/apache/camel-k/v2/pkg/platform"
-)
-
-var operatorNS = support.TestDefaultNamespace + "-languages"
-var operatorID = platform.DefaultPlatformName + "-languages"
diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go
index 896a1c563..02bcf7253 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -27,21 +27,27 @@ import (
. "github.com/onsi/gomega"
- v1 "k8s.io/api/core/v1"
+ corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
- camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleGroovyExamples(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-runtimes-groovy"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run groovy", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "groovy", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go
index f631b985c..9e2ee0e4d 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -27,21 +27,27 @@ import (
. "github.com/onsi/gomega"
- v1 "k8s.io/api/core/v1"
+ corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
- camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleJavaExamples(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-runtimes-java"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run java", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index ccdcbc465..4a0218156 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -27,21 +27,27 @@ import (
. "github.com/onsi/gomega"
- v1 "k8s.io/api/core/v1"
+ corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
- camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleJavaScriptExamples(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-runtimes-js"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run js", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/js.js").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, "js"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "js", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index 5999058d6..190d76cde 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -27,21 +27,27 @@ import (
. "github.com/onsi/gomega"
- v1 "k8s.io/api/core/v1"
+ corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
- camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleKotlinExamples(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-runtimes-kotlin"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run kotlin", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, "kotlin"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "kotlin", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
diff --git a/e2e/common/languages/main_test.go b/e2e/common/languages/main_test.go
deleted file mode 100644
index 10800b385..000000000
--- a/e2e/common/languages/main_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-//go:build integration
-// +build integration
-
-// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package languages
-
-import (
- "fmt"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "os"
- "testing"
-
- . "github.com/onsi/gomega"
-
- . "github.com/apache/camel-k/v2/e2e/support"
-)
-
-func TestMain(m *testing.M) {
- justCompile := GetEnvOrDefault("CAMEL_K_E2E_JUST_COMPILE", "false")
- if justCompile == "true" {
- os.Exit(m.Run())
- }
-
- g := NewGomega(func(message string, callerSkip ...int) {
- fmt.Printf("Test setup failed! - %s\n", message)
- })
-
- var t *testing.T
-
- g.Expect(TestClient(t)).ShouldNot(BeNil())
-
- // Install global operator for tests in this package, all tests must use this operatorID so tests can run in parallel and gain execution speed
- g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
- g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
-
- exitCode := m.Run()
-
- g.Expect(UninstallFromNamespace(t, operatorNS))
- g.Expect(DeleteNamespace(t, operatorNS)).To(Succeed())
-
- os.Exit(exitCode)
-}
diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go
index 0b4c52084..d52f79c4c 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -27,21 +27,27 @@ import (
. "github.com/onsi/gomega"
- v1 "k8s.io/api/core/v1"
+ corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
- camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunPolyglotExamples(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-runtimes-polyglot"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run polyglot", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, "polyglot"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "polyglot", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
g.Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
})
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index a4f9accd4..53ee19bbe 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -27,21 +27,27 @@ import (
. "github.com/onsi/gomega"
- v1 "k8s.io/api/core/v1"
+ corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
- camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleXmlExamples(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-runtimes-xml"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run xml", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, "xml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "xml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go
index 107e32209..a78465c6e 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -27,21 +27,27 @@ import (
. "github.com/onsi/gomega"
- v1 "k8s.io/api/core/v1"
+ corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
- camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleYamlExamples(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-runtimes-yaml"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run yaml", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
diff --git a/e2e/common/config/main_test.go b/e2e/common/main_test.go
similarity index 56%
rename from e2e/common/config/main_test.go
rename to e2e/common/main_test.go
index 1f977eab9..ff84d996c 100644
--- a/e2e/common/config/main_test.go
+++ b/e2e/common/main_test.go
@@ -20,17 +20,19 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package config
+package common
import (
"fmt"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"os"
"testing"
. "github.com/onsi/gomega"
+ corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
)
func TestMain(m *testing.M) {
@@ -39,6 +41,9 @@ func TestMain(m *testing.M) {
os.Exit(m.Run())
}
+ operatorID := platform.DefaultPlatformName
+ ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
+
g := NewGomega(func(message string, callerSkip ...int) {
fmt.Printf("Test setup failed! - %s\n", message)
})
@@ -46,17 +51,15 @@ func TestMain(m *testing.M) {
var t *testing.T
g.Expect(TestClient(t)).ShouldNot(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "languages/files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- // Install global operator for tests in this package, all tests must use this operatorID so tests can run in parallel and gain execution speed
- g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
- g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
-
- exitCode := m.Run()
-
- g.Expect(UninstallFromNamespace(t, operatorNS))
- g.Expect(DeleteNamespace(t, operatorNS)).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "languages/files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- os.Exit(exitCode)
+ os.Exit(m.Run())
}
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index fea57d999..de2abf7ef 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -37,6 +37,12 @@ func TestRunCronExample(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-cron"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("cron", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
diff --git a/e2e/common/misc/default.go b/e2e/common/misc/default.go
deleted file mode 100644
index 9e677ac69..000000000
--- a/e2e/common/misc/default.go
+++ /dev/null
@@ -1,29 +0,0 @@
-//go:build integration
-// +build integration
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package misc
-
-import (
- "github.com/apache/camel-k/v2/e2e/support"
- "github.com/apache/camel-k/v2/pkg/platform"
-)
-
-var operatorNS = support.TestDefaultNamespace + "-misc"
-var operatorID = platform.DefaultPlatformName + "-misc"
diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go
index 8b8b03df2..73f2223d1 100644
--- a/e2e/common/misc/integration_fail_test.go
+++ b/e2e/common/misc/integration_fail_test.go
@@ -38,6 +38,12 @@ func TestBadRouteIntegration(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-bad-route"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run bad java route", func(t *testing.T) {
name := RandomizedSuffixName("bad-route")
diff --git a/e2e/common/misc/integration_trait_update_test.go b/e2e/common/misc/integration_trait_update_test.go
index 4a8b7a374..5a4be2dfe 100644
--- a/e2e/common/misc/integration_trait_update_test.go
+++ b/e2e/common/misc/integration_trait_update_test.go
@@ -37,6 +37,12 @@ func TestTraitUpdates(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-trait-update"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("run and update trait", func(t *testing.T) {
name := RandomizedSuffixName("yaml-route")
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index dcad2be56..a71b60a10 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -30,12 +30,19 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestKameletClasspathLoading(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-kamelet-loading"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Store a configmap on the cluster
var cmData = make(map[string]string)
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index faf251b42..10d9ec9f7 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -38,6 +38,12 @@ func TestBundleKameletUpdate(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-kamelet-bundle"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(createBundleKamelet(t, operatorID, ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
g.Expect(createUserKamelet(t, operatorID, ns, "user-sink")()).To(Succeed()) // Left intact by the operator
diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go
index c51e629bb..9f57b9efb 100644
--- a/e2e/common/misc/maven_repository_test.go
+++ b/e2e/common/misc/maven_repository_test.go
@@ -37,6 +37,13 @@ func TestRunExtraRepository(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-extra-repository"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
name := RandomizedSuffixName("java")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--maven-repository", "https://maven.repository.redhat.com/ga@id=redhat",
diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go
index ab143b47f..5d97ed3a3 100644
--- a/e2e/common/misc/pipe_test.go
+++ b/e2e/common/misc/pipe_test.go
@@ -38,6 +38,12 @@ func TestPipe(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-pipe"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Error Handler testing
t.Run("test error handler", func(t *testing.T) {
diff --git a/e2e/common/misc/pipe_with_image_test.go b/e2e/common/misc/pipe_with_image_test.go
index aaf58b571..59bbe2277 100644
--- a/e2e/common/misc/pipe_with_image_test.go
+++ b/e2e/common/misc/pipe_with_image_test.go
@@ -31,12 +31,19 @@ import (
corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestPipeWithImage(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-pipe-image"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
bindingID := "with-image-binding"
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index 6a13787c3..2d93ce51e 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -39,7 +39,6 @@ import (
func TestImageRegistryIsAMavenRepository(t *testing.T) {
t.Parallel()
- g := NewWithT(t)
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
@@ -48,97 +47,106 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
return
}
- t.Run("image registry is a maven repository", func(t *testing.T) {
- // Create integration that should decrypt an encrypted message to "foobar" and log it
- name := RandomizedSuffixName("foobar-decryption")
- jar, err := filepath.Abs("files/registry/sample-decryption-1.0.jar?skipPOM=true")
- require.NoError(t, err)
- pom, err := filepath.Abs("files/registry/sample-decryption-1.0.pom")
- require.NoError(t, err)
-
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/FoobarDecryption.java",
- "--name", name,
- "-d", fmt.Sprintf("file://%s", jar),
- "-d", fmt.Sprintf("file://%s", pom),
- ).Execute()).To(Succeed())
-
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-rest"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ t.Run("image registry is a maven repository", func(t *testing.T) {
+ // Create integration that should decrypt an encrypted message to "foobar" and log it
+ name := RandomizedSuffixName("foobar-decryption")
+ jar, err := filepath.Abs("files/registry/sample-decryption-1.0.jar?skipPOM=true")
+ require.NoError(t, err)
+ pom, err := filepath.Abs("files/registry/sample-decryption-1.0.pom")
+ require.NoError(t, err)
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
+ "--name", name,
+ "-d", fmt.Sprintf("file://%s", jar),
+ "-d", fmt.Sprintf("file://%s", pom),
+ ).Execute()).To(Succeed())
+
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ })
+
+ t.Run("local files are mounted in the integration container at the default path", func(t *testing.T) {
+ name := RandomizedSuffixName("laughing-route-default-path")
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ "--name", name,
+ "-p", "location=/deployments/?filename=laugh.txt",
+ "-d", "file://files/registry/laugh.txt",
+ ).Execute()).To(Succeed())
+
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ })
+
+ t.Run("local files are mounted in the integration container at a custom path", func(t *testing.T) {
+ name := RandomizedSuffixName("laughing-route-custom-path")
+ customPath := "this/is/a/custom/path/"
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ "--name", name,
+ "-p", fmt.Sprintf("location=%s", customPath),
+ "-d", fmt.Sprintf("file://files/registry/laugh.txt?targetPath=%slaugh.txt", customPath),
+ ).Execute()).To(Succeed())
+
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ })
+
+ t.Run("local directory is mounted in the integration container", func(t *testing.T) {
+ name := RandomizedSuffixName("laughing-route-directory")
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ "--name", name,
+ "-p", "location=files/registry/",
+ "-d", fmt.Sprintf("file://files/registry/laughs/?targetPath=files/registry/"),
+ ).Execute()).To(Succeed())
+
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
+ })
+
+ t.Run("pom file is extracted from JAR", func(t *testing.T) {
+ // Create integration that should decrypt foobar and log it
+ name := RandomizedSuffixName("foobar-decryption-pom-extraction")
+ jar, err := filepath.Abs("files/registry/sample-decryption-1.0.jar")
+ require.NoError(t, err)
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
+ "--name", name,
+ "-d", fmt.Sprintf("file://%s", jar),
+ ).Execute()).To(Succeed())
+
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ })
+
+ t.Run("dependency can be used at build time", func(t *testing.T) {
+ // Create integration that should run a Xslt transformation whose template needs to be present at build time
+ name := RandomizedSuffixName("xslt")
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/classpath/Xslt.java", "--name", name,
+ "-d", "file://files/registry/classpath/cheese.xsl?targetPath=xslt/cheese.xsl&classpath=true",
+ ).Execute()).To(Succeed())
+
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
+ })
+
+ // Clean up
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
-
- t.Run("local files are mounted in the integration container at the default path", func(t *testing.T) {
- name := RandomizedSuffixName("laughing-route-default-path")
-
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/LaughingRoute.java",
- "--name", name,
- "-p", "location=/deployments/?filename=laugh.txt",
- "-d", "file://files/registry/laugh.txt",
- ).Execute()).To(Succeed())
-
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("haha"))
- })
-
- t.Run("local files are mounted in the integration container at a custom path", func(t *testing.T) {
- name := RandomizedSuffixName("laughing-route-custom-path")
- customPath := "this/is/a/custom/path/"
-
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/LaughingRoute.java",
- "--name", name,
- "-p", fmt.Sprintf("location=%s", customPath),
- "-d", fmt.Sprintf("file://files/registry/laugh.txt?targetPath=%slaugh.txt", customPath),
- ).Execute()).To(Succeed())
-
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("haha"))
- })
-
- t.Run("local directory is mounted in the integration container", func(t *testing.T) {
- name := RandomizedSuffixName("laughing-route-directory")
-
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/LaughingRoute.java",
- "--name", name,
- "-p", "location=files/registry/",
- "-d", fmt.Sprintf("file://files/registry/laughs/?targetPath=files/registry/"),
- ).Execute()).To(Succeed())
-
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("haha"))
- g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
- })
-
- t.Run("pom file is extracted from JAR", func(t *testing.T) {
- // Create integration that should decrypt foobar and log it
- name := RandomizedSuffixName("foobar-decryption-pom-extraction")
- jar, err := filepath.Abs("files/registry/sample-decryption-1.0.jar")
- require.NoError(t, err)
-
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/FoobarDecryption.java",
- "--name", name,
- "-d", fmt.Sprintf("file://%s", jar),
- ).Execute()).To(Succeed())
-
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
- })
-
- t.Run("dependency can be used at build time", func(t *testing.T) {
- // Create integration that should run an Xslt transformation whose template needs to be present at build time
- name := RandomizedSuffixName("xslt")
- g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/classpath/Xslt.java", "--name", name,
- "-d", "file://files/registry/classpath/cheese.xsl?targetPath=xslt/cheese.xsl&classpath=true",
- ).Execute()).To(Succeed())
-
- g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
- })
-
- // Clean up
- g.Expect(Kamel(t, "delete", "--all", "-n", operatorNS).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go
index 9a89ab154..1a4f30492 100644
--- a/e2e/common/misc/rest_test.go
+++ b/e2e/common/misc/rest_test.go
@@ -34,6 +34,7 @@ import (
corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/openshift"
)
@@ -41,6 +42,12 @@ func TestRunRest(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-rest"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index 141839953..f9dae8451 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -43,6 +43,12 @@ func TestPipeScale(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-pipe-scale"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go
index 3ba99050b..bad583991 100644
--- a/e2e/common/misc/scale_integration_test.go
+++ b/e2e/common/misc/scale_integration_test.go
@@ -42,6 +42,12 @@ func TestIntegrationScale(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-integration-scale"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index 9bb03c8c3..5214aaeb9 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -38,6 +38,12 @@ func TestStructuredLogs(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-structured-logs"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
@@ -46,7 +52,7 @@ func TestStructuredLogs(t *testing.T) {
g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- pod := OperatorPod(t, operatorNS)()
+ pod := OperatorPod(t, ns)()
g.Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
diff --git a/e2e/common/runtimes/default.go b/e2e/common/runtimes/default.go
deleted file mode 100644
index 7191aee4f..000000000
--- a/e2e/common/runtimes/default.go
+++ /dev/null
@@ -1,28 +0,0 @@
-//go:build integration
-// +build integration
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package runtimes
-
-import (
- "github.com/apache/camel-k/v2/e2e/support"
- "github.com/apache/camel-k/v2/pkg/platform"
-)
-
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go
index af9b9bd22..81ed54642 100644
--- a/e2e/common/runtimes/runtimes_test.go
+++ b/e2e/common/runtimes/runtimes_test.go
@@ -37,6 +37,13 @@ func TestSourceLessIntegrations(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-runtimes"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
var cmData = make(map[string]string)
cmData["my-file.txt"] = "Hello World!"
CreatePlainTextConfigmap(t, ns, "my-cm-sourceless", cmData)
diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go
index c61cf6cb3..73a75b94d 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -40,6 +40,12 @@ func TestAffinityTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-affinity"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
var hostname string
if node, err := selectSchedulableNode(t); err == nil {
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index e9be79107..6f8d8f860 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -37,8 +37,15 @@ import (
)
func TestBuilderTrait(t *testing.T) {
- // Test not able to run in parallel because of maven profile tests
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-builder"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run build strategy routine", func(t *testing.T) {
name := RandomizedSuffixName("java")
@@ -237,9 +244,9 @@ func TestBuilderTrait(t *testing.T) {
t.Run("Run maven profile", func(t *testing.T) {
name := RandomizedSuffixName("java-maven-profile")
- mavenProfile1Cm := newMavenProfileConfigMap(operatorNS, "maven-profile-owasp", "owasp-profile")
+ mavenProfile1Cm := newMavenProfileConfigMap(ns, "maven-profile-owasp", "owasp-profile")
g.Expect(TestClient(t).Create(TestContext, mavenProfile1Cm)).To(Succeed())
- mavenProfile2Cm := newMavenProfileConfigMap(operatorNS, "maven-profile-dependency", "dependency-profile")
+ mavenProfile2Cm := newMavenProfileConfigMap(ns, "maven-profile-dependency", "dependency-profile")
g.Expect(TestClient(t).Create(TestContext, mavenProfile2Cm)).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go
index eecb232bc..f9f6b4ab3 100644
--- a/e2e/common/traits/camel_test.go
+++ b/e2e/common/traits/camel_test.go
@@ -37,6 +37,12 @@ func TestCamelTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-camel"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("properties changes should not rebuild", func(t *testing.T) {
diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go
index 3669b90b1..a5fd859d3 100644
--- a/e2e/common/traits/container_test.go
+++ b/e2e/common/traits/container_test.go
@@ -38,6 +38,12 @@ func TestContainerTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-container"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Container image pull policy and resources configuration", func(t *testing.T) {
name := RandomizedSuffixName("java1")
diff --git a/e2e/common/traits/default.go b/e2e/common/traits/default.go
deleted file mode 100644
index 4721ebd36..000000000
--- a/e2e/common/traits/default.go
+++ /dev/null
@@ -1,29 +0,0 @@
-//go:build integration
-// +build integration
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package traits
-
-import (
- "github.com/apache/camel-k/v2/e2e/support"
- "github.com/apache/camel-k/v2/pkg/platform"
-)
-
-var operatorNS = support.TestDefaultNamespace + "-traits"
-var operatorID = platform.DefaultPlatformName + "-traits"
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index 1ed16e07b..67fcf4bd5 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -41,6 +41,12 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-deployment"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run with Recreate Deployment Strategy", func(t *testing.T) {
name := RandomizedSuffixName("java")
@@ -72,7 +78,6 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
g.Expect(deploymentTrait).ToNot(BeNil())
g.Expect(len(deploymentTrait)).To(Equal(1))
g.Expect(deploymentTrait["strategy"]).To(Equal(string(appsv1.RecreateDeploymentStrategyType)))
-
})
g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
@@ -83,6 +88,12 @@ func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-deployment-rolling"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run with RollingUpdate Deployment Strategy", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go
index 59d3bf530..73a102375 100644
--- a/e2e/common/traits/error_handler_test.go
+++ b/e2e/common/traits/error_handler_test.go
@@ -37,6 +37,12 @@ func TestErrorHandlerTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-errorhandler"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run errored integration with error handler", func(t *testing.T) {
name := RandomizedSuffixName("error-handler")
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 4f127df88..6b807221d 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -37,6 +37,12 @@ func TestErroredTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-error"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Integration trait should fail", func(t *testing.T) {
name := RandomizedSuffixName("it-errored")
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 87bca537f..13914cc6e 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -46,6 +46,12 @@ func TestHealthTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-health"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Readiness condition with stopped route scaled", func(t *testing.T) {
name := RandomizedSuffixName("java")
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index 95c3323c8..0fd149802 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -23,7 +23,6 @@ limitations under the License.
package traits
import (
- "fmt"
"testing"
. "github.com/onsi/gomega"
@@ -39,7 +38,7 @@ func TestIstioTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := fmt.Sprintf("camel-k-%s", ns)
+ operatorID := "camel-k-traits-istio"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go
index 97dd558a7..419b9f880 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -39,6 +39,12 @@ func TestJolokiaTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-jolokia"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run Java with Jolokia", func(t *testing.T) {
name := RandomizedSuffixName("java")
diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go
index 87fc90cdd..5f220a587 100644
--- a/e2e/common/traits/jvm_test.go
+++ b/e2e/common/traits/jvm_test.go
@@ -40,6 +40,12 @@ func TestJVMTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-jvm"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Store a configmap holding a jar
var cmData = make(map[string][]byte)
diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go
index b79870091..2d2516f2d 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -37,6 +37,12 @@ func TestKameletTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-kamelet"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("discover kamelet capabilities", func(t *testing.T) {
template := map[string]interface{}{
diff --git a/e2e/common/traits/main_test.go b/e2e/common/traits/main_test.go
deleted file mode 100644
index f7f835f6a..000000000
--- a/e2e/common/traits/main_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-//go:build integration
-// +build integration
-
-// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
-
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package traits
-
-import (
- "fmt"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "os"
- "testing"
-
- . "github.com/onsi/gomega"
-
- . "github.com/apache/camel-k/v2/e2e/support"
-)
-
-func TestMain(m *testing.M) {
- justCompile := GetEnvOrDefault("CAMEL_K_E2E_JUST_COMPILE", "false")
- if justCompile == "true" {
- os.Exit(m.Run())
- }
-
- g := NewGomega(func(message string, callerSkip ...int) {
- fmt.Printf("Test setup failed! - %s\n", message)
- })
-
- var t *testing.T
-
- g.Expect(TestClient(t)).ShouldNot(BeNil())
-
- // Install global operator for tests in this package, all tests must use this operatorID so tests can run in parallel and gain execution speed
- g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
- g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
-
- exitCode := m.Run()
-
- g.Expect(UninstallFromNamespace(t, operatorNS))
- g.Expect(DeleteNamespace(t, operatorNS)).To(Succeed())
-
- os.Exit(exitCode)
-}
diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go
index ce52fb46c..65713e2bd 100644
--- a/e2e/common/traits/master_test.go
+++ b/e2e/common/traits/master_test.go
@@ -32,12 +32,19 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestMasterTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-master"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("master works", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java").Execute()).To(Succeed())
diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go
index afd60051a..2ac84e4d2 100644
--- a/e2e/common/traits/openapi_test.go
+++ b/e2e/common/traits/openapi_test.go
@@ -32,12 +32,19 @@ import (
corev1 "k8s.io/api/core/v1"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestOpenAPI(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-openapi"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
openapiContent, err := ioutil.ReadFile("./files/openapi/petstore-api.yaml")
require.NoError(t, err)
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index a3cb8e803..b6b355121 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -46,6 +46,12 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-pdb"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go
index 66360f55f..28b05cae8 100644
--- a/e2e/common/traits/pod_test.go
+++ b/e2e/common/traits/pod_test.go
@@ -37,6 +37,12 @@ func TestPodTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-pod"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
tc := []struct {
name string
diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go
index b2ad103f5..6d11d9df2 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -44,8 +44,15 @@ import (
)
func TestPrometheusTrait(t *testing.T) {
- // test not able to run in parallel
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-prometheus"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go
index d8ec4fb20..1267e9fa6 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -39,6 +39,12 @@ func TestPullSecretTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-pull-secret"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
ocp, err := openshift.IsOpenShift(TestClient(t))
g.Expect(err).To(BeNil())
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index 52807a0b8..b8b031c4b 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -43,6 +43,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/openshift"
)
@@ -74,6 +75,12 @@ func TestRunRoutes(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-route"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
ocp, err := openshift.IsOpenShift(TestClient(t))
if !ocp {
@@ -82,9 +89,6 @@ func TestRunRoutes(t *testing.T) {
}
require.NoError(t, err)
- operatorID := "camel-k-trait-route"
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
-
// create a test secret of type tls with certificates
// this secret is used to setupt the route TLS object across diferent tests
secret, err := createSecret(t, ns)
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index a6b66ef87..6f07f0f12 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -39,6 +39,12 @@ func TestServiceBindingTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-service-binding"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Integration Service Binding", func(t *testing.T) {
// Create our mock service config
diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go
index 02f486610..def097354 100644
--- a/e2e/common/traits/service_test.go
+++ b/e2e/common/traits/service_test.go
@@ -31,12 +31,19 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
. "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestServiceTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-service"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("NodePort service", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go
index 2bd3050a8..64491bdb1 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -39,6 +39,12 @@ func TestTolerationTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-traits-toleration"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run Java with node toleration operation exists", func(t *testing.T) {
name := RandomizedSuffixName("java1")
diff --git a/script/Makefile b/script/Makefile
index 79f5beccc..f518b09e4 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -258,6 +258,7 @@ test-common: do-build
#
test-smoke: do-build
FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \
+ go test -timeout 30m -v ./e2e/common/main_test.go -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v ./e2e/common/languages -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v \
./e2e/common/misc/default.go \
(camel-k) 03/10: chore(e2e): Use fresh Gomega instance for each test
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c398356108e62b4f54bead98965b4f070c0b9230
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Fri Mar 1 22:51:46 2024 +0100
chore(e2e): Use fresh Gomega instance for each test
- Recommended use of Gomega NewWithT() instead of RegisterTestingT() to get a fresh instance for each test
- Avoids concurrency errors when running tests in parallel
---
e2e/advanced/build_order_strategy_test.go | 158 ++++++------
e2e/advanced/builder_test.go | 38 +--
e2e/advanced/catalog_builder_test.go | 84 +++----
e2e/advanced/debug_test.go | 50 ++--
e2e/advanced/deployment_test.go | 22 +-
e2e/advanced/dump_test.go | 28 +--
e2e/advanced/environment_test.go | 54 ++--
e2e/advanced/incremental_build_test.go | 180 +++++++-------
e2e/advanced/integration_profile_test.go | 108 ++++----
e2e/advanced/kamelet_repo_test.go | 22 +-
e2e/advanced/local_platform_test.go | 54 ++--
e2e/advanced/maven_http_proxy_test.go | 58 ++---
e2e/advanced/operator_id_filtering_test.go | 98 ++++----
e2e/advanced/operator_metrics_test.go | 142 +++++------
e2e/advanced/platform_traits_test.go | 30 +--
e2e/advanced/promote_test.go | 124 ++++-----
e2e/advanced/reset_test.go | 60 ++---
e2e/advanced/synthetic_test.go | 87 +++----
e2e/advanced/tekton_test.go | 14 +-
e2e/builder/build_test.go | 128 +++++-----
e2e/builder/registry_test.go | 28 +--
e2e/common/cli/bind_test.go | 28 +--
e2e/common/cli/config_test.go | 18 +-
e2e/common/cli/delete_test.go | 60 ++---
e2e/common/cli/describe_test.go | 32 +--
e2e/common/cli/dev_mode_test.go | 33 ++-
e2e/common/cli/duplicate_parameters_test.go | 8 +-
e2e/common/cli/get_test.go | 34 +--
e2e/common/cli/help_test.go | 22 +-
e2e/common/cli/log_test.go | 16 +-
e2e/common/cli/offline_commands_test.go | 17 +-
e2e/common/cli/run_test.go | 152 ++++++------
e2e/common/cli/version_test.go | 4 +-
e2e/common/config/config_reload_test.go | 58 ++---
e2e/common/config/config_test.go | 242 +++++++++---------
e2e/common/config/kamelet_config_test.go | 304 +++++++++++------------
e2e/common/config/pipe_config_test.go | 116 ++++-----
e2e/common/languages/groovy_test.go | 12 +-
e2e/common/languages/java_test.go | 12 +-
e2e/common/languages/js_test.go | 12 +-
e2e/common/languages/kotlin_test.go | 12 +-
e2e/common/languages/polyglot_test.go | 14 +-
e2e/common/languages/xml_test.go | 12 +-
e2e/common/languages/yaml_test.go | 12 +-
e2e/common/misc/client_test.go | 4 +-
e2e/common/misc/cron_test.go | 44 ++--
e2e/common/misc/integration_fail_test.go | 114 ++++-----
e2e/common/misc/integration_trait_update_test.go | 14 +-
e2e/common/misc/kamelet_test.go | 18 +-
e2e/common/misc/kamelet_update_test.go | 12 +-
e2e/common/misc/maven_repository_test.go | 14 +-
e2e/common/misc/pipe_test.go | 42 ++--
e2e/common/misc/pipe_with_image_test.go | 28 +--
e2e/common/misc/registry_maven_wagon_test.go | 53 ++--
e2e/common/misc/rest_test.go | 26 +-
e2e/common/misc/scale_binding_test.go | 62 ++---
e2e/common/misc/scale_integration_test.go | 79 +++---
e2e/common/misc/structured_logs_test.go | 20 +-
e2e/common/runtimes/runtimes_test.go | 40 +--
e2e/common/setup/main_test.go | 6 +-
e2e/common/traits/affinity_test.go | 56 ++---
e2e/common/traits/builder_test.go | 206 +++++++--------
e2e/common/traits/camel_test.go | 28 +--
e2e/common/traits/container_test.go | 36 +--
e2e/common/traits/deployment_test.go | 36 +--
e2e/common/traits/error_handler_test.go | 12 +-
e2e/common/traits/errored_trait_test.go | 26 +-
e2e/common/traits/health_test.go | 144 +++++------
e2e/common/traits/istio_test.go | 26 +-
e2e/common/traits/jolokia_test.go | 30 +--
e2e/common/traits/jvm_test.go | 20 +-
e2e/common/traits/kamelet_test.go | 20 +-
e2e/common/traits/master_test.go | 36 +--
e2e/common/traits/openapi_test.go | 16 +-
e2e/common/traits/pdb_test.go | 56 ++---
e2e/common/traits/pod_test.go | 20 +-
e2e/common/traits/prometheus_test.go | 24 +-
e2e/common/traits/pull_secret_test.go | 46 ++--
e2e/common/traits/route_test.go | 74 +++---
e2e/common/traits/service_binding_test.go | 24 +-
e2e/common/traits/service_test.go | 52 ++--
e2e/common/traits/toleration_test.go | 44 ++--
e2e/install/cli/global_kamelet_test.go | 38 +--
e2e/install/cli/global_test.go | 116 +++++----
e2e/install/cli/install_test.go | 90 +++----
e2e/install/cli/maven_ca_secret_test.go | 56 ++---
e2e/install/cli/uninstall_test.go | 102 ++++----
e2e/install/helm/setup_test.go | 30 ++-
e2e/install/kustomize/operator_test.go | 70 +++---
e2e/install/kustomize/setup_test.go | 38 +--
e2e/install/kustomize/uninstall_test.go | 72 +++---
e2e/install/olm/olm_install_test.go | 34 +--
e2e/install/upgrade/cli_upgrade_test.go | 64 ++---
e2e/install/upgrade/helm_upgrade_test.go | 52 ++--
e2e/install/upgrade/olm_upgrade_test.go | 106 ++++----
e2e/knative/kamelet_test.go | 32 +--
e2e/knative/knative_platform_test.go | 40 +--
e2e/knative/knative_test.go | 146 ++++++-----
e2e/knative/openapi_test.go | 14 +-
e2e/knative/pod_test.go | 20 +-
e2e/native/native_binding_test.go | 22 +-
e2e/native/native_test.go | 84 +++----
e2e/native/native_with_sources_test.go | 66 ++---
e2e/support/test_support.go | 90 +++----
e2e/support/test_util.go | 9 +-
e2e/telemetry/telemetry_test.go | 38 +--
pkg/cmd/install.go | 9 +-
pkg/cmd/util.go | 16 +-
script/Makefile | 27 +-
109 files changed, 2935 insertions(+), 2951 deletions(-)
diff --git a/e2e/advanced/build_order_strategy_test.go b/e2e/advanced/build_order_strategy_test.go
index 46111d8cb..83dcdce8c 100644
--- a/e2e/advanced/build_order_strategy_test.go
+++ b/e2e/advanced/build_order_strategy_test.go
@@ -37,149 +37,149 @@ import (
func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-build-order-deps"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--max-running-pipelines", "4",
"--build-order-strategy", string(v1.BuildOrderStrategyDependencies)).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
integrationA := RandomizedSuffixName("java-a")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationA,
).Execute()).To(Succeed())
- Eventually(IntegrationKit(t, ns, integrationA), TestTimeoutMedium).ShouldNot(BeEmpty())
+ g.Eventually(IntegrationKit(t, ns, integrationA), TestTimeoutMedium).ShouldNot(BeEmpty())
integrationKitNameA := IntegrationKit(t, ns, integrationA)()
- Eventually(Build(t, ns, integrationKitNameA), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(Build(t, ns, integrationKitNameA), TestTimeoutMedium).ShouldNot(BeNil())
integrationB := RandomizedSuffixName("java-b")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationB,
"-d", "camel:cron",
).Execute()).To(Succeed())
integrationC := RandomizedSuffixName("java-c")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationC,
"-d", "camel:cron",
"-d", "camel:zipfile",
).Execute()).To(Succeed())
integrationZ := RandomizedSuffixName("groovy-z")
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
"--name", integrationZ,
).Execute()).To(Succeed())
- Eventually(IntegrationKit(t, ns, integrationB), TestTimeoutMedium).ShouldNot(BeEmpty())
- Eventually(IntegrationKit(t, ns, integrationC), TestTimeoutMedium).ShouldNot(BeEmpty())
- Eventually(IntegrationKit(t, ns, integrationZ), TestTimeoutMedium).ShouldNot(BeEmpty())
+ g.Eventually(IntegrationKit(t, ns, integrationB), TestTimeoutMedium).ShouldNot(BeEmpty())
+ g.Eventually(IntegrationKit(t, ns, integrationC), TestTimeoutMedium).ShouldNot(BeEmpty())
+ g.Eventually(IntegrationKit(t, ns, integrationZ), TestTimeoutMedium).ShouldNot(BeEmpty())
integrationKitNameB := IntegrationKit(t, ns, integrationB)()
integrationKitNameC := IntegrationKit(t, ns, integrationC)()
integrationKitNameZ := IntegrationKit(t, ns, integrationZ)()
- Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(ContainSubstring(integrationKitNameA))
-
- Eventually(BuildPhase(t, ns, integrationKitNameC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationC), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationC, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationC), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameC)().Status.BaseImage).Should(ContainSubstring(integrationKitNameB))
-
- Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(ContainSubstring(integrationKitNameA))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationC), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationC, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationC), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameC)().Status.BaseImage).Should(ContainSubstring(integrationKitNameB))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
buildA := Build(t, ns, integrationKitNameA)()
buildB := Build(t, ns, integrationKitNameB)()
buildC := Build(t, ns, integrationKitNameC)()
buildZ := Build(t, ns, integrationKitNameZ)()
- Expect(buildA.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
- Expect(buildA.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
- Expect(buildB.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
- Expect(buildZ.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
- Expect(buildZ.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildA.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildA.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildB.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildZ.Status.StartedAt.Before(buildB.Status.StartedAt)).Should(BeTrue())
+ g.Expect(buildZ.Status.StartedAt.Before(buildC.Status.StartedAt)).Should(BeTrue())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
/*
func TestRunBuildOrderStrategyFIFO(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-build-order-fifo"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns, "--build-order-strategy", string(v1.BuildOrderStrategyFIFO)).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--build-order-strategy", string(v1.BuildOrderStrategyFIFO)).Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
integrationA := RandomizedSuffixName("java-a")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationA,
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, integrationA)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, integrationA)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationB := RandomizedSuffixName("java-b")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", integrationB,
"-d", "camel:joor",
).Execute()).To(Succeed())
integrationZ := RandomizedSuffixName("groovy-z")
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-source.groovy",
"--name", integrationZ,
).Execute()).To(Succeed())
integrationKitNameA := IntegrationKit(t, ns, integrationA)()
- Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+ g.Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
- Eventually(IntegrationPhase(t, ns, integrationB)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, integrationB)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitNameB := IntegrationKit(t, ns, integrationB)()
- Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+ g.Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
- Eventually(IntegrationPhase(t, ns, integrationZ)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, integrationZ)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitNameZ := IntegrationKit(t, ns, integrationZ)()
- Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
-
- Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
-
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationA, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationA), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameA)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationB), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationB, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationB), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameB)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ g.Eventually(BuildPhase(t, ns, integrationKitNameZ), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationZ), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, integrationZ, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, integrationZ), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Kit(t, ns, integrationKitNameZ)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
*/
diff --git a/e2e/advanced/builder_test.go b/e2e/advanced/builder_test.go
index a1548812c..2ab36f8c1 100644
--- a/e2e/advanced/builder_test.go
+++ b/e2e/advanced/builder_test.go
@@ -38,14 +38,14 @@ import (
func TestBuilderTimeout(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
pl := Platform(t, ns)()
@@ -54,8 +54,8 @@ func TestBuilderTimeout(t *testing.T) {
Duration: 10 * time.Second,
}
TestClient(t).Update(TestContext, pl)
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(PlatformTimeout(t, ns)).Should(Equal(
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(PlatformTimeout(t, ns)).Should(Equal(
&metav1.Duration{
Duration: 10 * time.Second,
},
@@ -66,22 +66,22 @@ func TestBuilderTimeout(t *testing.T) {
t.Run("run yaml", func(t *testing.T) {
name := RandomizedSuffixName("yaml")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml",
"--name", name,
"-t", "builder.strategy=pod").Execute()).To(Succeed())
// As the build hits timeout, it keeps trying building
- Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitName := IntegrationKit(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPodPhase(t, ns, builderKitName)).Should(Equal(corev1.PodPending))
- Eventually(BuildPhase(t, ns, integrationKitName)).Should(Equal(v1.BuildPhaseRunning))
- Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Name).Should(Equal("builder"))
- Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Image).Should(Equal(operatorPodImage))
+ g.Eventually(BuilderPodPhase(t, ns, builderKitName)).Should(Equal(corev1.PodPending))
+ g.Eventually(BuildPhase(t, ns, integrationKitName)).Should(Equal(v1.BuildPhaseRunning))
+ g.Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Name).Should(Equal("builder"))
+ g.Eventually(BuilderPod(t, ns, builderKitName)().Spec.InitContainers[0].Image).Should(Equal(operatorPodImage))
// After a few minutes (5 max retries), this has to be in error state
- Eventually(BuildPhase(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(v1.BuildPhaseError))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
- Eventually(BuildFailureRecovery(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(5))
- Eventually(BuilderPodPhase(t, ns, builderKitName), TestTimeoutMedium).Should(Equal(corev1.PodFailed))
+ g.Eventually(BuildPhase(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(v1.BuildPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(BuildFailureRecovery(t, ns, integrationKitName), TestTimeoutMedium).Should(Equal(5))
+ g.Eventually(BuilderPodPhase(t, ns, builderKitName), TestTimeoutMedium).Should(Equal(corev1.PodFailed))
})
})
}
diff --git a/e2e/advanced/catalog_builder_test.go b/e2e/advanced/catalog_builder_test.go
index e85f900ac..4279e7f75 100644
--- a/e2e/advanced/catalog_builder_test.go
+++ b/e2e/advanced/catalog_builder_test.go
@@ -38,18 +38,18 @@ import (
func TestCamelCatalogBuilder(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion))
- Eventually(CamelCatalog(t, ns, catalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Eventually(CamelCatalog(t, ns, catalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
// Run an integration with a catalog not compatible
// The operator should create the catalog, but fail on reconciliation as it is not compatible
@@ -57,24 +57,24 @@ func TestCamelCatalogBuilder(t *testing.T) {
t.Run("Run catalog not compatible", func(t *testing.T) {
name := RandomizedSuffixName("java-1-15")
nonCompatibleCatalogName := "camel-catalog-1.15.0"
- Expect(
+ g.Expect(
KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version=1.15.0",
).Execute()).To(Succeed())
- Eventually(CamelCatalog(t, ns, nonCompatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, ns, nonCompatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseError))
- Eventually(CamelCatalogCondition(t, ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("Container image tool missing in catalog"))
+ g.Eventually(CamelCatalog(t, ns, nonCompatibleCatalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, ns, nonCompatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseError))
+ g.Eventually(CamelCatalogCondition(t, ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("Container image tool missing in catalog"))
- Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
kitName := IntegrationKit(t, ns, name)()
- Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseError))
- Eventually(KitCondition(t, ns, kitName, v1.IntegrationKitConditionCatalogAvailable)().Reason).Should(Equal("Camel Catalog 1.15.0 error"))
- Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable)().Status).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseError))
+ g.Eventually(KitCondition(t, ns, kitName, v1.IntegrationKitConditionCatalogAvailable)().Reason).Should(Equal("Camel Catalog 1.15.0 error"))
+ g.Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable)().Status).Should(Equal(corev1.ConditionFalse))
// Clean up
- Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
// Run an integration with a compatible catalog
@@ -85,24 +85,24 @@ func TestCamelCatalogBuilder(t *testing.T) {
compatibleCatalogName := "camel-catalog-" + strings.ToLower(compatibleVersion)
// First of all we delete the catalog, if by any chance it was created previously
- Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
- Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
+ g.Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
+ g.Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
- Expect(
+ g.Expect(
KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version="+compatibleVersion,
).Execute()).To(Succeed())
- Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
- Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(Equal("Container image tool found in catalog"))
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).
+ g.Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(Equal("Container image tool found in catalog"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
// Clean up
- Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
t.Run("Run catalog container exists", func(t *testing.T) {
@@ -111,32 +111,32 @@ func TestCamelCatalogBuilder(t *testing.T) {
compatibleCatalogName := "camel-catalog-" + strings.ToLower(compatibleVersion)
// First of all we delete the catalog, if by any chance it was created previously
- Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
- Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
+ g.Expect(DeleteCamelCatalog(t, ns, compatibleCatalogName)()).Should(BeTrue())
+ g.Eventually(CamelCatalog(t, ns, compatibleCatalogName)).Should(BeNil())
- Expect(
+ g.Expect(
KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "camel.runtime-version="+compatibleVersion,
).Execute()).To(Succeed())
- Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
- Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(
+ g.Eventually(CamelCatalog(t, ns, compatibleCatalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, ns, compatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Eventually(CamelCatalogCondition(t, ns, compatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(
Equal("Container image tool found in catalog"),
)
- Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, name)).ShouldNot(Equal(""))
kitName := IntegrationKit(t, ns, name)()
- Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(IntegrationPodPhase(t, ns, name)).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(KitPhase(t, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(IntegrationPodPhase(t, ns, name)).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Clean up
- Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns)).Should(Equal(0))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/debug_test.go b/e2e/advanced/debug_test.go
index 206211aac..753d6b27c 100644
--- a/e2e/advanced/debug_test.go
+++ b/e2e/advanced/debug_test.go
@@ -39,68 +39,68 @@ import (
func TestKamelCLIDebug(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("debug local default port check", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Expect(portIsInUse("127.0.0.1", "5005")()).To(BeFalse())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(portIsInUse("127.0.0.1", "5005")()).To(BeFalse())
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(portIsInUse("127.0.0.1", "5005"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(portIsInUse("127.0.0.1", "5005"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("debug local port check", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Expect(portIsInUse("127.0.0.1", "5006")()).To(BeFalse())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(portIsInUse("127.0.0.1", "5006")()).To(BeFalse())
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
go KamelWithContext(t, debugTestContext, "debug", "yaml", "--port", "5006", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(portIsInUse("127.0.0.1", "5006"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(portIsInUse("127.0.0.1", "5006"), TestTimeoutMedium, 5*time.Second).Should(BeTrue())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("debug logs check", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutMedium).Should(ContainSubstring("Listening for transport dt_socket at address: 5005"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutMedium).Should(ContainSubstring("Listening for transport dt_socket at address: 5005"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Pod config test", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
debugTestContext, cancel := context.WithCancel(TestContext)
defer cancelAndWait(cancel)
go KamelWithContext(t, debugTestContext, "debug", "yaml", "-n", ns).ExecuteContext(debugTestContext)
- Eventually(func() string {
+ g.Eventually(func() string {
return IntegrationPod(t, ns, "yaml")().Spec.Containers[0].Args[0]
}).Should(ContainSubstring("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005"))
- Expect(IntegrationPod(t, ns, "yaml")().GetLabels()["camel.apache.org/debug"]).To(Not(BeNil()))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(IntegrationPod(t, ns, "yaml")().GetLabels()["camel.apache.org/debug"]).To(Not(BeNil()))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/deployment_test.go b/e2e/advanced/deployment_test.go
index 8c80f68a4..91cefb686 100644
--- a/e2e/advanced/deployment_test.go
+++ b/e2e/advanced/deployment_test.go
@@ -36,14 +36,14 @@ import (
func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-failing-deploy"
nsRestr := "restr"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
// Create restricted namespace
- ExpectExecSucceed(t,
+ ExpectExecSucceed(t, g,
exec.Command(
"kubectl",
"create",
@@ -51,7 +51,7 @@ func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
nsRestr,
),
)
- ExpectExecSucceed(t,
+ ExpectExecSucceed(t, g,
exec.Command(
"kubectl",
"label",
@@ -68,14 +68,14 @@ func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
)
// Create an Integration into a restricted namespace
name := RandomizedSuffixName("java-fail")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name, "-n", nsRestr).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name, "-n", nsRestr).Execute()).To(Succeed())
// Check the error is reported into the Integration
- Eventually(IntegrationPhase(t, nsRestr, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Status).
+ g.Eventually(IntegrationPhase(t, nsRestr, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Status).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Message).
+ g.Eventually(IntegrationCondition(t, nsRestr, name, v1.IntegrationConditionReady)().Message).
Should(ContainSubstring("is forbidden: violates PodSecurity"))
// Clean up
- Eventually(DeleteIntegrations(t, nsRestr)).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, nsRestr)).Should(Equal(0))
})
}
diff --git a/e2e/advanced/dump_test.go b/e2e/advanced/dump_test.go
index 3f6bad518..7791863d0 100644
--- a/e2e/advanced/dump_test.go
+++ b/e2e/advanced/dump_test.go
@@ -37,30 +37,30 @@ import (
func TestKamelCLIDump(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("dump empty namespace", func(t *testing.T) {
dump := GetOutputString(Kamel(t, "dump", "-n", ns))
- Expect(dump).To(ContainSubstring("Found 0 integrations:"))
- Expect(dump).To(ContainSubstring("Found 0 deployments:"))
+ g.Expect(dump).To(ContainSubstring("Found 0 integrations:"))
+ g.Expect(dump).To(ContainSubstring("Found 0 deployments:"))
})
t.Run("dump non-empty namespace", func(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "yaml")).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "yaml")).Should(ContainSubstring("Magicstring!"))
dump := GetOutputString(Kamel(t, "dump", "-n", ns))
- Expect(dump).To(ContainSubstring("Found 1 platforms"))
- Expect(dump).To(ContainSubstring("Found 1 integrations"))
- Expect(dump).To(ContainSubstring("name: yaml"))
- Expect(dump).To(ContainSubstring("Magicstring!"))
+ g.Expect(dump).To(ContainSubstring("Found 1 platforms"))
+ g.Expect(dump).To(ContainSubstring("Found 1 integrations"))
+ g.Expect(dump).To(ContainSubstring("name: yaml"))
+ g.Expect(dump).To(ContainSubstring("Magicstring!"))
})
})
}
diff --git a/e2e/advanced/environment_test.go b/e2e/advanced/environment_test.go
index a9793a904..c17839ef9 100644
--- a/e2e/advanced/environment_test.go
+++ b/e2e/advanced/environment_test.go
@@ -41,7 +41,7 @@ import (
func TestEnvironmentTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// HTTP proxy configuration
httpProxy := "http://proxy"
noProxy := []string{
@@ -53,37 +53,37 @@ func TestEnvironmentTrait(t *testing.T) {
// Retrieve the Kubernetes Service ClusterIPs to populate the NO_PROXY environment variable
svc := Service(t, TestDefaultNamespace, "kubernetes")()
- Expect(svc).NotTo(BeNil())
+ g.Expect(svc).NotTo(BeNil())
noProxy = append(noProxy, svc.Spec.ClusterIPs...)
// Retrieve the internal container registry to populate the NO_PROXY environment variable
if registry, ok := os.LookupEnv("KAMEL_INSTALL_REGISTRY"); ok {
domain := RegistryRegexp.FindString(registry)
- Expect(domain).NotTo(BeNil())
+ g.Expect(domain).NotTo(BeNil())
domain = strings.Split(domain, ":")[0]
noProxy = append(noProxy, domain)
}
// Install Camel K with the HTTP proxy environment variable
operatorID := "camel-k-trait-environment"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=%s", httpProxy),
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","),
).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run integration with default environment", func(t *testing.T) {
name := RandomizedSuffixName("java-default")
- Expect(KamelRunWithID(t, operatorID, ns, "--name", name, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", name, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
+ g.Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -104,15 +104,15 @@ func TestEnvironmentTrait(t *testing.T) {
t.Run("Run integration with custom environment", func(t *testing.T) {
name := RandomizedSuffixName("java-custom-proxy")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "environment.vars=HTTP_PROXY=http://custom.proxy",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
+ g.Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -133,15 +133,15 @@ func TestEnvironmentTrait(t *testing.T) {
t.Run("Run integration without default HTTP proxy environment", func(t *testing.T) {
name := RandomizedSuffixName("java-no-proxy")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "environment.http-proxy=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
+ g.Expect(IntegrationPod(t, ns, name)()).To(WithTransform(podEnvVars, And(
ContainElement(corev1.EnvVar{Name: "CAMEL_K_VERSION", Value: defaults.Version}),
ContainElement(corev1.EnvVar{Name: "NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
@@ -160,15 +160,15 @@ func TestEnvironmentTrait(t *testing.T) {
)))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
envTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "environment")
- Expect(envTrait).ToNot(BeNil())
- Expect(len(envTrait)).To(Equal(1))
- Expect(envTrait["httpProxy"]).To(Equal(false))
+ g.Expect(envTrait).ToNot(BeNil())
+ g.Expect(len(envTrait)).To(Equal(1))
+ g.Expect(envTrait["httpProxy"]).To(Equal(false))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/incremental_build_test.go b/e2e/advanced/incremental_build_test.go
index 5f627e73d..09172c6ca 100644
--- a/e2e/advanced/incremental_build_test.go
+++ b/e2e/advanced/incremental_build_test.go
@@ -38,224 +38,224 @@ import (
func TestRunIncrementalBuildRoutine(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
- operatorID := "camel-k-incremental-build"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-incremental-build-routine"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
t.Run("Reuse previous kit", func(t *testing.T) {
nameClone := "java-clone"
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
- Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
+ g.Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
})
t.Run("Create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
// we should be saving just to check the substring is contained
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildPod(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
- operatorID := "camel-k-incremental-build"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := "camel-k-incremental-build-pod"
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
t.Run("Reuse previous kit", func(t *testing.T) {
nameClone := RandomizedSuffixName("java-clone")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
- Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
- Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
+ g.Eventually(integrationCloneKitName).Should(Equal(integrationKitName))
+ g.Eventually(BuilderPodsCount(t, ns)).Should(Equal(1))
})
t.Run("Create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
// we should be save just to check the substring is contained
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Eventually(BuilderPodsCount(t, ns)).Should(Equal(2))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(BuilderPodsCount(t, ns)).Should(Equal(2))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildOff(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-standard-build"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
t.Run("Don't reuse previous kit", func(t *testing.T) {
nameClone := RandomizedSuffixName("java-clone")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameClone,
"-t", "builder.incremental-image-build=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationCloneKitName := IntegrationKit(t, ns, nameClone)()
- Eventually(Kit(t, ns, integrationCloneKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationCloneKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
})
t.Run("Don't create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
"-t", "builder.incremental-image-build=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-incremental-different-base"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
t.Run("Create incremental kit", func(t *testing.T) {
// Another integration that should be built on top of the previous IntegrationKit
// just add a new random dependency
nameIncremental := RandomizedSuffixName("java-incremental")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", nameIncremental,
"-d", "camel:zipfile",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
// we should be save just to check the substring is contained
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
})
t.Run("Create new hierarchy kit", func(t *testing.T) {
// We should spin off a new hierarchy of builds
newBaseImage := "eclipse-temurin:17.0.8.1_1-jdk-ubi9-minimal"
name = RandomizedSuffixName("java-new")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-d", "camel:mongodb",
"-t", fmt.Sprintf("builder.base-image=%s", newBaseImage),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName = IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(newBaseImage))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(newBaseImage))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(newBaseImage))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(newBaseImage))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/integration_profile_test.go b/e2e/advanced/integration_profile_test.go
index e26000097..849450f1d 100644
--- a/e2e/advanced/integration_profile_test.go
+++ b/e2e/advanced/integration_profile_test.go
@@ -38,10 +38,10 @@ import (
func TestIntegrationProfile(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-integration-profile"
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
integrationProfile.SetOperatorID(operatorID)
@@ -50,44 +50,44 @@ func TestIntegrationProfile(t *testing.T) {
LimitCPU: "0.2",
}
- Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ g.Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ g.Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
- WithNewTestNamespace(t, func(ns1 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns1 string) {
integrationProfile := v1.NewIntegrationProfile(ns1, "ipr-local")
integrationProfile.SetOperatorID(operatorID)
integrationProfile.Spec.Traits.Container = &traitv1.ContainerTrait{
LimitCPU: "0.1",
}
- Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(t, ns1, "ipr-local"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ g.Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ g.Eventually(SelectedIntegrationProfilePhase(t, ns1, "ipr-local"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
t.Run("Run integration with global integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
containerName := pod.Spec.Containers[0].Name
return containerName == "ck-integration-global"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
cpuLimits := pod.Spec.Containers[0].Resources.Limits.Cpu()
return cpuLimits != nil && cpuLimits.AsApproximateFloat64() > 0
}), TestTimeoutShort).Should(BeTrue())
- Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
})
t.Run("Run integration with namespace local integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-local", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns1, "--name", "limited", "--integration-profile", "ipr-local", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPod(t, ns1, "limited"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -95,20 +95,20 @@ func TestIntegrationProfile(t *testing.T) {
return containerName == "integration"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns1, "limited", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
cpuLimits := pod.Spec.Containers[0].Resources.Limits.Cpu()
return cpuLimits != nil && cpuLimits.AsApproximateFloat64() > 0
}), TestTimeoutShort).Should(BeTrue())
- Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "limited", "-n", ns1).Execute()).To(Succeed())
})
t.Run("Run integration without integration profile", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns1, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns1, "normal"), TestTimeoutShort).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns1, "normal", func(pod *corev1.Pod) bool {
+ g.Expect(KamelRunWithID(t, operatorID, ns1, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPod(t, ns1, "normal"), TestTimeoutShort).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns1, "normal", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -118,7 +118,7 @@ func TestIntegrationProfile(t *testing.T) {
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
})
})
}
@@ -126,10 +126,10 @@ func TestIntegrationProfile(t *testing.T) {
func TestIntegrationProfileInfluencesKit(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-ipr-kit"
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
integrationProfile.SetOperatorID(operatorID)
@@ -137,44 +137,44 @@ func TestIntegrationProfileInfluencesKit(t *testing.T) {
Properties: []string{"b1=foo"},
}
- Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ g.Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ g.Eventually(SelectedIntegrationProfilePhase(t, ns, "ipr-global"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns, "normal"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodPhase(t, ns, "normal"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "normal", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "normal"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPod(t, ns, "normal"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodPhase(t, ns, "normal"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "normal", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "normal"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Verify that a new kit has been built based on the default base image
integrationKitName := IntegrationKit(t, ns, "normal")()
- Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
- Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(Kit(t, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
- Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "ipr-global", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodPhase(t, ns, "simple"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "simple", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "simple"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodPhase(t, ns, "simple"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "simple", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "simple"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Verify that a new kit has been built based on the previous kit
integrationKitNameWithProfile := IntegrationKit(t, ns, "simple")()
- Eventually(integrationKitNameWithProfile).ShouldNot(Equal(integrationKitName))
- Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
- Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.RootImage).Should(Equal(defaults.BaseImage()))
+ g.Eventually(integrationKitNameWithProfile).ShouldNot(Equal(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
+ g.Eventually(Kit(t, ns, integrationKitNameWithProfile)().Status.RootImage).Should(Equal(defaults.BaseImage()))
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestPropagateIntegrationProfileChanges(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-ipr-changes"
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "debug-profile")
integrationProfile.SetOperatorID(operatorID)
@@ -185,13 +185,13 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
Level: "DEBUG",
}
- Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
- Eventually(SelectedIntegrationProfilePhase(t, ns, "debug-profile"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
+ g.Expect(CreateIntegrationProfile(t, &integrationProfile)).To(Succeed())
+ g.Eventually(SelectedIntegrationProfilePhase(t, ns, "debug-profile"), TestTimeoutMedium).Should(Equal(v1.IntegrationProfilePhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "debug-profile", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "simple", "--integration-profile", "debug-profile", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPod(t, ns, "simple"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -199,13 +199,13 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
return containerName == "ck-ipr"
}), TestTimeoutShort).Should(BeTrue())
- Expect(UpdateIntegrationProfile(t, ns, func(ipr *v1.IntegrationProfile) {
+ g.Expect(UpdateIntegrationProfile(t, ns, func(ipr *v1.IntegrationProfile) {
ipr.Spec.Traits.Container = &traitv1.ContainerTrait{
Name: "ck-ipr-new",
}
})).To(Succeed())
- Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns, "simple", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -214,6 +214,6 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/kamelet_repo_test.go b/e2e/advanced/kamelet_repo_test.go
index 532397c43..4a77e16ed 100644
--- a/e2e/advanced/kamelet_repo_test.go
+++ b/e2e/advanced/kamelet_repo_test.go
@@ -36,30 +36,30 @@ import (
func TestKameletFromCustomRepository(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
kameletName := "timer-custom-source"
removeKamelet(t, kameletName, ns)
- Eventually(Kamelet(t, kameletName, ns)).Should(BeNil())
+ g.Eventually(Kamelet(t, kameletName, ns)).Should(BeNil())
// Add the custom repository
- Expect(Kamel(t, "kamelet", "add-repo",
+ g.Expect(Kamel(t, "kamelet", "add-repo",
"github:squakez/ck-kamelet-test-repo/kamelets",
"-n", ns,
"-x", operatorID).Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerCustomKameletIntegration.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "timer-custom-kamelet-integration"), TestTimeoutLong).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerCustomKameletIntegration.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "timer-custom-kamelet-integration"), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "timer-custom-kamelet-integration")).Should(ContainSubstring("hello world"))
+ g.Eventually(IntegrationLogs(t, ns, "timer-custom-kamelet-integration")).Should(ContainSubstring("hello world"))
// Remove the custom repository
- Expect(Kamel(t, "kamelet", "remove-repo",
+ g.Expect(Kamel(t, "kamelet", "remove-repo",
"github:squakez/ck-kamelet-test-repo/kamelets",
"-n", ns,
"-x", operatorID).Execute()).To(Succeed())
diff --git a/e2e/advanced/local_platform_test.go b/e2e/advanced/local_platform_test.go
index ddfc20a2a..d6403862d 100644
--- a/e2e/advanced/local_platform_test.go
+++ b/e2e/advanced/local_platform_test.go
@@ -36,29 +36,29 @@ import (
func TestLocalPlatform(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-platform-local"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
+ g.Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
pl.Spec.Build.Maven.Properties = make(map[string]string)
pl.Spec.Build.Maven.Properties["build-global-prop1"] = "build-global-value1"
// set maximum number of running builds
pl.Spec.Build.MaxRunningBuilds = 1
})).To(Succeed())
- Eventually(PlatformHas(t, ns, func(pl *v1.IntegrationPlatform) bool {
+ g.Eventually(PlatformHas(t, ns, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Build.MaxRunningBuilds == 1
}), TestTimeoutMedium).Should(BeTrue())
- WithNewTestNamespace(t, func(ns1 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns1 string) {
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup").Execute()).To(Succeed())
- Expect(UpdatePlatform(t, ns1, "local-platform", func(pl *v1.IntegrationPlatform) {
+ g.Expect(UpdatePlatform(t, ns1, "local-platform", func(pl *v1.IntegrationPlatform) {
pl.Spec.Build.Maven.Properties = make(map[string]string)
pl.Spec.Build.Maven.Properties["build-local-prop1"] = "build-local-value1"
pl.SetOperatorID(operatorID)
@@ -68,30 +68,30 @@ func TestLocalPlatform(t *testing.T) {
}
})).To(Succeed())
- Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
+ g.Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Cluster != ""
}), TestTimeoutShort).Should(BeTrue())
- Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
+ g.Eventually(PlatformHas(t, ns1, func(pl *v1.IntegrationPlatform) bool {
return pl.Status.Build.MaxRunningBuilds == 1
}), TestTimeoutShort).Should(BeTrue())
pl := PlatformByName(t, ns, operatorID)()
local := Platform(t, ns1)()
- Expect(local.Status.Build.PublishStrategy).To(Equal(pl.Status.Build.PublishStrategy))
- Expect(local.Status.Build.BuildConfiguration.Strategy).To(Equal(pl.Status.Build.BuildConfiguration.Strategy))
- Expect(local.Status.Build.BuildConfiguration.OrderStrategy).To(Equal(pl.Status.Build.BuildConfiguration.OrderStrategy))
- Expect(local.Status.Build.Maven.LocalRepository).To(Equal(pl.Status.Build.Maven.LocalRepository))
- Expect(local.Status.Build.Maven.CLIOptions).To(ContainElements(pl.Status.Build.Maven.CLIOptions))
- Expect(local.Status.Build.Maven.Extension).To(BeEmpty())
- Expect(local.Status.Build.Maven.Properties).To(HaveLen(2))
- Expect(local.Status.Build.Maven.Properties["build-global-prop1"]).To(Equal("build-global-value1"))
- Expect(local.Status.Build.Maven.Properties["build-local-prop1"]).To(Equal("build-local-value1"))
-
- Expect(KamelRunWithID(t, operatorID, ns1, "--name", "local-integration", "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPod(t, ns1, "local-integration"), TestTimeoutMedium).Should(Not(BeNil()))
- Eventually(IntegrationPodHas(t, ns1, "local-integration", func(pod *corev1.Pod) bool {
+ g.Expect(local.Status.Build.PublishStrategy).To(Equal(pl.Status.Build.PublishStrategy))
+ g.Expect(local.Status.Build.BuildConfiguration.Strategy).To(Equal(pl.Status.Build.BuildConfiguration.Strategy))
+ g.Expect(local.Status.Build.BuildConfiguration.OrderStrategy).To(Equal(pl.Status.Build.BuildConfiguration.OrderStrategy))
+ g.Expect(local.Status.Build.Maven.LocalRepository).To(Equal(pl.Status.Build.Maven.LocalRepository))
+ g.Expect(local.Status.Build.Maven.CLIOptions).To(ContainElements(pl.Status.Build.Maven.CLIOptions))
+ g.Expect(local.Status.Build.Maven.Extension).To(BeEmpty())
+ g.Expect(local.Status.Build.Maven.Properties).To(HaveLen(2))
+ g.Expect(local.Status.Build.Maven.Properties["build-global-prop1"]).To(Equal("build-global-value1"))
+ g.Expect(local.Status.Build.Maven.Properties["build-local-prop1"]).To(Equal("build-local-value1"))
+
+ g.Expect(KamelRunWithID(t, operatorID, ns1, "--name", "local-integration", "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPod(t, ns1, "local-integration"), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Eventually(IntegrationPodHas(t, ns1, "local-integration", func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -100,7 +100,7 @@ func TestLocalPlatform(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns1).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/advanced/maven_http_proxy_test.go b/e2e/advanced/maven_http_proxy_test.go
index f3acd57e7..a556377b6 100644
--- a/e2e/advanced/maven_http_proxy_test.go
+++ b/e2e/advanced/maven_http_proxy_test.go
@@ -60,7 +60,7 @@ var httpdTlsMountPath = "/etc/tls/private"
func TestMavenProxy(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
hostname := fmt.Sprintf("%s.%s.svc", "proxy", ns)
// Generate the TLS certificate
@@ -80,7 +80,7 @@ func TestMavenProxy(t *testing.T) {
// generate the certificate private key
certPrivateKey, err := rsa.GenerateKey(rand.Reader, 2048)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
privateKeyBytes := x509.MarshalPKCS1PrivateKey(certPrivateKey)
// encode for storing into a Secret
@@ -91,7 +91,7 @@ func TestMavenProxy(t *testing.T) {
},
)
certBytes, err := x509.CreateCertificate(rand.Reader, cert, cert, &certPrivateKey.PublicKey, certPrivateKey)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// encode for storing into a Secret
certPem := pem.EncodeToMemory(&pem.Block{
@@ -114,21 +114,21 @@ func TestMavenProxy(t *testing.T) {
corev1.TLSPrivateKeyKey: privateKeyPem,
},
}
- Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
// HTTPD ConfigMap
config := newHTTPDConfigMap(ns, hostname)
- Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
// HTTPD Deployment
deployment := newHTTPDDeployment(ns, config.Name, secret.Name)
- Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
service := newHTTPDService(deployment)
- Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Wait for the Deployment to become ready
- Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ g.Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Status": MatchFields(IgnoreExtras,
Fields{
@@ -138,7 +138,7 @@ func TestMavenProxy(t *testing.T) {
))
svc := Service(t, TestDefaultNamespace, "kubernetes")()
- Expect(svc).NotTo(BeNil())
+ g.Expect(svc).NotTo(BeNil())
// It may be needed to populate the values from the cluster, machine and service network CIDRs
noProxy := []string{
@@ -150,8 +150,8 @@ func TestMavenProxy(t *testing.T) {
// Install Camel K with the HTTP proxy
operatorID := "camel-k-maven-proxy"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
olm, olmErr := olm.IsAPIAvailable(TestClient(t))
installed, inErr := kubernetes.IsAPIResourceInstalled(TestClient(t), configv1.GroupVersion.String(), reflect.TypeOf(configv1.Proxy{}).Name())
permission, pErr := kubernetes.CheckPermission(TestContext, TestClient(t), configv1.GroupName, reflect.TypeOf(configv1.Proxy{}).Name(), "", "cluster", "edit")
@@ -163,12 +163,12 @@ func TestMavenProxy(t *testing.T) {
key := ctrl.ObjectKey{
Name: "cluster",
}
- Expect(TestClient(t).Get(TestContext, key, &defaultProxy)).To(Succeed())
+ g.Expect(TestClient(t).Get(TestContext, key, &defaultProxy)).To(Succeed())
newProxy := defaultProxy.DeepCopy()
newProxy.Spec.HTTPProxy = fmt.Sprintf("http://%s", hostname)
newProxy.Spec.NoProxy = strings.Join(noProxy, ",")
- Expect(TestClient(t).Update(TestContext, newProxy))
+ g.Expect(TestClient(t).Update(TestContext, newProxy))
defer func() {
//
@@ -181,9 +181,9 @@ func TestMavenProxy(t *testing.T) {
}()
// ENV values should be injected by the OLM
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
} else {
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=http://%s", hostname),
// TODO: enable TLS for the HTTPS proxy when Maven supports it
// "--operator-env-vars", fmt.Sprintf("HTTPS_PROXY=https://%s", hostname),
@@ -192,15 +192,15 @@ func TestMavenProxy(t *testing.T) {
).Execute()).To(Succeed())
}
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the Integration
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
proxies := corev1.PodList{
TypeMeta: metav1.TypeMeta{
@@ -212,19 +212,19 @@ func TestMavenProxy(t *testing.T) {
ctrl.InNamespace(ns),
ctrl.MatchingLabels(deployment.Spec.Selector.MatchLabels),
)
- Expect(err).To(Succeed())
- Expect(proxies.Items).To(HaveLen(1))
+ g.Expect(err).To(Succeed())
+ g.Expect(proxies.Items).To(HaveLen(1))
logs := Logs(t, ns, proxies.Items[0].Name, corev1.PodLogOptions{})()
- Expect(logs).NotTo(BeEmpty())
- Expect(logs).To(ContainSubstring("\"CONNECT repo.maven.apache.org:443 HTTP/1.1\" 200"))
+ g.Expect(logs).NotTo(BeEmpty())
+ g.Expect(logs).To(ContainSubstring("\"CONNECT repo.maven.apache.org:443 HTTP/1.1\" 200"))
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
})
}
diff --git a/e2e/advanced/operator_id_filtering_test.go b/e2e/advanced/operator_id_filtering_test.go
index 95c9aff77..d7c316e4e 100644
--- a/e2e/advanced/operator_id_filtering_test.go
+++ b/e2e/advanced/operator_id_filtering_test.go
@@ -37,91 +37,91 @@ import (
func TestOperatorIDCamelCatalogReconciliation(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
})
}
func TestOperatorIDFiltering(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
- WithNewTestNamespace(t, func(nsop1 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ WithNewTestNamespace(t, func(g *WithT, nsop1 string) {
operator1 := "operator-1"
- Expect(CopyCamelCatalog(t, nsop1, operator1)).To(Succeed())
- Expect(CopyIntegrationKits(t, nsop1, operator1)).To(Succeed())
- Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, nsop1, operator1)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, nsop1, operator1)).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- WithNewTestNamespace(t, func(nsop2 string) {
+ WithNewTestNamespace(t, func(g *WithT, nsop2 string) {
operator2 := "operator-2"
- Expect(CopyCamelCatalog(t, nsop2, operator2)).To(Succeed())
- Expect(CopyIntegrationKits(t, nsop2, operator2)).To(Succeed())
- Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
- Eventually(PlatformPhase(t, nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, nsop2, operator2)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, nsop2, operator2)).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Operators ignore non-scoped integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "untouched", "--force").Execute()).To(Succeed())
- Consistently(IntegrationPhase(t, ns, "untouched"), 10*time.Second).Should(BeEmpty())
+ g.Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "untouched", "--force").Execute()).To(Succeed())
+ g.Consistently(IntegrationPhase(t, ns, "untouched"), 10*time.Second).Should(BeEmpty())
})
t.Run("Operators run scoped integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "moving", "--force").Execute()).To(Succeed())
- Expect(AssignIntegrationToOperator(t, ns, "moving", operator1)).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "moving", "--force").Execute()).To(Succeed())
+ g.Expect(AssignIntegrationToOperator(t, ns, "moving", operator1)).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("Operators can handoff scoped integrations", func(t *testing.T) {
- Expect(AssignIntegrationToOperator(t, ns, "moving", operator2)).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseBuildingKit))
- Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(AssignIntegrationToOperator(t, ns, "moving", operator2)).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("Operators can be deactivated after completely handing off scoped integrations", func(t *testing.T) {
- Expect(ScaleOperator(t, nsop1, 0)).To(Succeed())
- Expect(Kamel(t, "rebuild", "-n", ns, "moving").Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(ScaleOperator(t, nsop1, 1)).To(Succeed())
+ g.Expect(ScaleOperator(t, nsop1, 0)).To(Succeed())
+ g.Expect(Kamel(t, "rebuild", "-n", ns, "moving").Execute()).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(ScaleOperator(t, nsop1, 1)).To(Succeed())
})
t.Run("Operators can run scoped integrations with fixed image", func(t *testing.T) {
image := IntegrationPodImage(t, ns, "moving")()
- Expect(image).NotTo(BeEmpty())
+ g.Expect(image).NotTo(BeEmpty())
// Save resources by deleting "moving" integration
- Expect(Kamel(t, "delete", "moving", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "moving", "-n", ns).Execute()).To(Succeed())
- Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "pre-built", "--force",
+ g.Expect(KamelRunWithID(t, "operator-x", ns, "files/yaml.yaml", "--name", "pre-built", "--force",
"-t", fmt.Sprintf("container.image=%s", image), "-t", "jvm.enabled=true").Execute()).To(Succeed())
- Consistently(IntegrationPhase(t, ns, "pre-built"), 10*time.Second).Should(BeEmpty())
- Expect(AssignIntegrationToOperator(t, ns, "pre-built", operator2)).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "pre-built"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
+ g.Consistently(IntegrationPhase(t, ns, "pre-built"), 10*time.Second).Should(BeEmpty())
+ g.Expect(AssignIntegrationToOperator(t, ns, "pre-built", operator2)).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "pre-built"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
})
t.Run("Operators can run scoped Pipes", func(t *testing.T) {
- Expect(KamelBindWithID(t, "operator-x", ns, "timer-source?message=Hello", "log-sink",
+ g.Expect(KamelBindWithID(t, "operator-x", ns, "timer-source?message=Hello", "log-sink",
"--name", "klb", "--force").Execute()).To(Succeed())
- Consistently(Integration(t, ns, "klb"), 10*time.Second).Should(BeNil())
+ g.Consistently(Integration(t, ns, "klb"), 10*time.Second).Should(BeNil())
- Expect(AssignPipeToOperator(t, ns, "klb", operator1)).To(Succeed())
- Eventually(Integration(t, ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(IntegrationPhase(t, ns, "klb"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "klb"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(AssignPipeToOperator(t, ns, "klb", operator1)).To(Succeed())
+ g.Eventually(Integration(t, ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(IntegrationPhase(t, ns, "klb"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "klb"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
})
})
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/operator_metrics_test.go b/e2e/advanced/operator_metrics_test.go
index af5454448..de59ed585 100644
--- a/e2e/advanced/operator_metrics_test.go
+++ b/e2e/advanced/operator_metrics_test.go
@@ -58,25 +58,25 @@ func TestMetrics(t *testing.T) {
t.Skip("WARNING: Test marked as problematic ... skipping")
}
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
operatorID := "camel-k-metrics"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug").Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug").Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "prometheus.enabled=true",
"-t", "prometheus.pod-monitor=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := OperatorPod(t, ns)()
- Expect(pod).NotTo(BeNil())
+ g.Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
fmt.Printf("Fetching logs for operator pod %s in namespace %s", pod.Name, pod.Namespace)
@@ -84,24 +84,24 @@ func TestMetrics(t *testing.T) {
Container: "camel-k-operator",
}
logs, err := StructuredLogs(t, pod.Namespace, pod.Name, logOptions, false)
- Expect(err).To(BeNil())
- Expect(logs).NotTo(BeEmpty())
+ g.Expect(err).To(BeNil())
+ g.Expect(logs).NotTo(BeEmpty())
response, err := TestClient(t).CoreV1().RESTClient().Get().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/metrics", pod.Namespace, pod.Name)).DoRaw(TestContext)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
metrics, err := parsePrometheusData(response)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
it := Integration(t, ns, name)()
- Expect(it).NotTo(BeNil())
+ g.Expect(it).NotTo(BeNil())
build := Build(t, ns, it.Status.IntegrationKit.Name)()
- Expect(build).NotTo(BeNil())
+ g.Expect(build).NotTo(BeNil())
t.Run("Build duration metric", func(t *testing.T) {
// Get the duration from the Build status
duration, err := time.ParseDuration(build.Status.Duration)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check it's consistent with the duration observed from logs
var ts1, ts2 time.Time
@@ -125,18 +125,18 @@ func TestMetrics(t *testing.T) {
"RequestName": Equal(build.Name),
}), func(l *LogEntry) { ts2 = l.Timestamp }).
Walk()
- Expect(err).To(BeNil())
- Expect(ts1).NotTo(BeZero())
- Expect(ts2).NotTo(BeZero())
- Expect(ts2).To(BeTemporally(">", ts1))
+ g.Expect(err).To(BeNil())
+ g.Expect(ts1).NotTo(BeZero())
+ g.Expect(ts2).NotTo(BeZero())
+ g.Expect(ts2).To(BeTemporally(">", ts1))
durationFromLogs := ts2.Sub(ts1)
// With a build strategy there could be a little variance (less than 10 seconds should be enough)
- Expect(math.Abs((durationFromLogs - duration).Seconds())).To(BeNumerically("<", 10))
+ g.Expect(math.Abs((durationFromLogs - duration).Seconds())).To(BeNumerically("<", 10))
// Check the duration is observed in the corresponding metric
- Expect(metrics).To(HaveKey("camel_k_build_duration_seconds"))
- Expect(metrics["camel_k_build_duration_seconds"]).To(EqualP(
+ g.Expect(metrics).To(HaveKey("camel_k_build_duration_seconds"))
+ g.Expect(metrics["camel_k_build_duration_seconds"]).To(EqualP(
prometheus.MetricFamily{
Name: stringP("camel_k_build_duration_seconds"),
Help: stringP("Camel K build duration"),
@@ -160,7 +160,7 @@ func TestMetrics(t *testing.T) {
t.Run("Build recovery attempts metric", func(t *testing.T) {
// Check there are no failures reported in the Build status
- Expect(build.Status.Failure).To(BeNil())
+ g.Expect(build.Status.Failure).To(BeNil())
// Check no recovery attempts are reported in the logs
recoveryAttempts, err := NewLogCounter(&logs).Count(MatchFields(IgnoreExtras, Fields{
@@ -169,12 +169,12 @@ func TestMetrics(t *testing.T) {
"Kind": Equal("Build"),
"RequestName": Equal(build.Name),
}))
- Expect(err).To(BeNil())
- Expect(recoveryAttempts).To(BeNumerically("==", 0))
+ g.Expect(err).To(BeNil())
+ g.Expect(recoveryAttempts).To(BeNumerically("==", 0))
// Check no recovery attempts are observed in the corresponding metric
- Expect(metrics).To(HaveKey("camel_k_build_recovery_attempts"))
- Expect(metrics["camel_k_build_recovery_attempts"]).To(EqualP(
+ g.Expect(metrics).To(HaveKey("camel_k_build_recovery_attempts"))
+ g.Expect(metrics["camel_k_build_recovery_attempts"]).To(EqualP(
prometheus.MetricFamily{
Name: stringP("camel_k_build_recovery_attempts"),
Help: stringP("Camel K build recovery attempts"),
@@ -197,8 +197,8 @@ func TestMetrics(t *testing.T) {
})
t.Run("reconciliation duration metric", func(t *testing.T) {
- Expect(metrics).To(HaveKey("camel_k_reconciliation_duration_seconds"))
- Expect(metrics["camel_k_reconciliation_duration_seconds"]).To(PointTo(MatchFields(IgnoreExtras,
+ g.Expect(metrics).To(HaveKey("camel_k_reconciliation_duration_seconds"))
+ g.Expect(metrics["camel_k_reconciliation_duration_seconds"]).To(PointTo(MatchFields(IgnoreExtras,
Fields{
"Name": EqualP("camel_k_reconciliation_duration_seconds"),
"Help": EqualP("Camel K reconciliation loop duration"),
@@ -215,7 +215,7 @@ func TestMetrics(t *testing.T) {
"RequestNamespace": Equal(ns),
"RequestName": Equal(operatorID),
}))
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check it matches the observation in the corresponding metric
platformReconciled := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -229,9 +229,9 @@ func TestMetrics(t *testing.T) {
label("tag", ""),
),
}))
- Expect(platformReconciled).NotTo(BeNil())
+ g.Expect(platformReconciled).NotTo(BeNil())
platformReconciledCount := *platformReconciled.Histogram.SampleCount
- Expect(platformReconciledCount).To(BeNumerically(">", 0))
+ g.Expect(platformReconciledCount).To(BeNumerically(">", 0))
platformRequeued := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
MatchFieldsP(IgnoreExtras, Fields{
@@ -265,7 +265,7 @@ func TestMetrics(t *testing.T) {
platformErroredCount = *platformErrored.Histogram.SampleCount
}
- Expect(platformReconciliations).To(BeNumerically("==", platformReconciledCount+platformRequeuedCount+platformErroredCount))
+ g.Expect(platformReconciliations).To(BeNumerically("==", platformReconciledCount+platformRequeuedCount+platformErroredCount))
// Count the number of Integration reconciliations
integrationReconciliations, err := counter.Count(MatchFields(IgnoreExtras, Fields{
@@ -274,8 +274,8 @@ func TestMetrics(t *testing.T) {
"RequestNamespace": Equal(it.Namespace),
"RequestName": Equal(it.Name),
}))
- Expect(err).To(BeNil())
- Expect(integrationReconciliations).To(BeNumerically(">", 0))
+ g.Expect(err).To(BeNil())
+ g.Expect(integrationReconciliations).To(BeNumerically(">", 0))
// Check it matches the observation in the corresponding metric
integrationReconciled := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -289,9 +289,9 @@ func TestMetrics(t *testing.T) {
label("tag", ""),
),
}))
- Expect(integrationReconciled).NotTo(BeNil())
+ g.Expect(integrationReconciled).NotTo(BeNil())
integrationReconciledCount := *integrationReconciled.Histogram.SampleCount
- Expect(integrationReconciledCount).To(BeNumerically(">", 0))
+ g.Expect(integrationReconciledCount).To(BeNumerically(">", 0))
integrationRequeued := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
MatchFieldsP(IgnoreExtras, Fields{
@@ -325,7 +325,7 @@ func TestMetrics(t *testing.T) {
integrationErroredCount = *integrationErrored.Histogram.SampleCount
}
- Expect(integrationReconciliations).To(BeNumerically("==", integrationReconciledCount+integrationRequeuedCount+integrationErroredCount))
+ g.Expect(integrationReconciliations).To(BeNumerically("==", integrationReconciledCount+integrationRequeuedCount+integrationErroredCount))
// Count the number of IntegrationKit reconciliations
integrationKitReconciliations, err := counter.Count(MatchFields(IgnoreExtras, Fields{
@@ -334,8 +334,8 @@ func TestMetrics(t *testing.T) {
"RequestNamespace": Equal(it.Status.IntegrationKit.Namespace),
"RequestName": Equal(it.Status.IntegrationKit.Name),
}))
- Expect(err).To(BeNil())
- Expect(integrationKitReconciliations).To(BeNumerically(">", 0))
+ g.Expect(err).To(BeNil())
+ g.Expect(integrationKitReconciliations).To(BeNumerically(">", 0))
// Check it matches the observation in the corresponding metric
integrationKitReconciled := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -349,9 +349,9 @@ func TestMetrics(t *testing.T) {
label("tag", ""),
),
}))
- Expect(integrationKitReconciled).NotTo(BeNil())
+ g.Expect(integrationKitReconciled).NotTo(BeNil())
integrationKitReconciledCount := *integrationKitReconciled.Histogram.SampleCount
- Expect(integrationKitReconciledCount).To(BeNumerically(">", 0))
+ g.Expect(integrationKitReconciledCount).To(BeNumerically(">", 0))
// Kit can be requeued, above all when a catalog needs to be built
integrationKitRequeued := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -371,7 +371,7 @@ func TestMetrics(t *testing.T) {
integrationKitRequeuedCount = *integrationKitRequeued.Histogram.SampleCount
}
- Expect(integrationKitReconciliations).To(BeNumerically("==", integrationKitReconciledCount+integrationKitRequeuedCount))
+ g.Expect(integrationKitReconciliations).To(BeNumerically("==", integrationKitReconciledCount+integrationKitRequeuedCount))
// Count the number of Build reconciliations
buildReconciliations, err := counter.Count(MatchFields(IgnoreExtras, Fields{
@@ -380,7 +380,7 @@ func TestMetrics(t *testing.T) {
"RequestNamespace": Equal(build.Namespace),
"RequestName": Equal(build.Name),
}))
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check it matches the observation in the corresponding metric
buildReconciled := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
@@ -394,9 +394,9 @@ func TestMetrics(t *testing.T) {
label("tag", ""),
),
}))
- Expect(buildReconciled).NotTo(BeNil())
+ g.Expect(buildReconciled).NotTo(BeNil())
buildReconciledCount := *buildReconciled.Histogram.SampleCount
- Expect(buildReconciledCount).To(BeNumerically(">", 0))
+ g.Expect(buildReconciledCount).To(BeNumerically(">", 0))
buildRequeued := getMetric(metrics["camel_k_reconciliation_duration_seconds"],
MatchFieldsP(IgnoreExtras, Fields{
@@ -414,7 +414,7 @@ func TestMetrics(t *testing.T) {
buildRequeuedCount = *buildRequeued.Histogram.SampleCount
}
- Expect(buildReconciliations).To(BeNumerically("==", buildReconciledCount+buildRequeuedCount))
+ g.Expect(buildReconciliations).To(BeNumerically("==", buildReconciledCount+buildRequeuedCount))
})
t.Run("Build queue duration metric", func(t *testing.T) {
@@ -432,27 +432,27 @@ func TestMetrics(t *testing.T) {
"RequestName": Equal(build.Name),
}), func(l *LogEntry) { ts2 = l.Timestamp }).
Walk()
- Expect(err).To(BeNil())
- Expect(ts1).NotTo(BeZero())
- Expect(ts2).NotTo(BeZero())
+ g.Expect(err).To(BeNil())
+ g.Expect(ts1).NotTo(BeZero())
+ g.Expect(ts2).NotTo(BeZero())
durationFromLogs := ts2.Sub(ts1)
// Retrieve the queuing duration from the metric
- Expect(metrics).To(HaveKey("camel_k_build_queue_duration_seconds"))
+ g.Expect(metrics).To(HaveKey("camel_k_build_queue_duration_seconds"))
metric := metrics["camel_k_build_queue_duration_seconds"].Metric
- Expect(metric).To(HaveLen(1))
+ g.Expect(metric).To(HaveLen(1))
histogram := metric[0].Histogram
- Expect(histogram).NotTo(BeNil())
- Expect(histogram.SampleSum).NotTo(BeNil())
+ g.Expect(histogram).NotTo(BeNil())
+ g.Expect(histogram.SampleSum).NotTo(BeNil())
duration := *histogram.SampleSum
// Check both durations match
- Expect(math.Abs(durationFromLogs.Seconds() - duration)).To(BeNumerically("<", 1))
+ g.Expect(math.Abs(durationFromLogs.Seconds() - duration)).To(BeNumerically("<", 1))
// Check the queuing duration is correctly observed in the corresponding metric
- Expect(metrics["camel_k_build_queue_duration_seconds"]).To(EqualP(
+ g.Expect(metrics["camel_k_build_queue_duration_seconds"]).To(EqualP(
prometheus.MetricFamily{
Name: stringP("camel_k_build_queue_duration_seconds"),
Help: stringP("Camel K build queue duration"),
@@ -478,10 +478,10 @@ func TestMetrics(t *testing.T) {
// The start time is taken from the Integration status initialization timestamp
ts1 = it.Status.InitializationTimestamp.Time
- Expect(ts1).NotTo(BeZero())
+ g.Expect(ts1).NotTo(BeZero())
// The end time is reported into the ready condition first truthy time
ts2 = it.Status.GetCondition(v1.IntegrationConditionReady).FirstTruthyTime.Time
- Expect(ts2).NotTo(BeZero())
+ g.Expect(ts2).NotTo(BeZero())
duration := ts2.Sub(ts1)
@@ -500,29 +500,29 @@ func TestMetrics(t *testing.T) {
"RequestName": Equal(it.Name),
}), func(l *LogEntry) { ts2 = l.Timestamp }).
Walk()
- Expect(err).To(BeNil())
- Expect(ts1).NotTo(BeZero())
- Expect(ts2).NotTo(BeZero())
- Expect(ts2).To(BeTemporally(">", ts1))
+ g.Expect(err).To(BeNil())
+ g.Expect(ts1).NotTo(BeZero())
+ g.Expect(ts2).NotTo(BeZero())
+ g.Expect(ts2).To(BeTemporally(">", ts1))
durationFromLogs := ts2.Sub(ts1)
// Check both durations match
- Expect(math.Abs((durationFromLogs - duration).Seconds())).To(BeNumerically("<=", 1))
+ g.Expect(math.Abs((durationFromLogs - duration).Seconds())).To(BeNumerically("<=", 1))
// Retrieve the first readiness duration from the metric
- Expect(metrics).To(HaveKey("camel_k_integration_first_readiness_seconds"))
+ g.Expect(metrics).To(HaveKey("camel_k_integration_first_readiness_seconds"))
metric := metrics["camel_k_integration_first_readiness_seconds"].Metric
- Expect(metric).To(HaveLen(1))
+ g.Expect(metric).To(HaveLen(1))
histogram := metric[0].Histogram
- Expect(histogram).NotTo(BeNil())
+ g.Expect(histogram).NotTo(BeNil())
// Check both durations match
d := duration.Seconds()
- Expect(math.Abs(*histogram.SampleSum - d)).To(BeNumerically("<=", 1))
+ g.Expect(math.Abs(*histogram.SampleSum - d)).To(BeNumerically("<=", 1))
// Check the duration is correctly observed in the corresponding metric
- Expect(metrics).To(HaveKey("camel_k_integration_first_readiness_seconds"))
- Expect(metrics["camel_k_integration_first_readiness_seconds"]).To(EqualP(
+ g.Expect(metrics).To(HaveKey("camel_k_integration_first_readiness_seconds"))
+ g.Expect(metrics["camel_k_integration_first_readiness_seconds"]).To(EqualP(
prometheus.MetricFamily{
Name: stringP("camel_k_integration_first_readiness_seconds"),
Help: stringP("Camel K integration time to first readiness"),
@@ -541,7 +541,7 @@ func TestMetrics(t *testing.T) {
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/platform_traits_test.go b/e2e/advanced/platform_traits_test.go
index 1f12d07a7..d62b32b46 100644
--- a/e2e/advanced/platform_traits_test.go
+++ b/e2e/advanced/platform_traits_test.go
@@ -38,46 +38,46 @@ import (
func TestTraitOnIntegrationPlatform(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-platform-trait-test"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
containerTestName := "testname"
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
ip := Platform(t, ns)()
ip.Spec.Traits = v1.Traits{Logging: &trait.LoggingTrait{Level: "DEBUG"}, Container: &trait.ContainerTrait{Name: containerTestName}}
if err := TestClient(t).Update(TestContext, ip); err != nil {
t.Fatal("Can't create IntegrationPlatform", err)
}
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
t.Run("Run integration with platform traits", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationPod(t, ns, name)().Spec.Containers[0].Name).To(BeEquivalentTo(containerTestName))
+ g.Expect(IntegrationPod(t, ns, name)().Spec.Containers[0].Name).To(BeEquivalentTo(containerTestName))
found := false
for _, env := range IntegrationPod(t, ns, name)().Spec.Containers[0].Env {
if env.Name == "QUARKUS_LOG_LEVEL" {
- Expect(env.Value).To(BeEquivalentTo("DEBUG"))
+ g.Expect(env.Value).To(BeEquivalentTo("DEBUG"))
found = true
break
}
}
- Expect(found).To(BeTrue(), "Can't find QUARKUS_LOG_LEVEL ENV variable")
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("DEBUG"))
+ g.Expect(found).To(BeTrue(), "Can't find QUARKUS_LOG_LEVEL ENV variable")
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("DEBUG"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/advanced/promote_test.go b/e2e/advanced/promote_test.go
index e5ea4ee52..0051dd0cb 100644
--- a/e2e/advanced/promote_test.go
+++ b/e2e/advanced/promote_test.go
@@ -39,12 +39,12 @@ func TestKamelCLIPromote(t *testing.T) {
one := int64(1)
two := int64(2)
// Dev environment namespace
- WithNewTestNamespace(t, func(nsDev string) {
+ WithNewTestNamespace(t, func(g *WithT, nsDev string) {
operatorDevID := "camel-k-cli-promote-dev"
- Expect(CopyCamelCatalog(t, nsDev, operatorDevID)).To(Succeed())
- Expect(CopyIntegrationKits(t, nsDev, operatorDevID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorDevID, nsDev).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, nsDev, operatorDevID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, nsDev, operatorDevID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorDevID, nsDev).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Dev content configmap
var cmData = make(map[string]string)
@@ -56,41 +56,41 @@ func TestKamelCLIPromote(t *testing.T) {
CreatePlainTextSecret(t, nsDev, "my-sec-promote", secData)
t.Run("plain integration dev", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route.groovy",
"--config", "configmap:my-cm-promote",
"--config", "secret:my-sec-promote",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&one))
- //Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
- Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret development"))
+ g.Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&one))
+ //g.Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
+ g.Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret development"))
})
t.Run("kamelet integration dev", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, nsDev, "my-own-timer-source")()).To(Succeed())
- Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsDev, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ g.Expect(CreateTimerKamelet(t, nsDev, "my-own-timer-source")()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsDev, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
})
t.Run("binding dev", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, nsDev, "kb-timer-source")()).To(Succeed())
- Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
+ g.Expect(CreateTimerKamelet(t, nsDev, "kb-timer-source")()).To(Succeed())
+ g.Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
})
// Prod environment namespace
- WithNewTestNamespace(t, func(nsProd string) {
+ WithNewTestNamespace(t, func(g *WithT, nsProd string) {
operatorProdID := "camel-k-cli-promote-prod"
- Expect(CopyCamelCatalog(t, nsProd, operatorProdID)).To(Succeed())
- Expect(CopyIntegrationKits(t, nsProd, operatorProdID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorProdID, nsProd).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, nsProd, operatorProdID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, nsProd, operatorProdID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorProdID, nsProd).Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("no configmap in destination", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
})
// Prod content configmap
@@ -99,7 +99,7 @@ func TestKamelCLIPromote(t *testing.T) {
CreatePlainTextConfigmap(t, nsProd, "my-cm-promote", cmData)
t.Run("no secret in destination", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).NotTo(Succeed())
})
// Prod secret
@@ -108,72 +108,72 @@ func TestKamelCLIPromote(t *testing.T) {
CreatePlainTextSecret(t, nsProd, "my-sec-promote", secData)
t.Run("plain integration promotion", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationObservedGeneration(t, nsProd, "promote-route")).Should(Equal(&one))
- Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production!"))
- Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret production"))
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
+ g.Eventually(IntegrationObservedGeneration(t, nsProd, "promote-route")).Should(Equal(&one))
+ g.Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production!"))
+ g.Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("very top secret production"))
// They must use the same image
- Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
+ g.Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
})
t.Run("plain integration promotion update", func(t *testing.T) {
// We need to update the Integration CR in order the operator to restart it both in dev and prod envs
- Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route-edited.groovy", "--name", "promote-route",
+ g.Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/promote-route-edited.groovy", "--name", "promote-route",
"--config", "configmap:my-cm-promote").Execute()).To(Succeed())
// The generation has to be incremented
- Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
- Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
+ g.Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
+ g.Eventually(IntegrationPodPhase(t, nsDev, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, nsDev, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, nsDev, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am development configmap!"))
// Update the configmap only in prod
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "I am production, but I was updated!"
UpdatePlainTextConfigmap(t, nsProd, "my-cm-promote", cmData)
// Promote the edited Integration
- Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "promote-route", "--to", nsProd).Execute()).To(Succeed())
// The generation has to be incremented also in prod
- Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
- Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production, but I was updated!"))
+ g.Eventually(IntegrationObservedGeneration(t, nsDev, "promote-route")).Should(Equal(&two))
+ g.Eventually(IntegrationPodPhase(t, nsProd, "promote-route"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, nsProd, "promote-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, nsProd, "promote-route"), TestTimeoutShort).Should(ContainSubstring("I am production, but I was updated!"))
// They must use the same image
- Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
+ g.Expect(IntegrationPodImage(t, nsProd, "promote-route")()).Should(Equal(IntegrationPodImage(t, nsDev, "promote-route")()))
})
t.Run("no kamelet in destination", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).NotTo(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).NotTo(Succeed())
})
t.Run("kamelet integration promotion", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, nsProd, "my-own-timer-source")()).To(Succeed())
- Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsProd, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsProd, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ g.Expect(CreateTimerKamelet(t, nsProd, "my-own-timer-source")()).To(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsProd, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsProd, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
// They must use the same image
- Expect(IntegrationPodImage(t, nsProd, "timer-kamelet-usage")()).Should(Equal(IntegrationPodImage(t, nsDev, "timer-kamelet-usage")()))
+ g.Expect(IntegrationPodImage(t, nsProd, "timer-kamelet-usage")()).Should(Equal(IntegrationPodImage(t, nsDev, "timer-kamelet-usage")()))
})
t.Run("no kamelet for binding in destination", func(t *testing.T) {
- Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
})
t.Run("binding promotion", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, nsProd, "kb-timer-source")()).To(Succeed())
- Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
+ g.Expect(CreateTimerKamelet(t, nsProd, "kb-timer-source")()).To(Succeed())
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
// They must use the same image
- Expect(IntegrationPodImage(t, nsProd, "kb-timer-source-to-log")()).Should(Equal(IntegrationPodImage(t, nsDev, "kb-timer-source-to-log")()))
+ g.Expect(IntegrationPodImage(t, nsProd, "kb-timer-source-to-log")()).Should(Equal(IntegrationPodImage(t, nsDev, "kb-timer-source-to-log")()))
//Binding update
- Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks-again").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
- Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
+ g.Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks-again").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
+ g.Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
})
})
})
diff --git a/e2e/advanced/reset_test.go b/e2e/advanced/reset_test.go
index 3c866768c..7e7a34504 100644
--- a/e2e/advanced/reset_test.go
+++ b/e2e/advanced/reset_test.go
@@ -35,60 +35,60 @@ import (
func TestKamelReset(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-cli-reset"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Reset the whole platform", func(t *testing.T) {
name := RandomizedSuffixName("yaml1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
- Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
+ g.Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
+ g.Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
- Expect(Integration(t, ns, name)()).To(BeNil())
- Expect(Kits(t, ns)()).To(HaveLen(0))
+ g.Expect(Integration(t, ns, name)()).To(BeNil())
+ g.Expect(Kits(t, ns)()).To(HaveLen(0))
})
t.Run("Reset skip-integrations", func(t *testing.T) {
name := RandomizedSuffixName("yaml2")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
- Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
+ g.Eventually(Kit(t, ns, IntegrationKit(t, ns, name)())).Should(Not(BeNil()))
+ g.Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel(t, "reset", "-n", ns, "--skip-integrations").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "reset", "-n", ns, "--skip-integrations").Execute()).To(Succeed())
- Expect(Integration(t, ns, name)()).To(Not(BeNil()))
- Expect(Kits(t, ns)()).To(HaveLen(0))
+ g.Expect(Integration(t, ns, name)()).To(Not(BeNil()))
+ g.Expect(Kits(t, ns)()).To(HaveLen(0))
})
t.Run("Reset skip-kits", func(t *testing.T) {
name := RandomizedSuffixName("yaml3")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
kitName := IntegrationKit(t, ns, name)()
- Eventually(Kit(t, ns, kitName)).Should(Not(BeNil()))
- Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
+ g.Eventually(Kit(t, ns, kitName)).Should(Not(BeNil()))
+ g.Eventually(Integration(t, ns, name)).Should(Not(BeNil()))
- Expect(Kamel(t, "reset", "-n", ns, "--skip-kits").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "reset", "-n", ns, "--skip-kits").Execute()).To(Succeed())
- Expect(Integration(t, ns, name)()).To(BeNil())
- Expect(Kit(t, ns, kitName)()).To(Not(BeNil()))
+ g.Expect(Integration(t, ns, name)()).To(BeNil())
+ g.Expect(Kit(t, ns, kitName)()).To(Not(BeNil()))
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/advanced/synthetic_test.go b/e2e/advanced/synthetic_test.go
index a1f25eeb4..972036019 100644
--- a/e2e/advanced/synthetic_test.go
+++ b/e2e/advanced/synthetic_test.go
@@ -37,89 +37,90 @@ import (
func TestSyntheticIntegrationOff(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Install Camel K without synthetic Integration feature variable (default)
operatorID := "camel-k-synthetic-env-off"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the external deployment
- ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
- Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
+ ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
+ g.Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
}))
// Label the deployment --> Verify the Integration is not created
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
+ g.Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
})
}
func TestSyntheticIntegrationFromDeployment(t *testing.T) {
- RegisterTestingT(t)
- WithNewTestNamespace(t, func(ns string) {
+ t.Parallel()
+
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Install Camel K with the synthetic Integration feature variable
operatorID := "camel-k-synthetic-env"
- Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", "CAMEL_K_SYNTHETIC_INTEGRATIONS=true",
).Execute()).To(Succeed())
// Run the external deployment
- ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
- Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
+ ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
+ g.Eventually(DeploymentCondition(t, ns, "my-camel-sb-svc", appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
}))
// Label the deployment --> Verify the Integration is created (cannot still monitor)
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationCondition(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionMonitoringPodsAvailableReason)))
// Label the deployment template --> Verify the Integration is monitored
- ExpectExecSucceed(t, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
- Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ ExpectExecSucceed(t, g, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
one := int32(1)
- Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Delete the deployment --> Verify the Integration is eventually garbage collected
- ExpectExecSucceed(t, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
- Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ ExpectExecSucceed(t, g, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
+ g.Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
// Recreate the deployment and label --> Verify the Integration is monitored
- ExpectExecSucceed(t, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- ExpectExecSucceed(t, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
- Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
+ ExpectExecSucceed(t, g, Kubectl("patch", "deployment", "my-camel-sb-svc", "--patch", `{"spec": {"template": {"metadata": {"labels": {"camel.apache.org/integration": "my-it"}}}}}`, "-n", ns))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Remove label from the deployment --> Verify the Integration is deleted
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration-", "-n", ns))
- Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration-", "-n", ns))
+ g.Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
// Add label back to the deployment --> Verify the Integration is created
- ExpectExecSucceed(t, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
+ ExpectExecSucceed(t, g, Kubectl("label", "deploy", "my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "my-it", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&one))
// Scale the deployment --> verify replicas are correctly set
- ExpectExecSucceed(t, Kubectl("scale", "deploy", "my-camel-sb-svc", "--replicas", "2", "-n", ns))
+ ExpectExecSucceed(t, g, Kubectl("scale", "deploy", "my-camel-sb-svc", "--replicas", "2", "-n", ns))
two := int32(2)
- Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&two))
+ g.Eventually(IntegrationStatusReplicas(t, ns, "my-it"), TestTimeoutShort).Should(Equal(&two))
// Delete Integration and deployments --> verify no Integration exists any longer
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- ExpectExecSucceed(t, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
- Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ ExpectExecSucceed(t, g, Kubectl("delete", "deploy", "my-camel-sb-svc", "-n", ns))
+ g.Eventually(Integration(t, ns, "my-it"), TestTimeoutShort).Should(BeNil())
})
}
diff --git a/e2e/advanced/tekton_test.go b/e2e/advanced/tekton_test.go
index 4f075a11c..448f4c7e0 100644
--- a/e2e/advanced/tekton_test.go
+++ b/e2e/advanced/tekton_test.go
@@ -35,14 +35,14 @@ import (
func TestTektonLikeBehavior(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
- Expect(CreateOperatorServiceAccount(t, ns)).To(Succeed())
- Expect(CreateOperatorRole(t, ns)).To(Succeed())
- Expect(CreateOperatorRoleBinding(t, ns)).To(Succeed())
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ g.Expect(CreateOperatorServiceAccount(t, ns)).To(Succeed())
+ g.Expect(CreateOperatorRole(t, ns)).To(Succeed())
+ g.Expect(CreateOperatorRoleBinding(t, ns)).To(Succeed())
- Eventually(OperatorPod(t, ns)).Should(BeNil())
- Expect(CreateKamelPod(t, ns, "tekton-task", "install", "--skip-cluster-setup", "--force")).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).Should(BeNil())
+ g.Expect(CreateKamelPod(t, ns, "tekton-task", "install", "--skip-cluster-setup", "--force")).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
})
}
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 709054b17..33498a5d1 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -42,8 +42,8 @@ type kitOptions struct {
}
func TestKitMaxBuildLimit(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, "8m0s", "--global", "--force")
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, "8m0s", "--global", "--force")
pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
@@ -58,8 +58,8 @@ func TestKitMaxBuildLimit(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- WithNewTestNamespace(t, func(ns1 string) {
- WithNewTestNamespace(t, func(ns2 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns1 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns2 string) {
pl1 := v1.NewIntegrationPlatform(ns1, fmt.Sprintf("camel-k-%s", ns))
pl.Spec.DeepCopyInto(&pl1.Spec)
pl1.Spec.Build.Maven.Settings = v1.ValueSource{}
@@ -69,7 +69,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
t.FailNow()
}
- Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
pl2 := v1.NewIntegrationPlatform(ns2, fmt.Sprintf("camel-k-%s", ns))
pl.Spec.DeepCopyInto(&pl2.Spec)
@@ -80,9 +80,9 @@ func TestKitMaxBuildLimit(t *testing.T) {
t.FailNow()
}
- Eventually(PlatformPhase(t, ns2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -92,7 +92,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildB, ns1, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildB, ns1, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -102,7 +102,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildC, ns2, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildC, ns2, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -119,7 +119,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
limit := 0
for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns1, buildB), BuildPhase(t, ns2, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ g.Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns1, buildB), BuildPhase(t, ns2, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
@@ -130,22 +130,22 @@ func TestKitMaxBuildLimit(t *testing.T) {
}
// verify that all builds are successful
- Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns1, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns2, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
})
})
}
func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, "8m0s", "--global", "--force")
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, "8m0s", "--global", "--force")
pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
@@ -160,7 +160,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -170,7 +170,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -180,7 +180,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -197,7 +197,7 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
limit := 0
for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ g.Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
@@ -208,18 +208,18 @@ func TestKitMaxBuildLimitFIFOStrategy(t *testing.T) {
}
// verify that all builds are successful
- Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
}
func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, "8m0s", "--global", "--force")
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, "8m0s", "--global", "--force")
pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
@@ -234,7 +234,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -244,7 +244,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:cron", "camel:log", "camel:joor",
@@ -254,7 +254,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log", "camel:joor", "camel:http",
@@ -271,7 +271,7 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
limit := 0
for limit < 5 && BuildPhase(t, ns, buildA)() == v1.BuildPhaseRunning {
// verify that number of running builds does not exceed max build limit
- Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
+ g.Consistently(BuildsRunning(BuildPhase(t, ns, buildA), BuildPhase(t, ns, buildB), BuildPhase(t, ns, buildC)), TestTimeoutShort, 10*time.Second).Should(Satisfy(notExceedsMaxBuildLimit))
limit++
}
@@ -282,18 +282,18 @@ func TestKitMaxBuildLimitDependencyMatchingStrategy(t *testing.T) {
}
// verify that all builds are successful
- Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildA), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildB), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
})
}
func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, "8m0s", "--global", "--force")
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, "8m0s", "--global", "--force")
pl := Platform(t, ns)()
// set maximum number of running builds and order strategy
@@ -308,7 +308,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- doKitBuildInNamespace(t, buildA, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildA, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log",
@@ -318,7 +318,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
},
}, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
- doKitBuildInNamespace(t, buildB, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildB, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:cron", "camel:log", "camel:joor",
@@ -328,7 +328,7 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
},
}, v1.BuildPhaseScheduling, v1.IntegrationKitPhaseNone)
- doKitBuildInNamespace(t, buildC, ns, TestTimeoutShort, kitOptions{
+ doKitBuildInNamespace(t, g, buildC, ns, TestTimeoutShort, kitOptions{
operatorID: fmt.Sprintf("camel-k-%s", ns),
dependencies: []string{
"camel:timer", "camel:log", "camel:joor", "camel:http",
@@ -339,23 +339,23 @@ func TestMaxBuildLimitWaitingBuilds(t *testing.T) {
}, v1.BuildPhaseScheduling, v1.IntegrationKitPhaseNone)
// verify that last build is waiting
- Eventually(BuildConditions(t, ns, buildC), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(BuildConditions(t, ns, buildC), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(
BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(
+ g.Eventually(
BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Reason,
TestTimeoutShort).Should(Equal(v1.BuildConditionWaitingReason))
// verify that last build is scheduled
- Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(BuildPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(KitPhase(t, ns, buildC), TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildConditions(t, ns, buildC), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(BuildConditions(t, ns, buildC), TestTimeoutLong).ShouldNot(BeNil())
+ g.Eventually(
BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
+ g.Eventually(
BuildCondition(t, ns, buildC, v1.BuildConditionType(v1.BuildConditionScheduled))().Reason,
TestTimeoutShort).Should(Equal(v1.BuildConditionReadyReason))
})
@@ -392,22 +392,22 @@ func doKitFullBuild(t *testing.T, name string, buildTimeout string, testTimeout
options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
t.Helper()
- WithNewTestNamespace(t, func(ns string) {
- createOperator(t, ns, buildTimeout)
- doKitBuildInNamespace(t, name, ns, testTimeout, options, buildPhase, kitPhase)
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ createOperator(t, g, ns, buildTimeout)
+ doKitBuildInNamespace(t, g, name, ns, testTimeout, options, buildPhase, kitPhase)
})
}
-func createOperator(t *testing.T, ns string, buildTimeout string, installArgs ...string) {
+func createOperator(t *testing.T, g *WithT, ns string, buildTimeout string, installArgs ...string) {
args := []string{"--build-timeout", buildTimeout}
args = append(args, installArgs...)
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, args...).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, args...).Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
}
-func doKitBuildInNamespace(t *testing.T, name string, ns string, testTimeout time.Duration, options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
+func doKitBuildInNamespace(t *testing.T, g *WithT, name string, ns string, testTimeout time.Duration, options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
buildKitArgs := []string{"kit", "create", name, "-n", ns}
for _, dependency := range options.dependencies {
@@ -423,13 +423,13 @@ func doKitBuildInNamespace(t *testing.T, name string, ns string, testTimeout tim
buildKitArgs = append(buildKitArgs, "--operator-id", fmt.Sprintf("camel-k-%s", ns))
}
- Expect(Kamel(t, buildKitArgs...).Execute()).To(Succeed())
+ g.Expect(Kamel(t, buildKitArgs...).Execute()).To(Succeed())
- Eventually(Build(t, ns, name), testTimeout).ShouldNot(BeNil())
+ g.Eventually(Build(t, ns, name), testTimeout).ShouldNot(BeNil())
if buildPhase != v1.BuildPhaseNone {
- Eventually(BuildPhase(t, ns, name), testTimeout).Should(Equal(buildPhase))
+ g.Eventually(BuildPhase(t, ns, name), testTimeout).Should(Equal(buildPhase))
}
if kitPhase != v1.IntegrationKitPhaseNone {
- Eventually(KitPhase(t, ns, name), testTimeout).Should(Equal(kitPhase))
+ g.Eventually(KitPhase(t, ns, name), testTimeout).Should(Equal(kitPhase))
}
}
diff --git a/e2e/builder/registry_test.go b/e2e/builder/registry_test.go
index 1d4c5b3bf..e61b72dbc 100644
--- a/e2e/builder/registry_test.go
+++ b/e2e/builder/registry_test.go
@@ -41,9 +41,9 @@ func TestRunWithDockerHubRegistry(t *testing.T) {
return
}
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-docker-hub"
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--registry", "docker.io",
"--organization", user,
"--registry-auth-username", user,
@@ -51,12 +51,12 @@ func TestRunWithDockerHubRegistry(t *testing.T) {
"--cluster-type", "kubernetes").
Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.io"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.io"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -69,9 +69,9 @@ func TestRunWithGithubPackagesRegistry(t *testing.T) {
return
}
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-github-registry"
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--registry", "docker.pkg.github.com",
"--organization", repo,
"--registry-auth-username", user,
@@ -79,11 +79,11 @@ func TestRunWithGithubPackagesRegistry(t *testing.T) {
"--cluster-type", "kubernetes").
Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.pkg.github.com"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodImage(t, ns, "groovy"), TestTimeoutShort).Should(HavePrefix("docker.pkg.github.com"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index 45dd4c265..ed98095c8 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -33,34 +33,34 @@ import (
)
func TestKamelCLIBind(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
kameletName := "test-timer-source"
- Expect(CreateTimerKamelet(t, ns, kameletName)()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, kameletName)()).To(Succeed())
t.Run("bind timer to log", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
- Expect(KamelBindWithID(t, operatorID, ns, "test-timer-source", "log:info", "-p", "source.message=newText").Execute()).To(Succeed())
- Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, "test-timer-source", "log:info", "-p", "source.message=newText").Execute()).To(Succeed())
+ g.Eventually(IntegrationLogs(t, ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
})
t.Run("unsuccessful binding, no property", func(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- Expect(KamelBindWithID(t, operatorID, ns, opns+"/timer-source", "log:info").Execute()).NotTo(Succeed())
+ g.Expect(KamelBindWithID(t, operatorID, ns, opns+"/timer-source", "log:info").Execute()).NotTo(Succeed())
})
t.Run("bind uris", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "timer-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "timer-to-log")).Should(ContainSubstring("Body is null"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "timer-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "timer-to-log")).Should(ContainSubstring("Body is null"))
})
t.Run("bind with custom SA", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar", "--service-account", "my-service-account").Execute()).To(Succeed())
- Eventually(IntegrationSpecSA(t, ns, "timer-to-log")).Should(Equal("my-service-account"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar", "--service-account", "my-service-account").Execute()).To(Succeed())
+ g.Eventually(IntegrationSpecSA(t, ns, "timer-to-log")).Should(Equal("my-service-account"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/config_test.go b/e2e/common/cli/config_test.go
index 476a1ff85..46c2a560e 100644
--- a/e2e/common/cli/config_test.go
+++ b/e2e/common/cli/config_test.go
@@ -39,30 +39,30 @@ import (
)
func TestKamelCLIConfig(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("check default namespace", func(t *testing.T) {
_, err := os.Stat(cmd.DefaultConfigLocation)
assert.True(t, os.IsNotExist(err), "No file at "+cmd.DefaultConfigLocation+" was expected")
t.Cleanup(func() { os.Remove(cmd.DefaultConfigLocation) })
- Expect(Kamel(t, "config", "--default-namespace", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "config", "--default-namespace", ns).Execute()).To(Succeed())
_, err = os.Stat(cmd.DefaultConfigLocation)
require.NoError(t, err, "A file at "+cmd.DefaultConfigLocation+" was expected")
- Expect(Kamel(t, "run", "--operator-id", operatorID, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "run", "--operator-id", operatorID, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// first line of the integration logs
logs := strings.Split(IntegrationLogs(t, ns, "yaml")(), "\n")[0]
podName := IntegrationPod(t, ns, "yaml")().Name
logsCLI := GetOutputStringAsync(Kamel(t, "log", "yaml"))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(logs))
+ g.Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ g.Eventually(logsCLI).Should(ContainSubstring(logs))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/delete_test.go b/e2e/common/cli/delete_test.go
index 6726f145c..cba51eef2 100644
--- a/e2e/common/cli/delete_test.go
+++ b/e2e/common/cli/delete_test.go
@@ -33,47 +33,47 @@ import (
)
func TestKamelCLIDelete(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("delete running integration", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete building integration", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete several integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
- Expect(Kamel(t, "delete", "java", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(Kamel(t, "delete", "yaml", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ g.Expect(Kamel(t, "delete", "java", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "java")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
})
t.Run("delete all integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
- Eventually(Integration(t, ns, "java")).Should(BeNil())
- Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, "yaml")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "yaml"), TestTimeoutLong).Should(BeNil())
+ g.Eventually(Integration(t, ns, "java")).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, "java"), TestTimeoutLong).Should(BeNil())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index c4105efdb..4e175c679 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -36,21 +36,21 @@ import (
)
func TestKamelCliDescribe(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
t.Run("Test kamel describe integration", func(t *testing.T) {
integration := GetOutputString(Kamel(t, "describe", "integration", "yaml", "-n", ns))
r, _ := regexp.Compile("(?sm).*Name:\\s+yaml.*")
- Expect(integration).To(MatchRegexp(r.String()))
+ g.Expect(integration).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Phase:\\s+Running.*")
- Expect(integration).To(MatchRegexp(r.String()))
+ g.Expect(integration).To(MatchRegexp(r.String()))
- Expect(integration).To(ContainSubstring("Dependencies:"))
- Expect(integration).To(ContainSubstring("Conditions:"))
+ g.Expect(integration).To(ContainSubstring("Dependencies:"))
+ g.Expect(integration).To(ContainSubstring("Conditions:"))
})
t.Run("Test kamel describe integration kit", func(t *testing.T) {
@@ -59,29 +59,29 @@ func TestKamelCliDescribe(t *testing.T) {
kit := GetOutputString(Kamel(t, "describe", "kit", kitName, "-n", kitNamespace))
r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + kitNamespace + ".*")
- Expect(kit).To(MatchRegexp(r.String()))
+ g.Expect(kit).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
- Expect(kit).To(MatchRegexp(r.String()))
+ g.Expect(kit).To(MatchRegexp(r.String()))
- Expect(kit).To(ContainSubstring("camel-quarkus-core"))
+ g.Expect(kit).To(ContainSubstring("camel-quarkus-core"))
- Expect(kit).To(ContainSubstring("Artifacts:"))
- Expect(kit).To(ContainSubstring("Dependencies:"))
+ g.Expect(kit).To(ContainSubstring("Artifacts:"))
+ g.Expect(kit).To(ContainSubstring("Dependencies:"))
})
t.Run("Test kamel describe integration platform", func(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
platform := GetOutputString(Kamel(t, "describe", "platform", operatorID, "-n", opns))
- Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
+ g.Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + opns + ".*")
- Expect(platform).To(MatchRegexp(r.String()))
+ g.Expect(platform).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
- Expect(platform).To(MatchRegexp(r.String()))
+ g.Expect(platform).To(MatchRegexp(r.String()))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go
index 57041d6f6..6bfd136d7 100644
--- a/e2e/common/cli/dev_mode_test.go
+++ b/e2e/common/cli/dev_mode_test.go
@@ -37,7 +37,7 @@ import (
)
func TestRunDevMode(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
/*
* TODO
* The changing of the yaml file constant from "string" to "magic" is not being
@@ -50,7 +50,6 @@ func TestRunDevMode(t *testing.T) {
}
t.Run("run yaml dev mode", func(t *testing.T) {
- RegisterTestingT(t)
ctx, cancel := context.WithCancel(TestContext)
defer cancel()
piper, pipew := io.Pipe()
@@ -71,16 +70,15 @@ func TestRunDevMode(t *testing.T) {
os.Args = []string{"kamel", "run", "-n", ns, "--operator-id", operatorID, file, "--name", name, "--dev"}
go kamelRun.Execute()
- Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), TestTimeoutMedium).Should(BeTrue())
- Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
- Expect(logScanner.IsFound("Magicjordan!")()).To(BeFalse())
+ g.Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), TestTimeoutMedium).Should(BeTrue())
+ g.Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
+ g.Expect(logScanner.IsFound("Magicjordan!")()).To(BeFalse())
util.ReplaceInFile(t, file, "string!", "jordan!")
- Eventually(logScanner.IsFound("Magicjordan!"), TestTimeoutMedium).Should(BeTrue())
+ g.Eventually(logScanner.IsFound("Magicjordan!"), TestTimeoutMedium).Should(BeTrue())
})
t.Run("run yaml remote dev mode", func(t *testing.T) {
- RegisterTestingT(t)
ctx, cancel := context.WithCancel(TestContext)
defer cancel()
piper, pipew := io.Pipe()
@@ -101,7 +99,7 @@ func TestRunDevMode(t *testing.T) {
go kamelRun.Execute()
- Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
+ g.Eventually(logScanner.IsFound("Magicstring!"), TestTimeoutMedium).Should(BeTrue())
})
// This test makes sure that `kamel run --dev` runs in seconds after initial build is
@@ -113,16 +111,15 @@ func TestRunDevMode(t *testing.T) {
* why it does not finish in a few seconds and remove the bottlenecks which are lagging
* the integration startup.
*/
- RegisterTestingT(t)
name := RandomizedSuffixName("yaml")
// First run (warm up)
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name)).Should(BeNil())
- Eventually(IntegrationPod(t, ns, name), TestTimeoutMedium).Should(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name)).Should(BeNil())
+ g.Eventually(IntegrationPod(t, ns, name), TestTimeoutMedium).Should(BeNil())
// Second run (rebuild)
ctx, cancel := context.WithCancel(TestContext)
@@ -147,10 +144,10 @@ func TestRunDevMode(t *testing.T) {
// Second run should start up within a few seconds
timeout := 10 * time.Second
- Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), timeout).Should(BeTrue())
- Eventually(logScanner.IsFound("Magicstring!"), timeout).Should(BeTrue())
+ g.Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), timeout).Should(BeTrue())
+ g.Eventually(logScanner.IsFound("Magicstring!"), timeout).Should(BeTrue())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/duplicate_parameters_test.go b/e2e/common/cli/duplicate_parameters_test.go
index ae0345216..5a1f54618 100644
--- a/e2e/common/cli/duplicate_parameters_test.go
+++ b/e2e/common/cli/duplicate_parameters_test.go
@@ -33,7 +33,7 @@ import (
)
func TestDuplicateParameters(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
ctx, cancel := context.WithCancel(TestContext)
defer cancel()
@@ -48,11 +48,9 @@ func TestDuplicateParameters(t *testing.T) {
comm, _, _ := cmd.NewKamelWithModelineCommand(ctx, cmdParams)
// the command is executed inside GetOutputString function
- commOutput := GetOutputString(&KamelCLI{
- Command: comm,
- })
+ commOutput := GetOutputString(comm)
outParams :=
`"traits":{"affinity":{"enabled":true},"camel":{"properties":["prop1 = true","prop2 = true","foo = bar"]},"pull-secret":{"enabled":true},"addons":{"telemetry":{"enabled":true}}}`
- Expect(commOutput).To(ContainSubstring(outParams))
+ g.Expect(commOutput).To(ContainSubstring(outParams))
}
diff --git a/e2e/common/cli/get_test.go b/e2e/common/cli/get_test.go
index 4732c56af..2ab5cc504 100644
--- a/e2e/common/cli/get_test.go
+++ b/e2e/common/cli/get_test.go
@@ -34,46 +34,46 @@ import (
)
func TestKamelCLIGet(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("get integration", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
// regex is used for the compatibility of tests between OC and vanilla K8
// kamel get may have different output depending on the platform
- Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
kitName := IntegrationKit(t, ns, "yaml")()
kitNamespace := IntegrationKitNamespace(t, ns, "yaml")()
regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*yaml\tRunning\t(%s/%s|%s)", kitNamespace, kitName, kitName)
- Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
+ g.Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("get several integrations", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationKit(t, ns, "java")).ShouldNot(Equal(""))
- Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, "java")).ShouldNot(Equal(""))
+ g.Eventually(IntegrationKit(t, ns, "yaml")).ShouldNot(Equal(""))
kitName1 := IntegrationKit(t, ns, "java")()
kitName2 := IntegrationKit(t, ns, "yaml")()
kitNamespace1 := IntegrationKitNamespace(t, ns, "java")()
kitNamespace2 := IntegrationKitNamespace(t, ns, "yaml")()
regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*java\tRunning\t"+
"(%s/%s|%s)\n\\s*yaml\tRunning\t(%s/%s|%s)\n", kitNamespace1, kitName1, kitName1, kitNamespace2, kitName2, kitName2)
- Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
+ g.Expect(GetOutputString(Kamel(t, "get", "-n", ns))).To(MatchRegexp(regex))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("get no integrations", func(t *testing.T) {
- Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Running"))
- Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Building Kit"))
+ g.Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Running"))
+ g.Expect(GetOutputString(Kamel(t, "get", "-n", ns))).NotTo(ContainSubstring("Building Kit"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/help_test.go b/e2e/common/cli/help_test.go
index 2507b6ec4..cdb6eab54 100644
--- a/e2e/common/cli/help_test.go
+++ b/e2e/common/cli/help_test.go
@@ -31,27 +31,27 @@ import (
)
func TestKamelCLIHelp(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("default help message", func(t *testing.T) {
helpMsg := GetOutputString(Kamel(t, "help"))
- Expect(helpMsg).To(ContainSubstring("Apache Camel K is a lightweight integration platform, born on Kubernetes"))
- Expect(helpMsg).To(ContainSubstring("Usage:"))
- Expect(helpMsg).To(ContainSubstring("Available Commands:"))
- Expect(helpMsg).To(ContainSubstring("Flags:"))
+ g.Expect(helpMsg).To(ContainSubstring("Apache Camel K is a lightweight integration platform, born on Kubernetes"))
+ g.Expect(helpMsg).To(ContainSubstring("Usage:"))
+ g.Expect(helpMsg).To(ContainSubstring("Available Commands:"))
+ g.Expect(helpMsg).To(ContainSubstring("Flags:"))
})
t.Run("'get' command help (short flag)", func(t *testing.T) {
helpMsg := GetOutputString(Kamel(t, "get", "-h"))
- Expect(helpMsg).To(ContainSubstring("Get the status of integrations deployed on Kubernetes"))
- Expect(helpMsg).To(ContainSubstring("Usage:"))
- Expect(helpMsg).To(ContainSubstring("Flags:"))
+ g.Expect(helpMsg).To(ContainSubstring("Get the status of integrations deployed on Kubernetes"))
+ g.Expect(helpMsg).To(ContainSubstring("Usage:"))
+ g.Expect(helpMsg).To(ContainSubstring("Flags:"))
})
t.Run("'bind' command help (long flag)", func(t *testing.T) {
helpMsg := GetOutputString(Kamel(t, "bind", "--help"))
- Expect(helpMsg).To(ContainSubstring("Bind Kubernetes resources, such as Kamelets, in an integration flow."))
- Expect(helpMsg).To(ContainSubstring("kamel bind [source] [sink] ... [flags]"))
- Expect(helpMsg).To(ContainSubstring("Global Flags:"))
+ g.Expect(helpMsg).To(ContainSubstring("Bind Kubernetes resources, such as Kamelets, in an integration flow."))
+ g.Expect(helpMsg).To(ContainSubstring("kamel bind [source] [sink] ... [flags]"))
+ g.Expect(helpMsg).To(ContainSubstring("Global Flags:"))
})
}
diff --git a/e2e/common/cli/log_test.go b/e2e/common/cli/log_test.go
index d2baf7c45..50258be0b 100644
--- a/e2e/common/cli/log_test.go
+++ b/e2e/common/cli/log_test.go
@@ -32,26 +32,26 @@ import (
)
func TestKamelCLILog(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("check integration log", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "log-yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "log-yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
// first line of the integration logs
firstLine := strings.Split(IntegrationLogs(t, ns, "log-yaml")(), "\n")[0]
podName := IntegrationPod(t, ns, "log-yaml")().Name
logsCLI := GetOutputStringAsync(Kamel(t, "log", "log-yaml", "-n", ns))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(firstLine))
+ g.Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ g.Eventually(logsCLI).Should(ContainSubstring(firstLine))
logs := strings.Split(IntegrationLogs(t, ns, "log-yaml")(), "\n")
lastLine := logs[len(logs)-1]
logsCLI = GetOutputStringAsync(Kamel(t, "log", "log-yaml", "-n", ns, "--tail", "5"))
- Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
- Eventually(logsCLI).Should(ContainSubstring(lastLine))
+ g.Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ g.Eventually(logsCLI).Should(ContainSubstring(lastLine))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/cli/offline_commands_test.go b/e2e/common/cli/offline_commands_test.go
index 5a5e7d32d..6ee536e6d 100644
--- a/e2e/common/cli/offline_commands_test.go
+++ b/e2e/common/cli/offline_commands_test.go
@@ -26,33 +26,30 @@ import (
"io"
"testing"
- "github.com/stretchr/testify/assert"
-
. "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
)
func TestKamelVersionWorksOffline(t *testing.T) {
- RegisterTestingT(t)
-
- assert.Nil(t, Kamel(t, "version", "--kube-config", "non-existent-kubeconfig-file").Execute())
+ g := NewWithT(t)
+ g.Expect(Kamel(t, "version", "--kube-config", "non-existent-kubeconfig-file").Execute()).To(Succeed())
}
func TestKamelHelpOptionWorksOffline(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
traitCmd := Kamel(t, "run", "Xxx.java", "--help")
traitCmd.SetOut(io.Discard)
- assert.Nil(t, traitCmd.Execute())
+ g.Expect(traitCmd.Execute()).To(Succeed())
}
func TestKamelCompletionWorksOffline(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
bashCmd := Kamel(t, "completion", "bash", "--kube-config", "non-existent-kubeconfig-file")
bashCmd.SetOut(io.Discard)
zshCmd := Kamel(t, "completion", "zsh", "--kube-config", "non-existent-kubeconfig-file")
zshCmd.SetOut(io.Discard)
- assert.Nil(t, bashCmd.Execute())
- assert.Nil(t, zshCmd.Execute())
+ g.Expect(bashCmd.Execute()).To(Succeed())
+ g.Expect(zshCmd.Execute()).To(Succeed())
}
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index 7bcf6f7b6..bf95dc437 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -39,38 +39,38 @@ import (
var sampleJar = "https://raw.githubusercontent.com/apache/camel-k/main/e2e/common/traits/files/jvm/sample-1.0.jar"
func TestKamelCLIRun(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Examples from GitHub", func(t *testing.T) {
t.Run("Java", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"github:apache/camel-k-examples/generic-examples/languages/Sample.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java (RAW)", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java").Execute()).
To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java (branch)", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"github:apache/camel-k-examples/generic-examples/languages/Sample.java?branch=main").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, "sample"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "sample", v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, "sample"), TestTimeoutShort).Should(ContainSubstring("Hello Camel K!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// GIST does not like GITHUB_TOKEN apparently, we must temporarily remove it
@@ -79,26 +79,26 @@ func TestKamelCLIRun(t *testing.T) {
t.Run("Gist (ID)", func(t *testing.T) {
name := RandomizedSuffixName("github-gist-id")
- Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
"gist:e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Gist (URL)", func(t *testing.T) {
name := RandomizedSuffixName("github-gist-url")
- Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", name,
"https://gist.github.com/lburgazzoli/e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Tick!"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// Revert GITHUB TOKEN
@@ -106,80 +106,80 @@ func TestKamelCLIRun(t *testing.T) {
os.Unsetenv("GITHUB_TOKEN_TMP")
// Clean up
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Run and update", func(t *testing.T) {
name := RandomizedSuffixName("run")
- Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic default"))
// Re-run the Integration with an updated configuration
- Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name, "-p", "property=value").Execute()).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/run.yaml", "--name", name, "-p", "property=value").Execute()).
To(Succeed())
// Check the Deployment has progressed successfully
- Eventually(DeploymentCondition(t, ns, name, appsv1.DeploymentProgressing), TestTimeoutShort).
+ g.Eventually(DeploymentCondition(t, ns, name, appsv1.DeploymentProgressing), TestTimeoutShort).
Should(MatchFields(IgnoreExtras, Fields{
"Status": Equal(corev1.ConditionTrue),
"Reason": Equal("NewReplicaSetAvailable"),
}))
// Check the new configuration is taken into account
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic value"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magic value"))
// Clean up
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Run with glob patterns", func(t *testing.T) {
t.Run("YAML", func(t *testing.T) {
name := RandomizedSuffixName("run")
- Expect(KamelRunWithID(t, operatorID, ns, "files/glob/run*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/glob/run*", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("Java", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/glob/Java*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/glob/Java*", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
t.Run("All", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/glob/*", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/glob/*", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 1 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello run 2 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 1 default"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Hello java 2 default"))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
// Clean up
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
})
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
/*
* TODO
* The dependency cannot be read by maven while building. See #3708
@@ -192,19 +192,21 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID(t, "local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
"-d", sampleJar,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
})
+
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
/*
* TODO
* The dependency cannot be read by maven while building. See #3708
@@ -217,18 +219,18 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- Expect(KamelInstallWithID(t, "local-platform", ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
"-d", sampleJar,
"-d", "https://raw.githubusercontent.com/apache/camel-k-examples/main/generic-examples/languages/Sample.java|targetPath=/tmp/foo",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
- Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
+ g.Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(DeleteIntegrations(t, ns), TestTimeoutLong).Should(Equal(0))
})
}
diff --git a/e2e/common/cli/version_test.go b/e2e/common/cli/version_test.go
index 6b8e5deae..488ee7a03 100644
--- a/e2e/common/cli/version_test.go
+++ b/e2e/common/cli/version_test.go
@@ -32,10 +32,10 @@ import (
)
func TestKamelCLIVersion(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("check version correctness", func(t *testing.T) {
version := GetOutputString(Kamel(t, "version"))
- Expect(version).To(ContainSubstring(defaults.Version))
+ g.Expect(version).To(ContainSubstring(defaults.Version))
})
}
diff --git a/e2e/common/config/config_reload_test.go b/e2e/common/config/config_reload_test.go
index 9e0a3bcbf..a40361f6d 100644
--- a/e2e/common/config/config_reload_test.go
+++ b/e2e/common/config/config_reload_test.go
@@ -37,7 +37,7 @@ import (
func TestConfigmapHotReload(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("config-configmap-route")
@@ -45,7 +45,7 @@ func TestConfigmapHotReload(t *testing.T) {
cmData["my-configmap-key"] = "my configmap content"
CreatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"./files/config-configmap-route.groovy",
"--config",
"configmap:my-hot-cm",
@@ -54,20 +54,20 @@ func TestConfigmapHotReload(t *testing.T) {
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
UpdatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content updated"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestConfigmapHotReloadDefault(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("config-configmap-route")
@@ -75,26 +75,26 @@ func TestConfigmapHotReloadDefault(t *testing.T) {
cmData["my-configmap-key"] = "my configmap content"
CreatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
"--config",
"configmap:my-hot-cm-2",
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
UpdatePlainTextConfigmapWithLabels(t, ns, "my-hot-cm-2", cmData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(Not(ContainSubstring("my configmap content updated")))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestSecretHotReload(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("config-secret-route")
@@ -102,7 +102,7 @@ func TestSecretHotReload(t *testing.T) {
secData["my-secret-key"] = "very top secret"
CreatePlainTextSecretWithLabels(t, ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy",
"--config",
"secret:my-hot-sec",
"-t",
@@ -110,15 +110,15 @@ func TestSecretHotReload(t *testing.T) {
"--name",
name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret"))
secData["my-secret-key"] = "very top secret updated"
UpdatePlainTextSecretWithLabels(t, ns, "my-hot-sec", secData, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("very top secret updated"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
@@ -131,11 +131,11 @@ func TestConfigmapWithOwnerRefHotReload(t *testing.T) {
}
func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("config-configmap-route")
cmName := RandomizedSuffixName("my-hot-cm-")
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy",
"--config",
"configmap:"+cmName,
"--name",
@@ -144,19 +144,19 @@ func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
"mount.hot-reload="+strconv.FormatBool(hotreload),
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my configmap content"
CreatePlainTextConfigmapWithOwnerRefWithLabels(t, ns, cmName, cmData, name, Integration(t, ns, name)().UID, map[string]string{"camel.apache.org/integration": "test"})
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content"))
cmData["my-configmap-key"] = "my configmap content updated"
UpdatePlainTextConfigmapWithLabels(t, ns, cmName, cmData, map[string]string{"camel.apache.org/integration": "test"})
if hotreload {
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content updated"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("my configmap content updated"))
} else {
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(Not(ContainSubstring("my configmap content updated")))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(Not(ContainSubstring("my configmap content updated")))
}
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index 0d8f8fb21..30fb00f3a 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -37,30 +37,30 @@ import (
func TestRunConfigExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Simple property", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
- Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "my.message=test-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("test-property"))
+ g.Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property file", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "--property", "file:./files/my.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
- Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "--property", "file:./files/my.properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
+ g.Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property precedence", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "-p", "my.key.2=universe", "-p", "file:./files/my.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello universe"))
- Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-file-route.groovy", "-p", "my.key.2=universe", "-p", "file:./files/my.properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-file-route"), TestTimeoutShort).Should(ContainSubstring("hello universe"))
+ g.Expect(Kamel(t, "delete", "property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from ConfigMap", func(t *testing.T) {
@@ -68,11 +68,11 @@ func TestRunConfigExamples(t *testing.T) {
cmData["my.message"] = "my-configmap-property-value"
CreatePlainTextConfigmap(t, ns, "my-cm-test-property", cmData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
- Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-value"))
+ g.Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from ConfigMap as property file", func(t *testing.T) {
@@ -80,11 +80,11 @@ func TestRunConfigExamples(t *testing.T) {
cmData["my.properties"] = "my.message=my-configmap-property-entry"
CreatePlainTextConfigmap(t, ns, "my-cm-test-properties", cmData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-entry"))
- Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "configmap:my-cm-test-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-configmap-property-entry"))
+ g.Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from Secret", func(t *testing.T) {
@@ -92,11 +92,11 @@ func TestRunConfigExamples(t *testing.T) {
secData["my.message"] = "my-secret-property-value"
CreatePlainTextSecret(t, ns, "my-sec-test-property", secData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
- Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
+ g.Expect(Kamel(t, "delete", "property-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Property from Secret as property file", func(t *testing.T) {
@@ -104,10 +104,10 @@ func TestRunConfigExamples(t *testing.T) {
secData["my.properties"] = "my.message=my-secret-property-entry"
CreatePlainTextSecret(t, ns, "my-sec-test-properties", secData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-entry"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-route.groovy", "-p", "secret:my-sec-test-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-entry"))
})
t.Run("Property from Secret inlined", func(t *testing.T) {
@@ -116,23 +116,23 @@ func TestRunConfigExamples(t *testing.T) {
CreatePlainTextSecret(t, ns, "my-sec-inlined", secData)
// TODO: remove jvm.options trait as soon as CAMEL-20054 gets fixed
- Expect(KamelRunWithID(t, operatorID, ns, "./files/property-secret-route.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/property-secret-route.groovy",
"-t", "mount.configs=secret:my-sec-inlined",
"-t", "jvm.options=-Dcamel.k.mount-path.secrets=/etc/camel/conf.d/_secrets",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
+ g.Eventually(IntegrationPodPhase(t, ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "property-secret-route")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "property-secret-route")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "property-secret-route")()
mountTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "mount")
- Expect(mountTrait).ToNot(BeNil())
- Expect(len(mountTrait)).To(Equal(1))
- Expect(mountTrait["configs"]).ToNot(BeNil())
+ g.Expect(mountTrait).ToNot(BeNil())
+ g.Expect(len(mountTrait)).To(Equal(1))
+ g.Expect(mountTrait["configs"]).ToNot(BeNil())
- Expect(Kamel(t, "delete", "property-secret-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "property-secret-route", "-n", ns).Execute()).To(Succeed())
})
@@ -150,38 +150,38 @@ func TestRunConfigExamples(t *testing.T) {
CreatePlainTextConfigmap(t, ns, "my-cm-multi", cmDataMulti)
t.Run("Config configmap", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "config-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "config-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-route.groovy", "--config", "configmap:my-cm").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "config-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "config-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "config-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap", func(t *testing.T) {
// We can reuse the configmap created previously
- Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-route.groovy", "--resource", "configmap:my-cm").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "resource-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-route.groovy", "--resource", "configmap:my-cm").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "resource-configmap-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "resource-configmap-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap with destination", func(t *testing.T) {
// We can reuse the configmap created previously
- Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-location-route.groovy", "--resource", "configmap:my-cm@/tmp/app").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "resource-configmap-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "resource-configmap-location-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-location-route.groovy", "--resource", "configmap:my-cm@/tmp/app").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "resource-configmap-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "resource-configmap-location-route"), TestTimeoutShort).Should(ContainSubstring(cmData["my-configmap-key"]))
})
t.Run("Resource configmap with filtered key and destination", func(t *testing.T) {
// We'll use the configmap contaning 2 values filtering only 1 key
- Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-key-location-route.groovy", "--resource", "configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "resource-configmap-key-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-key-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
- Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-configmap-key-location-route.groovy", "--resource", "configmap:my-cm-multi/my-configmap-key-2@/tmp/app/test.txt").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "resource-configmap-key-location-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "resource-configmap-key-location-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).ShouldNot(ContainSubstring(cmDataMulti["my-configmap-key"]))
+ g.Eventually(IntegrationLogs(t, ns, "resource-configmap-key-location-route"), TestTimeoutShort).Should(ContainSubstring(cmDataMulti["my-configmap-key-2"]))
})
// Store a configmap as property file
@@ -190,10 +190,10 @@ func TestRunConfigExamples(t *testing.T) {
CreatePlainTextConfigmap(t, ns, "my-cm-properties", cmDataProps)
t.Run("Config configmap as property file", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-properties-route.groovy", "--config", "configmap:my-cm-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "config-configmap-properties-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "config-configmap-properties-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "config-configmap-properties-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-configmap-properties-route.groovy", "--config", "configmap:my-cm-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "config-configmap-properties-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "config-configmap-properties-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "config-configmap-properties-route"), TestTimeoutShort).Should(ContainSubstring("hello world"))
})
// Secret
@@ -210,65 +210,65 @@ func TestRunConfigExamples(t *testing.T) {
CreatePlainTextSecret(t, ns, "my-sec-multi", secDataMulti)
t.Run("Config secret", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "config-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "config-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-route.groovy", "--config", "secret:my-sec").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "config-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "config-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "config-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
})
t.Run("Resource secret", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-secret-route.groovy", "--resource", "secret:my-sec").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "resource-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "resource-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/resource-secret-route.groovy", "--resource", "secret:my-sec").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "resource-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "resource-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "resource-secret-route"), TestTimeoutShort).Should(ContainSubstring(secData["my-secret-key"]))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Secret with filtered key", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-key-route.groovy", "--config", "secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "config-secret-key-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
- Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/config-secret-key-route.groovy", "--config", "secret:my-sec-multi/my-secret-key-2").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "config-secret-key-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "config-secret-key-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).ShouldNot(ContainSubstring(secDataMulti["my-secret-key"]))
+ g.Eventually(IntegrationLogs(t, ns, "config-secret-key-route"), TestTimeoutShort).Should(ContainSubstring(secDataMulti["my-secret-key-2"]))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
// Build-Properties
t.Run("Build time property", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--build-property", "quarkus.application.name=my-super-application").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--build-property", "quarkus.application.name=my-super-application").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
// Don't delete - we need it for next test execution
})
// We need to check also that the property (which is available in the IntegrationKit) is correctly replaced and we don't reuse the same kit
t.Run("Build time property updated", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--name", "build-property-route-updated",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-route.groovy", "--name", "build-property-route-updated",
"--build-property", "quarkus.application.name=my-super-application-updated").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-route-updated"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-route-updated"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated"))
// Verify the integration kits are different
- Eventually(IntegrationKit(t, ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(t, ns, "build-property-route")()))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Eventually(IntegrationKit(t, ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(t, ns, "build-property-route")()))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
// Build-Properties file
t.Run("Build time property file", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property file with precedence", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "quarkus.application.name=my-overridden-application", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutMedium).Should(ContainSubstring("my-overridden-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "quarkus.application.name=my-overridden-application", "--build-property", "file:./files/quarkus.properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutMedium).Should(ContainSubstring("my-overridden-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property from ConfigMap", func(t *testing.T) {
@@ -276,11 +276,11 @@ func TestRunConfigExamples(t *testing.T) {
cmData["quarkus.application.name"] = "my-cool-application"
CreatePlainTextConfigmap(t, ns, "my-cm-test-build-property", cmData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutLong).Should(ContainSubstring("my-cool-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutLong).Should(ContainSubstring("my-cool-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
t.Run("Build time property from ConfigMap as property file", func(t *testing.T) {
@@ -288,11 +288,11 @@ func TestRunConfigExamples(t *testing.T) {
cmData["my.properties"] = "quarkus.application.name=my-super-cool-application"
CreatePlainTextConfigmap(t, ns, "my-cm-test-build-properties", cmData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "configmap:my-cm-test-build-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-super-cool-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
@@ -301,11 +301,11 @@ func TestRunConfigExamples(t *testing.T) {
secData["quarkus.application.name"] = "my-great-application"
CreatePlainTextSecret(t, ns, "my-sec-test-build-property", secData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-property").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-great-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-property").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-great-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
@@ -314,14 +314,14 @@ func TestRunConfigExamples(t *testing.T) {
secData["my.properties"] = "quarkus.application.name=my-awsome-application"
CreatePlainTextSecret(t, ns, "my-sec-test-build-properties", secData)
- Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-properties").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-awsome-application"))
- Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/build-property-file-route.groovy", "--build-property", "secret:my-sec-test-build-properties").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "build-property-file-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "build-property-file-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "build-property-file-route"), TestTimeoutShort).Should(ContainSubstring("my-awsome-application"))
+ g.Expect(Kamel(t, "delete", "build-property-file-route", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go
index 21bb648eb..913a3f206 100644
--- a/e2e/common/config/kamelet_config_test.go
+++ b/e2e/common/config/kamelet_config_test.go
@@ -37,115 +37,115 @@ import (
func TestKameletImplicitConfigDefaultUserPropery(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig01-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig01-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int01")
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
"-p", "camel.kamelet.iconfig01-timer-source.message='Default message 01'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("Default message 01"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("Default message 01"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig01-timer-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig01-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using mounted secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig03-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig03-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int3")
secretName := "my-iconfig-int3-secret"
var secData = make(map[string]string)
secData["camel.kamelet.iconfig03-timer-source.message"] = "very top mounted secret message"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration03.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration03.java",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted secret message"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig03-timer-source")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted secret message"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig03-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using mounted configmap", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig04-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig04-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int4")
cmName := "my-iconfig-int4-configmap"
var cmData = make(map[string]string)
cmData["camel.kamelet.iconfig04-timer-source.message"] = "very top mounted configmap message"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration04.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration04.java",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted configmap message"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top mounted configmap message"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(t, ns, "iconfig04-timer-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "iconfig04-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedUserPropery(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig05-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig05-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int5")
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
"-p", "camel.kamelet.iconfig05-timer-source.message='Default message 05'",
"-p", "camel.kamelet.iconfig05-timer-source.mynamedconfig.message='My Named Config message'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My Named Config message"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My Named Config message"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig05-timer-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig05-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using labeled secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig06-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig06-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int6")
secretName := "my-iconfig-int6-secret"
@@ -155,90 +155,90 @@ func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "iconfig06-timer-source"
labels["camel.apache.org/kamelet.configuration"] = "mynamedconfig"
- Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ g.Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration06.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration06.java",
"-p", "camel.kamelet.iconfig06-timer-source.message='Default message 06'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named secret message"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig06-timer-source")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named secret message"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig06-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using mounted secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig07-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig07-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int7")
secretName := "my-iconfig-int7-secret"
var secData = make(map[string]string)
secData["camel.kamelet.iconfig07-timer-source.mynamedconfig.message"] = "very top named mounted secret message"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration07.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration07.java",
"-p", "camel.kamelet.iconfig07-timer-source.message='Default message 07'",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted secret message"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig07-timer-source")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted secret message"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig07-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using mounted configmap", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig08-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig08-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int8")
cmName := "my-iconfig-int8-configmap"
var cmData = make(map[string]string)
cmData["camel.kamelet.iconfig08-timer-source.mynamedconfig.message"] = "very top named mounted configmap message"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration08.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration08.java",
"-p", "camel.kamelet.iconfig08-timer-source.message='Default message 08'",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted configmap message"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top named mounted configmap message"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(t, ns, "iconfig08-timer-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "iconfig08-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using labeled secret", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "iconfig09-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "iconfig09-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int9")
secretName := "my-iconfig-int9-secret"
@@ -247,83 +247,83 @@ func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
secData["camel.kamelet.iconfig09-timer-source.message"] = "very top labeled secret message"
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "iconfig09-timer-source"
- Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
+ g.Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(Not(BeNil()))
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration09.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration09.java",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top labeled secret message"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "iconfig09-timer-source")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("very top labeled secret message"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "iconfig09-timer-source")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
// Tests on integration with kamelets containing configuration from properties and secrets with parameters inside the integration.
func TestKameletConfigInlinedUserPropery(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config inlined properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "config01-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "config01-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "config01-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "config01-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-inlined-configuration-01.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-inlined-configuration-01.yaml",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("important message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("integrationLogger"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "config01-timer-source")).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config01-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("important message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("integrationLogger"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "config01-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config01-log-sink")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestKameletConfigDefaultParamUserPropery(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("run test default config parameters properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "config02-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "config02-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "config02-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "config02-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int2")
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
"-p", "my-message='My parameter message 02'",
"-p", "my-logger='myIntegrationLogger02'",
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My parameter message 02"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myIntegrationLogger02"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My parameter message 02"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myIntegrationLogger02"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("run test default config secret properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "config03-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "config03-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "config03-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "config03-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int3")
secretName := "my-config-int3-secret"
@@ -331,31 +331,31 @@ func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
var secData = make(map[string]string)
secData["my-message"] = "My secret message 03"
secData["my-logger"] = "mySecretIntegrationLogger03"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My secret message 03"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My secret message 03"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
t.Run("run test default config configmap properties", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "config04-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "config04-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "config04-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "config04-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int4")
cmName := "my-config-int4-configmap"
@@ -363,21 +363,21 @@ func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
var cmData = make(map[string]string)
cmData["my-message"] = "My configmap message 04"
cmData["my-logger"] = "myConfigmapIntegrationLogger04"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My configmap message 04"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
-
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
- Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My configmap message 04"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index da50d115a..1e8af0462 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -35,25 +35,25 @@ import (
func TestPipeConfig(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("test custom source/sink pipe", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "my-pipe-timer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "my-pipe-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "my-pipe-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "my-pipe-log-sink")()).To(Succeed())
t.Run("run test default config using properties", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-properties")
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-p", "source.message=My pipe message",
"-p", "sink.loggerName=myPipeLogger",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
})
t.Run("run test implicit default config using labeled secret", func(t *testing.T) {
@@ -64,20 +64,20 @@ func TestPipeConfig(t *testing.T) {
secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
var labels = make(map[string]string)
labels["camel.apache.org/kamelet"] = "my-pipe-timer-source"
- Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
+ g.Expect(CreatePlainTextSecretWithLabels(t, ns, secretName, secData, labels)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-p", "sink.loggerName=myDefaultLogger",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myDefaultLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myDefaultLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit default config using mounted secret", func(t *testing.T) {
@@ -87,20 +87,20 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe secret message"
secData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeSecretLogger"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSecretLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe secret message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSecretLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit default config using mounted configmap", func(t *testing.T) {
@@ -110,20 +110,20 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["camel.kamelet.my-pipe-timer-source.message"] = "My pipe configmap message"
cmData["camel.kamelet.my-pipe-log-sink.loggerName"] = "myPipeConfigmapLogger"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe configmap message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeConfigmapLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe configmap message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeConfigmapLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
t.Run("run test implicit named config using mounted secret", func(t *testing.T) {
@@ -133,9 +133,9 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named secret message"
secData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedSecretLogger"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
@@ -144,12 +144,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named secret message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedSecretLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named secret message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedSecretLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit named config using mounted configmap", func(t *testing.T) {
@@ -159,9 +159,9 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["camel.kamelet.my-pipe-timer-source.mynamedconfig.message"] = "My pipe named configmap message"
cmData["camel.kamelet.my-pipe-log-sink.mynamedconfig.loggerName"] = "myPipeNamedConfigmapLogger"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
@@ -170,12 +170,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named configmap message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedConfigmapLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe named configmap message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeNamedConfigmapLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
t.Run("run test implicit specific config using mounted secret", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-specific-secret")
@@ -184,9 +184,9 @@ func TestPipeConfig(t *testing.T) {
var secData = make(map[string]string)
secData["mynamedconfig.message"] = "My pipe specific secret message"
secData["mynamedconfig.loggerName"] = "myPipeSpecificSecretLogger"
- Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=secret:"+secretName,
@@ -195,12 +195,12 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific secret message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificSecretLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific secret message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificSecretLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
})
t.Run("run test implicit specific config using mounted configmap", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-specific-configmap")
@@ -209,9 +209,9 @@ func TestPipeConfig(t *testing.T) {
var cmData = make(map[string]string)
cmData["mynamedconfig.message"] = "My pipe specific configmap message"
cmData["mynamedconfig.loggerName"] = "myPipeSpecificConfgmapLogger"
- Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-pipe-timer-source",
"my-pipe-log-sink",
"-t", "mount.configs=configmap:"+cmName,
@@ -220,15 +220,15 @@ func TestPipeConfig(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific configmap message"))
- Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificConfgmapLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My pipe specific configmap message"))
+ g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myPipeSpecificConfgmapLogger"))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
})
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go
index 75072d233..896a1c563 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleGroovyExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run groovy", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "groovy", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "groovy"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go
index fd17a6ff7..f631b985c 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleJavaExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run java", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index 76fe2e706..ccdcbc465 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleJavaScriptExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run js", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/js.js").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/js.js").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "js"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "js", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "js"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index 657ce5dba..5999058d6 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleKotlinExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run kotlin", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "kotlin", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "kotlin"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go
index ef55d16b8..0b4c52084 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -36,16 +36,16 @@ import (
func TestRunPolyglotExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run polyglot", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
- Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--name", "polyglot", "files/js-polyglot.js", "files/yaml-polyglot.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "polyglot"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "polyglot", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-yaml"))
+ g.Eventually(IntegrationLogs(t, ns, "polyglot"), TestTimeoutShort).Should(ContainSubstring("Magicpolyglot-js"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index 037768bf2..a4f9accd4 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleXmlExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run xml", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/xml.xml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "xml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "xml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "xml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go
index 1d38e211e..107e32209 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -36,15 +36,15 @@ import (
func TestRunSimpleYamlExamples(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run yaml", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/client_test.go b/e2e/common/misc/client_test.go
index 41a2d3554..9a5f44739 100644
--- a/e2e/common/misc/client_test.go
+++ b/e2e/common/misc/client_test.go
@@ -41,7 +41,7 @@ import (
func TestClientFunctionalities(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
cfg, err := config.GetConfig()
require.NoError(t, err)
@@ -67,6 +67,6 @@ func TestClientFunctionalities(t *testing.T) {
err = camel.CamelV1().Integrations(ns).Delete(TestContext, "dummy", metav1.DeleteOptions{})
require.NoError(t, err)
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index 42fb81171..fea57d999 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -36,43 +36,43 @@ import (
func TestRunCronExample(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("cron", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(t, ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(t, ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationCronJob(t, ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-yaml", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(t, ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(t, ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationCronJob(t, ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-timer", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
- Eventually(IntegrationCronJob(t, ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(IntegrationConditionStatus(t, ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationCronJob(t, ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-fallback", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron-fallback.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "cron-fallback"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "cron-fallback", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron-fallback"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-fallback.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "cron-fallback"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron-fallback", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron-fallback"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-quartz", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/cron-quartz.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "cron-quartz"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "cron-quartz", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "cron-quartz"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-quartz.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "cron-quartz"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "cron-quartz", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "cron-quartz"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go
index f74b22df5..8b8b03df2 100644
--- a/e2e/common/misc/integration_fail_test.go
+++ b/e2e/common/misc/integration_fail_test.go
@@ -37,152 +37,152 @@ import (
func TestBadRouteIntegration(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run bad java route", func(t *testing.T) {
name := RandomizedSuffixName("bad-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/BadRoute.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/BadRoute.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// Make sure the Integration can be scaled
- Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
+ g.Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Check the Integration stays in error phase
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Kit valid
kitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
})
t.Run("run missing dependency java route", func(t *testing.T) {
name := RandomizedSuffixName("java-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-d", "mvn:com.example:nonexistent:1.0").Execute()).To(Succeed())
// Integration in error
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionKitAvailableReason)))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should(
WithTransform(IntegrationConditionMessage, ContainSubstring("is in state \"Error\"")))
// Kit in error
kitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError))
+ g.Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError))
//Build in error with 5 attempts
build := Build(t, integrationKitNamespace, kitName)()
- Eventually(build.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseError))
- Eventually(build.Status.Failure.Recovery.Attempt, TestTimeoutShort).Should(Equal(5))
+ g.Eventually(build.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseError))
+ g.Eventually(build.Status.Failure.Recovery.Attempt, TestTimeoutShort).Should(Equal(5))
// Fixing the route should reconcile the Integration
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning))
// New Kit success
kitRecoveryName := IntegrationKit(t, ns, name)()
integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
- Expect(kitRecoveryName).NotTo(Equal(kitName))
+ g.Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Expect(kitRecoveryName).NotTo(Equal(kitName))
// New Build success
buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run invalid dependency java route", func(t *testing.T) {
name := RandomizedSuffixName("invalid-dependency")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-d", "camel:non-existent").Execute()).To(Succeed())
// Integration in error with Initialization Failed condition
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
// Kit shouldn't be created
- Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
+ g.Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// New Kit success
kitRecoveryName := IntegrationKit(t, ns, name)()
integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// New Build success
buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run unresolvable component java route", func(t *testing.T) {
name := RandomizedSuffixName("unresolvable-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Unresolvable.java", "--name", name).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Unresolvable.java", "--name", name).Execute()).To(Succeed())
// Integration in error with Initialization Failed condition
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
// Kit shouldn't be created
- Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
+ g.Consistently(IntegrationKit(t, ns, name), 10*time.Second).Should(BeEmpty())
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// New Kit success
kitRecoveryName := IntegrationKit(t, ns, name)()
integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(KitPhase(t, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// New Build success
buildRecovery := Build(t, integrationKitRecoveryNamespace, kitRecoveryName)()
- Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
+ g.Eventually(buildRecovery.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseSucceeded))
})
t.Run("run invalid java route", func(t *testing.T) {
name := RandomizedSuffixName("invalid-java-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/InvalidJava.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/InvalidJava.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error"))
// Kit valid
kitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
- Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
+ g.Eventually(KitPhase(t, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady))
// Fixing the route should reconcile the Integration in Initialization Failed condition to Running
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Kit should not have changed
kitRecoveryName := IntegrationKit(t, ns, name)()
- Expect(kitRecoveryName).To(Equal(kitName))
+ g.Expect(kitRecoveryName).To(Equal(kitName))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/integration_trait_update_test.go b/e2e/common/misc/integration_trait_update_test.go
index 014c75bc6..4a8b7a374 100644
--- a/e2e/common/misc/integration_trait_update_test.go
+++ b/e2e/common/misc/integration_trait_update_test.go
@@ -36,21 +36,21 @@ import (
func TestTraitUpdates(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run and update trait", func(t *testing.T) {
name := RandomizedSuffixName("yaml-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
var numberOfPods = func(pods *int32) bool {
return *pods >= 1 && *pods <= 2
}
// Adding a property will change the camel trait
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name, "-p", "hello=world").Execute()).To(Succeed())
- Consistently(IntegrationPodsNumbers(t, ns, name), TestTimeoutShort, 1*time.Second).Should(Satisfy(numberOfPods))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml", "--name", name, "-p", "hello=world").Execute()).To(Succeed())
+ g.Consistently(IntegrationPodsNumbers(t, ns, name), TestTimeoutShort, 1*time.Second).Should(Satisfy(numberOfPods))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index 7b5a768f5..dcad2be56 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -35,7 +35,7 @@ import (
func TestKameletClasspathLoading(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Store a configmap on the cluster
var cmData = make(map[string]string)
@@ -114,24 +114,24 @@ spec:
// Basic
t.Run("test basic case", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
"--resource", "configmap:my-kamelet-cm@/kamelets",
"-p camel.component.kamelet.location=file:/kamelets",
"-d", "camel:yaml-dsl",
// kamelet dependencies
"-d", "camel:timer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "timer-kamelet-integration")).Should(ContainSubstring("important message"))
+ g.Eventually(IntegrationPodPhase(t, ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "timer-kamelet-integration")).Should(ContainSubstring("important message"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "timer-kamelet-integration")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "timer-kamelet-integration")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "timer-kamelet-integration")()
kameletsTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "kamelets")
- Expect(kameletsTrait).ToNot(BeNil())
- Expect(len(kameletsTrait)).To(Equal(1))
- Expect(kameletsTrait["enabled"]).To(Equal(false))
+ g.Expect(kameletsTrait).ToNot(BeNil())
+ g.Expect(len(kameletsTrait)).To(Equal(1))
+ g.Expect(kameletsTrait["enabled"]).To(Equal(false))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index 361eecb65..adc0a326f 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -37,17 +37,17 @@ const customLabel = "custom-label"
func TestBundleKameletUpdate(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
- Expect(createBundleKamelet(t, ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
- Expect(createUserKamelet(t, ns, "user-sink")()).To(Succeed()) // Left intact by the operator
+ g.Expect(createBundleKamelet(t, ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
+ g.Expect(createUserKamelet(t, ns, "user-sink")()).To(Succeed()) // Left intact by the operator
- Eventually(Kamelet(t, "my-http-sink", ns)).
+ g.Eventually(Kamelet(t, "my-http-sink", ns)).
Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
- Consistently(Kamelet(t, "user-sink", ns), 5*time.Second, 1*time.Second).
+ g.Consistently(Kamelet(t, "user-sink", ns), 5*time.Second, 1*time.Second).
Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go
index fee3ea655..c51e629bb 100644
--- a/e2e/common/misc/maven_repository_test.go
+++ b/e2e/common/misc/maven_repository_test.go
@@ -36,22 +36,22 @@ import (
func TestRunExtraRepository(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--maven-repository", "https://maven.repository.redhat.com/ga@id=redhat",
"--dependency", "mvn:org.jolokia:jolokia-core:1.7.1.redhat-00001",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Integration(t, ns, name)).Should(WithTransform(IntegrationSpec, And(
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(Integration(t, ns, name)).Should(WithTransform(IntegrationSpec, And(
HaveExistingField("Repositories"),
HaveField("Repositories", ContainElements("https://maven.repository.redhat.com/ga@id=redhat")),
)))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go
index 07891d229..60abb04ba 100644
--- a/e2e/common/misc/pipe_test.go
+++ b/e2e/common/misc/pipe_test.go
@@ -37,15 +37,15 @@ import (
func TestPipe(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Error Handler testing
t.Run("test error handler", func(t *testing.T) {
- Expect(createErrorProducerKamelet(t, ns, "my-own-error-producer-source")()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, "my-own-log-sink")()).To(Succeed())
+ g.Expect(createErrorProducerKamelet(t, ns, "my-own-error-producer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, "my-own-log-sink")()).To(Succeed())
t.Run("throw error test", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-error-producer-source",
"my-own-log-sink",
"--error-handler", "sink:my-own-log-sink",
@@ -57,14 +57,14 @@ func TestPipe(t *testing.T) {
"--name", "throw-error-binding",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "throw-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).Should(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
- Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
+ g.Eventually(IntegrationPodPhase(t, ns, "throw-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).Should(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
+ g.Eventually(IntegrationLogs(t, ns, "throw-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
})
t.Run("don't throw error test", func(t *testing.T) {
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-error-producer-source",
"my-own-log-sink",
"--error-handler", "sink:my-own-log-sink",
@@ -76,19 +76,19 @@ func TestPipe(t *testing.T) {
"--name", "no-error-binding",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "no-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
- Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).Should(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
+ g.Eventually(IntegrationPodPhase(t, ns, "no-error-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).ShouldNot(ContainSubstring("[kameletErrorHandler] (Camel (camel-1) thread #1 - timer://tick)"))
+ g.Eventually(IntegrationLogs(t, ns, "no-error-binding"), TestTimeoutShort).Should(ContainSubstring("[integrationLogger] (Camel (camel-1) thread #1 - timer://tick)"))
})
})
//Pipe with traits testing
t.Run("test Pipe with trait", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, ns, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "my-own-timer-source")()).To(Succeed())
// Log sink kamelet exists from previous test
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"-p", "source.message=hello from test",
@@ -97,9 +97,9 @@ func TestPipe(t *testing.T) {
"--name", "kb-with-traits",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "kb-with-traits"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("hello from test"))
- Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
+ g.Eventually(IntegrationPodPhase(t, ns, "kb-with-traits"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("hello from test"))
+ g.Eventually(IntegrationLogs(t, ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
})
// Pipe with wrong spec
@@ -108,17 +108,17 @@ func TestPipe(t *testing.T) {
kb := v1.NewPipe(ns, name)
kb.Spec = v1.PipeSpec{}
_, err := kubernetes.ReplaceResource(TestContext, TestClient(t), &kb)
- Eventually(err).Should(BeNil())
- Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
- Eventually(PipeCondition(t, ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
+ g.Eventually(err).Should(BeNil())
+ g.Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ g.Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
+ g.Eventually(PipeCondition(t, ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
WithTransform(PipeConditionMessage, And(
ContainSubstring("could not determine source URI"),
ContainSubstring("no ref or URI specified in endpoint"),
)))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/pipe_with_image_test.go b/e2e/common/misc/pipe_with_image_test.go
index 9173cefe7..aaf58b571 100644
--- a/e2e/common/misc/pipe_with_image_test.go
+++ b/e2e/common/misc/pipe_with_image_test.go
@@ -36,14 +36,14 @@ import (
func TestPipeWithImage(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
bindingID := "with-image-binding"
t.Run("run with initial image", func(t *testing.T) {
expectedImage := "docker.io/jmalloc/echo-server:0.3.2"
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"--annotation", "trait.camel.apache.org/container.image="+expectedImage,
@@ -54,24 +54,24 @@ func TestPipeWithImage(t *testing.T) {
"--name", bindingID,
).Execute()).To(Succeed())
- Eventually(IntegrationGeneration(t, ns, bindingID)).
+ g.Eventually(IntegrationGeneration(t, ns, bindingID)).
Should(gstruct.PointTo(BeNumerically("==", 1)))
- Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
+ g.Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
HaveKeyWithValue("test", "1"),
HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
)))
- Eventually(IntegrationStatusImage(t, ns, bindingID)).
+ g.Eventually(IntegrationStatusImage(t, ns, bindingID)).
Should(Equal(expectedImage))
- Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
+ g.Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodImage(t, ns, bindingID)).
+ g.Eventually(IntegrationPodImage(t, ns, bindingID)).
Should(Equal(expectedImage))
})
t.Run("run with new image", func(t *testing.T) {
expectedImage := "docker.io/jmalloc/echo-server:0.3.3"
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
"my-own-timer-source",
"my-own-log-sink",
"--annotation", "trait.camel.apache.org/container.image="+expectedImage,
@@ -81,20 +81,20 @@ func TestPipeWithImage(t *testing.T) {
"--annotation", "test=2",
"--name", bindingID,
).Execute()).To(Succeed())
- Eventually(IntegrationGeneration(t, ns, bindingID)).
+ g.Eventually(IntegrationGeneration(t, ns, bindingID)).
Should(gstruct.PointTo(BeNumerically("==", 1)))
- Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
+ g.Eventually(Integration(t, ns, bindingID)).Should(WithTransform(Annotations, And(
HaveKeyWithValue("test", "2"),
HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage),
)))
- Eventually(IntegrationStatusImage(t, ns, bindingID)).
+ g.Eventually(IntegrationStatusImage(t, ns, bindingID)).
Should(Equal(expectedImage))
- Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
+ g.Eventually(IntegrationPodPhase(t, ns, bindingID), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPodImage(t, ns, bindingID)).
+ g.Eventually(IntegrationPodImage(t, ns, bindingID)).
Should(Equal(expectedImage))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index bb8a39016..fe2b90f10 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -39,6 +39,7 @@ import (
func TestImageRegistryIsAMavenRepository(t *testing.T) {
t.Parallel()
+ g := NewWithT(t)
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
@@ -55,59 +56,59 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
pom, err := filepath.Abs("files/registry/sample-decryption-1.0.pom")
require.NoError(t, err)
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
"--name", name,
"-d", fmt.Sprintf("file://%s", jar),
"-d", fmt.Sprintf("file://%s", pom),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
t.Run("local files are mounted in the integration container at the default path", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-default-path")
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", "location=/deployments/?filename=laugh.txt",
"-d", "file://files/registry/laugh.txt",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
})
t.Run("local files are mounted in the integration container at a custom path", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-custom-path")
customPath := "this/is/a/custom/path/"
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", fmt.Sprintf("location=%s", customPath),
"-d", fmt.Sprintf("file://files/registry/laugh.txt?targetPath=%slaugh.txt", customPath),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
})
t.Run("local directory is mounted in the integration container", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-directory")
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
"-p", "location=files/registry/",
"-d", fmt.Sprintf("file://files/registry/laughs/?targetPath=files/registry/"),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
})
t.Run("pom file is extracted from JAR", func(t *testing.T) {
@@ -116,28 +117,28 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
jar, err := filepath.Abs("files/registry/sample-decryption-1.0.jar")
require.NoError(t, err)
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
"--name", name,
"-d", fmt.Sprintf("file://%s", jar),
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
t.Run("dependency can be used at build time", func(t *testing.T) {
// Create integration that should run an Xslt transformation whose template needs to be present at build time
name := RandomizedSuffixName("xslt")
- Expect(KamelRunWithID(t, operatorID, ns, "files/registry/classpath/Xslt.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/classpath/Xslt.java", "--name", name,
"-d", "file://files/registry/classpath/cheese.xsl?targetPath=xslt/cheese.xsl&classpath=true",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go
index abe19d834..9a89ab154 100644
--- a/e2e/common/misc/rest_test.go
+++ b/e2e/common/misc/rest_test.go
@@ -40,37 +40,37 @@ import (
func TestRunRest(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
- Expect(KamelRunWithID(t, operatorID, ns, "files/rest-consumer.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "rest-consumer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/rest-consumer.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "rest-consumer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
t.Run("Service works", func(t *testing.T) {
name := RandomizedSuffixName("John")
service := Service(t, ns, "rest-consumer")
- Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
- Expect(KamelRunWithID(t, operatorID, ns, "files/rest-producer.yaml", "-p", "serviceName=rest-consumer", "-p", "name="+name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "rest-producer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
- Eventually(IntegrationLogs(t, ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
+ g.Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/rest-producer.yaml", "-p", "serviceName=rest-consumer", "-p", "name="+name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "rest-producer"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ g.Eventually(IntegrationLogs(t, ns, "rest-producer"), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("%s Doe", name)))
})
if ocp {
t.Run("Route works", func(t *testing.T) {
name := RandomizedSuffixName("Peter")
route := Route(t, ns, "rest-consumer")
- Eventually(route, TestTimeoutShort).ShouldNot(BeNil())
- Eventually(RouteStatus(t, ns, "rest-consumer"), TestTimeoutMedium).Should(Equal("True"))
+ g.Eventually(route, TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(RouteStatus(t, ns, "rest-consumer"), TestTimeoutMedium).Should(Equal("True"))
url := fmt.Sprintf("http://%s/customers/%s", route().Spec.Host, name)
- Eventually(httpRequest(url), TestTimeoutMedium).Should(Equal(fmt.Sprintf("%s Doe", name)))
- Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
+ g.Eventually(httpRequest(url), TestTimeoutMedium).Should(Equal(fmt.Sprintf("%s Doe", name)))
+ g.Eventually(IntegrationLogs(t, ns, "rest-consumer"), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("get %s", name)))
})
}
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index 49caec365..141839953 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -42,7 +42,7 @@ import (
func TestPipeScale(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
@@ -52,84 +52,84 @@ func TestPipeScale(t *testing.T) {
}
name := RandomizedSuffixName("timer2log")
- Expect(KamelBindWithID(t, operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
t.Run("Update Pipe scale spec", func(t *testing.T) {
- Expect(ScalePipe(t, ns, name, 3)).To(Succeed())
+ g.Expect(ScalePipe(t, ns, name, 3)).To(Succeed())
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Check it also cascades into the Pipe scale subresource Status field
- Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
// Finally check the readiness condition becomes truthy back onPipe
- Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
t.Run("ScalePipe with polymorphic client", func(t *testing.T) {
scaleClient, err := TestClient(t).ScalesClient()
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Patch the integration scale subresource
patch := "{\"spec\":{\"replicas\":2}}"
_, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("Pipes"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Finally check it cascades into the Pipe scale subresource Status field
- Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(PipeStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
})
t.Run("ScalePipe with Camel K client", func(t *testing.T) {
camel, err := versioned.NewForConfig(TestClient(t).GetConfig())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Getter
PipeScale, err := camel.CamelV1().Pipes(ns).GetScale(TestContext, name, metav1.GetOptions{})
- Expect(err).To(BeNil())
- Expect(PipeScale.Spec.Replicas).To(BeNumerically("==", 2))
- Expect(PipeScale.Status.Replicas).To(BeNumerically("==", 2))
+ g.Expect(err).To(BeNil())
+ g.Expect(PipeScale.Spec.Replicas).To(BeNumerically("==", 2))
+ g.Expect(PipeScale.Status.Replicas).To(BeNumerically("==", 2))
// Setter
PipeScale.Spec.Replicas = 1
_, err = camel.CamelV1().Pipes(ns).UpdateScale(TestContext, name, PipeScale, metav1.UpdateOptions{})
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling inPipe
- Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(PipeConditionStatus(t, ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Pipe scale subresource Spec field
- Eventually(PipeSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(PipeSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go
index fdbc80288..3ba99050b 100644
--- a/e2e/common/misc/scale_integration_test.go
+++ b/e2e/common/misc/scale_integration_test.go
@@ -41,94 +41,93 @@ import (
func TestIntegrationScale(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
t.Run("Update integration scale spec", func(t *testing.T) {
- RegisterTestingT(t)
- Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
+ g.Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
// Check the readiness condition becomes falsy
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Finally check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
t.Run("Scale integration with polymorphic client", func(t *testing.T) {
scaleClient, err := TestClient(t).ScalesClient()
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Patch the integration scale subresource
patch := "{\"spec\":{\"replicas\":2}}"
_, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("integrations"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(2))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
})
t.Run("Scale integration with Camel K client", func(t *testing.T) {
camel, err := versioned.NewForConfig(TestClient(t).GetConfig())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Getter
integrationScale, err := camel.CamelV1().Integrations(ns).GetScale(TestContext, name, metav1.GetOptions{})
- Expect(err).To(BeNil())
- Expect(integrationScale.Spec.Replicas).To(BeNumerically("==", 2))
- Expect(integrationScale.Status.Replicas).To(BeNumerically("==", 2))
+ g.Expect(err).To(BeNil())
+ g.Expect(integrationScale.Spec.Replicas).To(BeNumerically("==", 2))
+ g.Expect(integrationScale.Status.Replicas).To(BeNumerically("==", 2))
// Setter
integrationScale.Spec.Replicas = 1
integrationScale, err = camel.CamelV1().Integrations(ns).UpdateScale(TestContext, name, integrationScale, metav1.UpdateOptions{})
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
+ g.Expect(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
- Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationSpecReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Then check it cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(1))
// Finally check it cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
})
t.Run("Scale integration with external image", func(t *testing.T) {
image := IntegrationPodImage(t, ns, name)()
- Expect(image).NotTo(BeEmpty())
+ g.Expect(image).NotTo(BeEmpty())
// Save resources by deleting the integration
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
-
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(ScaleIntegration(t, ns, "pre-built", 0)).To(Succeed())
- Eventually(IntegrationPod(t, ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
- Expect(ScaleIntegration(t, ns, "pre-built", 1)).To(Succeed())
- Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", "pre-built", "-t", fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(ScaleIntegration(t, ns, "pre-built", 0)).To(Succeed())
+ g.Eventually(IntegrationPod(t, ns, "pre-built"), TestTimeoutMedium).Should(BeNil())
+ g.Expect(ScaleIntegration(t, ns, "pre-built", 1)).To(Succeed())
+ g.Eventually(IntegrationPhase(t, ns, "pre-built"), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "pre-built"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ g.Expect(Kamel(t, "delete", "pre-built", "-n", ns).Execute()).To(Succeed())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index a94925fcd..2182f4579 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -37,18 +37,18 @@ import (
func TestStructuredLogs(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "logging.format=json").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
pod := OperatorPod(t, opns)()
- Expect(pod).NotTo(BeNil())
+ g.Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
fmt.Printf("Fetching logs for operator pod %s in namespace %s", pod.Name, pod.Namespace)
@@ -56,14 +56,14 @@ func TestStructuredLogs(t *testing.T) {
Container: "camel-k-operator",
}
logs, err := StructuredLogs(t, pod.Namespace, pod.Name, logOptions, false)
- Expect(err).To(BeNil())
- Expect(logs).NotTo(BeEmpty())
+ g.Expect(err).To(BeNil())
+ g.Expect(logs).NotTo(BeEmpty())
it := Integration(t, ns, name)()
- Expect(it).NotTo(BeNil())
+ g.Expect(it).NotTo(BeNil())
build := Build(t, IntegrationKitNamespace(t, ns, name)(), IntegrationKit(t, ns, name)())()
- Expect(build).NotTo(BeNil())
+ g.Expect(build).NotTo(BeNil())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go
index 57442e03e..af9b9bd22 100644
--- a/e2e/common/runtimes/runtimes_test.go
+++ b/e2e/common/runtimes/runtimes_test.go
@@ -36,41 +36,41 @@ import (
func TestSourceLessIntegrations(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
var cmData = make(map[string]string)
cmData["my-file.txt"] = "Hello World!"
CreatePlainTextConfigmap(t, ns, "my-cm-sourceless", cmData)
t.Run("Camel Main", func(t *testing.T) {
itName := "my-camel-main-v1"
- Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)"))
})
t.Run("Camel Spring Boot", func(t *testing.T) {
itName := "my-camel-sb-v1"
- Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Spring Boot"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("Spring Boot"))
})
t.Run("Camel Quarkus", func(t *testing.T) {
itName := "my-camel-quarkus-v1"
- Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-quarkus:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
- Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "--image", "docker.io/squakez/my-camel-quarkus:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationCondition(t, ns, itName, v1.IntegrationConditionTraitInfo)().Message).Should(Equal("explicitly disabled by the platform: integration kit was not created via Camel K operator"))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"]))
+ g.Eventually(IntegrationLogs(t, ns, itName), TestTimeoutShort).Should(ContainSubstring("powered by Quarkus"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/setup/main_test.go b/e2e/common/setup/main_test.go
index a384c9e60..d303f2483 100644
--- a/e2e/common/setup/main_test.go
+++ b/e2e/common/setup/main_test.go
@@ -50,12 +50,8 @@ func TestMain(m *testing.M) {
})
var t *testing.T
+
g.Expect(TestClient(t)).ShouldNot(BeNil())
- g.Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
- // Adjust global operator integration platform settings
- // Tests are run in parallel so need to choose a proper build order strategy
- pl.Spec.Build.BuildConfiguration.OrderStrategy = v1.BuildOrderStrategyDependencies
- })).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go
index 6725dda04..c61cf6cb3 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -39,7 +39,7 @@ import (
func TestAffinityTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
var hostname string
if node, err := selectSchedulableNode(t); err == nil {
@@ -52,72 +52,72 @@ func TestAffinityTrait(t *testing.T) {
if hostname != "" {
t.Run("Run Java with node affinity", func(t *testing.T) {
name1 := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name1,
"-t", "affinity.enabled=true",
"-t", fmt.Sprintf("affinity.node-affinity-labels=kubernetes.io/hostname in(%s)", hostname)).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name1)()
- Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.NodeAffinity).To(Equal(&corev1.NodeAffinity{
+ g.Expect(pod.Spec.Affinity).NotTo(BeNil())
+ g.Expect(pod.Spec.Affinity.NodeAffinity).To(Equal(&corev1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: nodeSelector("kubernetes.io/hostname", corev1.NodeSelectorOpIn, hostname),
}))
- Expect(pod.Spec.NodeName).To(Equal(hostname))
+ g.Expect(pod.Spec.NodeName).To(Equal(hostname))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name1)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name1)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name1)()
affinityTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "affinity")
- Expect(affinityTrait).NotTo(BeNil())
- Expect(len(affinityTrait)).To(Equal(2))
- Expect(affinityTrait["enabled"]).To(Equal(true))
- Expect(affinityTrait["nodeAffinityLabels"]).NotTo(BeNil())
+ g.Expect(affinityTrait).NotTo(BeNil())
+ g.Expect(len(affinityTrait)).To(Equal(2))
+ g.Expect(affinityTrait["enabled"]).To(Equal(true))
+ g.Expect(affinityTrait["nodeAffinityLabels"]).NotTo(BeNil())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
t.Run("Run Java with pod affinity", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", "java2",
"-t", "affinity.enabled=true",
"-t", "affinity.pod-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java2"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java2", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java2"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "java2"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java2", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java2"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, "java2")()
- Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.PodAffinity).To(Equal(&corev1.PodAffinity{
+ g.Expect(pod.Spec.Affinity).NotTo(BeNil())
+ g.Expect(pod.Spec.Affinity.PodAffinity).To(Equal(&corev1.PodAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
podAffinityTerm("camel.apache.org/integration", metav1.LabelSelectorOpExists, "kubernetes.io/hostname"),
},
}))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run Java with pod anti affinity", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", "java3",
"-t", "affinity.enabled=true",
"-t", "affinity.pod-anti-affinity-labels=camel.apache.org/integration").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java3"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java3", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java3"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "java3"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java3", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java3"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, "java3")()
- Expect(pod.Spec.Affinity).NotTo(BeNil())
- Expect(pod.Spec.Affinity.PodAntiAffinity).To(Equal(&corev1.PodAntiAffinity{
+ g.Expect(pod.Spec.Affinity).NotTo(BeNil())
+ g.Expect(pod.Spec.Affinity.PodAntiAffinity).To(Equal(&corev1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
podAffinityTerm("camel.apache.org/integration", metav1.LabelSelectorOpExists, "kubernetes.io/hostname"),
},
}))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index c1f9323c2..3f0ea3650 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -38,98 +38,98 @@ import (
func TestBuilderTrait(t *testing.T) {
// Test not able to run in parallel because of maven profile tests
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run build strategy routine", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.order-strategy=sequential",
"-t", "builder.strategy=routine").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
// Default resource CPU Check
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build order strategy dependencies", func(t *testing.T) {
name := RandomizedSuffixName("java-dependencies-strategy")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.order-strategy=dependencies").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
// Default resource CPU Check
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "builder")
- Expect(builderTrait).NotTo(BeNil())
- Expect(len(builderTrait)).To(Equal(1))
- Expect(builderTrait["orderStrategy"]).To(Equal("dependencies"))
+ g.Expect(builderTrait).NotTo(BeNil())
+ g.Expect(len(builderTrait)).To(Equal(1))
+ g.Expect(builderTrait["orderStrategy"]).To(Equal("dependencies"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build order strategy fifo", func(t *testing.T) {
name := RandomizedSuffixName("java-fifo-strategy")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.order-strategy=fifo").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO))
// Default resource CPU Check
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal(""))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal(""))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run build resources configuration", func(t *testing.T) {
name := RandomizedSuffixName("java-resource-config")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks-request-cpu=builder:500m",
"-t", "builder.tasks-limit-cpu=builder:1000m",
@@ -138,100 +138,100 @@ func TestBuilderTrait(t *testing.T) {
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m"))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m"))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi"))
- Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi"))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m"))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m"))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi"))
+ g.Eventually(BuildConfig(t, integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
// Let's assert we set the resources on the builder container
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run custom pipeline task", func(t *testing.T) {
name := RandomizedSuffixName("java-pipeline")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks=custom1;alpine;tree",
"-t", "builder.tasks=custom2;alpine;cat maven/pom.xml",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(4))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(4))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2"))
// Check containers conditions
- Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("generated-bytecode.jar"))
- Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("</project>"))
// Check logs
- Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
- Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`))
+ g.Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`))
+ g.Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run custom pipeline task error", func(t *testing.T) {
name := RandomizedSuffixName("java-error")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.tasks=custom1;alpine;cat missingfile.txt",
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
+ g.Eventually(IntegrationPhase(t, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
// Check containers conditions
- Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(BuildConditions(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
- Eventually(BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded")), TestTimeoutMedium).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
+ g.Eventually(BuildConditions(t, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil())
+ g.Eventually(BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded")), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(
BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Status,
TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(
+ g.Eventually(
BuildCondition(t, integrationKitNamespace, integrationKitName, v1.BuildConditionType("Container custom1 succeeded"))().Message,
TestTimeoutShort).Should(ContainSubstring("No such file or directory"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Run maven profile", func(t *testing.T) {
@@ -239,11 +239,11 @@ func TestBuilderTrait(t *testing.T) {
opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
mavenProfile1Cm := newMavenProfileConfigMap(opns, "maven-profile-owasp", "owasp-profile")
- Expect(TestClient(t).Create(TestContext, mavenProfile1Cm)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, mavenProfile1Cm)).To(Succeed())
mavenProfile2Cm := newMavenProfileConfigMap(opns, "maven-profile-dependency", "dependency-profile")
- Expect(TestClient(t).Create(TestContext, mavenProfile2Cm)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, mavenProfile2Cm)).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "builder.maven-profiles=configmap:maven-profile-owasp/owasp-profile",
"-t", "builder.maven-profiles=configmap:maven-profile-dependency/dependency-profile",
@@ -251,35 +251,35 @@ func TestBuilderTrait(t *testing.T) {
"-t", "builder.strategy=pod",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKitName := IntegrationKit(t, ns, name)()
integrationKitNamespace := IntegrationKitNamespace(t, ns, name)()
builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName)
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
- Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("package"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(len(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1"))
+ g.Eventually(BuilderPod(t, integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("package"))
// Check containers conditions
- Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
- Eventually(
+ g.Eventually(Build(t, integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status,
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(
+ g.Eventually(
Build(t, integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message,
TestTimeoutShort).Should(ContainSubstring("</project>"))
// Check logs
- Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
- Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
+ g.Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>owasp-profile</id>`))
+ g.Eventually(Logs(t, integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`<id>dependency-profile</id>`))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, mavenProfile1Cm)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, mavenProfile2Cm)).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, mavenProfile1Cm)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, mavenProfile2Cm)).To(Succeed())
})
})
}
diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go
index c2cd82432..eecb232bc 100644
--- a/e2e/common/traits/camel_test.go
+++ b/e2e/common/traits/camel_test.go
@@ -36,37 +36,37 @@ import (
func TestCamelTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("properties changes should not rebuild", func(t *testing.T) {
- Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "reset", "-n", ns).Execute()).To(Succeed())
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
).Execute()).To(Succeed())
// checking the integration status
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
integrationKit := IntegrationKit(t, ns, name)()
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-p", "a=1",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationKit(t, ns, name)).Should(Equal(integrationKit))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationKit(t, ns, name)).Should(Equal(integrationKit))
- Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
})
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go
index d3ff9cc89..3669b90b1 100644
--- a/e2e/common/traits/container_test.go
+++ b/e2e/common/traits/container_test.go
@@ -37,11 +37,11 @@ import (
func TestContainerTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Container image pull policy and resources configuration", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "container.image-pull-policy=Always",
"-t", "container.request-cpu=0.005",
"-t", "container.request-memory=100Mi",
@@ -49,17 +49,17 @@ func TestContainerTrait(t *testing.T) {
"-t", "container.limit-memory=500Mi",
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
imagePullPolicy := pod.Spec.Containers[0].ImagePullPolicy
return imagePullPolicy == "Always"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -67,7 +67,7 @@ func TestContainerTrait(t *testing.T) {
requestsCpu := pod.Spec.Containers[0].Resources.Requests.Cpu()
return limitsCpu != nil && limitsCpu.String() == "200m" && requestsCpu != nil && requestsCpu.String() == "5m"
}), TestTimeoutShort).Should(BeTrue())
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -81,14 +81,14 @@ func TestContainerTrait(t *testing.T) {
t.Run("Container name", func(t *testing.T) {
name := RandomizedSuffixName("java2")
containerName := "my-container-name"
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "container.name="+containerName,
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if len(pod.Spec.Containers) != 1 {
return false
}
@@ -97,16 +97,16 @@ func TestContainerTrait(t *testing.T) {
}), TestTimeoutShort).Should(BeTrue())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
containerTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "container")
- Expect(containerTrait).ToNot(BeNil())
- Expect(len(containerTrait)).To(Equal(1))
- Expect(containerTrait["name"]).To(Equal(containerName))
+ g.Expect(containerTrait).ToNot(BeNil())
+ g.Expect(len(containerTrait)).To(Equal(1))
+ g.Expect(containerTrait["name"]).To(Equal(containerName))
})
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index d8dd0310a..6021b70a7 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -40,20 +40,20 @@ import (
func TestRecreateDeploymentStrategyTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run with Recreate Deployment Strategy", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "deployment.strategy="+string(appsv1.RecreateDeploymentStrategyType)).
Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Deployment(t, ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ g.Eventually(Deployment(t, ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Spec": MatchFields(IgnoreExtras,
Fields{
@@ -66,32 +66,32 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
deploymentTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "deployment")
- Expect(deploymentTrait).ToNot(BeNil())
- Expect(len(deploymentTrait)).To(Equal(1))
- Expect(deploymentTrait["strategy"]).To(Equal(string(appsv1.RecreateDeploymentStrategyType)))
+ g.Expect(deploymentTrait).ToNot(BeNil())
+ g.Expect(len(deploymentTrait)).To(Equal(1))
+ g.Expect(deploymentTrait["strategy"]).To(Equal(string(appsv1.RecreateDeploymentStrategyType)))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run with RollingUpdate Deployment Strategy", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "deployment.strategy="+string(appsv1.RollingUpdateDeploymentStrategyType)).
Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Eventually(Deployment(t, ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ g.Eventually(Deployment(t, ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Spec": MatchFields(IgnoreExtras,
Fields{
@@ -104,6 +104,6 @@ func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go
index 316f8d233..59d3bf530 100644
--- a/e2e/common/traits/error_handler_test.go
+++ b/e2e/common/traits/error_handler_test.go
@@ -36,21 +36,21 @@ import (
func TestErrorHandlerTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run errored integration with error handler", func(t *testing.T) {
name := RandomizedSuffixName("error-handler")
- Expect(KamelRunWithID(t, operatorID, ns, "files/ErroredRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/ErroredRoute.java",
"--name", name,
"-t", "error-handler.enabled=true",
"-t", "error-handler.ref=defaultErrorHandler",
"-p", "camel.beans.defaultErrorHandler=#class:org.apache.camel.builder.DeadLetterChannelBuilder",
"-p", "camel.beans.defaultErrorHandler.deadLetterUri=log:my-special-error-handler-in-place?level=ERROR&showCaughtException=false&showBody=false&showBodyType=false&showExchangePattern=false",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).ShouldNot(ContainSubstring("InvalidPayloadException"))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my-special-error-handler-in-place"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).ShouldNot(ContainSubstring("InvalidPayloadException"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("my-special-error-handler-in-place"))
})
})
}
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 9ee4388eb..4f127df88 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -36,17 +36,17 @@ import (
func TestErroredTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Integration trait should fail", func(t *testing.T) {
name := RandomizedSuffixName("it-errored")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
@@ -54,28 +54,28 @@ func TestErroredTrait(t *testing.T) {
t.Run("Pipe trait should fail", func(t *testing.T) {
name := RandomizedSuffixName("kb-errored")
- Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar",
+ g.Expect(KamelBindWithID(t, operatorID, ns, "timer:foo", "log:bar",
"--name", name,
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
// Pipe
- Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(PipeCondition(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
+ g.Eventually(PipePhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ g.Eventually(PipeConditionStatus(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(PipeCondition(t, ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
WithTransform(PipeConditionMessage, And(
ContainSubstring("error during trait customization"),
ContainSubstring("[missing] not found"),
)))
// Integration related
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionInitializationFailedReason)),
WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")),
))
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 62403812f..658c66535 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -45,11 +45,11 @@ import (
func TestHealthTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Readiness condition with stopped route scaled", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "health.enabled=true",
// Enable Jolokia for the test to stop the Camel route
"-t", "jolokia.enabled=true",
@@ -58,30 +58,30 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
+ g.Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
// Check the readiness condition becomes falsy
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
// Check the scale cascades into the Deployment scale
- Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Finally check the readiness condition becomes truthy back
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
healthTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "health")
- Expect(healthTrait).ToNot(BeNil())
- Expect(len(healthTrait)).To(Equal(1))
- Expect(healthTrait["enabled"]).To(Equal(true))
+ g.Expect(healthTrait).ToNot(BeNil())
+ g.Expect(len(healthTrait)).To(Equal(1))
+ g.Expect(healthTrait["enabled"]).To(Equal(true))
pods := IntegrationPods(t, ns, name)()
@@ -93,24 +93,24 @@ func TestHealthTrait(t *testing.T) {
"operation": "stop()",
}
body, err := json.Marshal(request)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
+ g.Expect(err).To(BeNil())
+ g.Expect(response).To(ContainSubstring(`"status":200`))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal(fmt.Sprintf("%d/3 pods are not ready", i+1)))))
}
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -147,15 +147,15 @@ func TestHealthTrait(t *testing.T) {
return true
}))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Readiness condition with stopped route", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "health.enabled=true",
// Enable Jolokia for the test to stop the Camel route
"-t", "jolokia.enabled=true",
@@ -164,11 +164,11 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
@@ -179,17 +179,17 @@ func TestHealthTrait(t *testing.T) {
"operation": "stop()",
}
body, err := json.Marshal(request)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
+ g.Expect(err).To(BeNil())
+ g.Expect(response).To(ContainSubstring(`"status":200`))
// Check the ready condition has turned false
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// And it contains details about the runtime state
@@ -204,11 +204,11 @@ func TestHealthTrait(t *testing.T) {
// status: "False"
// type: Ready
//
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -241,10 +241,10 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped"
}))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Readiness condition with stopped binding", func(t *testing.T) {
@@ -252,10 +252,10 @@ func TestHealthTrait(t *testing.T) {
source := RandomizedSuffixName("my-health-timer-source")
sink := RandomizedSuffixName("my-health-log-sink")
- Expect(CreateTimerKamelet(t, ns, source)()).To(Succeed())
- Expect(CreateLogKamelet(t, ns, sink)()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, source)()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, ns, sink)()).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns,
+ g.Expect(KamelBindWithID(t, operatorID, ns,
source,
sink,
"-p", "source.message=Magicstring!",
@@ -267,10 +267,10 @@ func TestHealthTrait(t *testing.T) {
"--name", name,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
@@ -281,26 +281,26 @@ func TestHealthTrait(t *testing.T) {
"operation": "stop()",
}
body, err := json.Marshal(request)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
response, err := TestClient(t).CoreV1().RESTClient().Post().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod.Name)).
Body(body).
DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
+ g.Expect(err).To(BeNil())
+ g.Expect(response).To(ContainSubstring(`"status":200`))
// Check the ready condition has turned false
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionFalse))
// And it contains details about the runtime state
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -333,7 +333,7 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
}))
- Eventually(PipeCondition(t, ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
+ g.Eventually(PipeCondition(t, ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *camelv1.PipeCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -367,31 +367,31 @@ func TestHealthTrait(t *testing.T) {
}))
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(DeleteKamelet(t, ns, source)).To(Succeed())
- Expect(DeleteKamelet(t, ns, sink)).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, source)).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, sink)).To(Succeed())
})
t.Run("Readiness condition with never ready route", func(t *testing.T) {
name := RandomizedSuffixName("never-ready")
- Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
"--name", name,
"-t", "health.enabled=true",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
- Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).
Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
// Check that the error message is propagated from health checks even if deployment never becomes ready
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -428,23 +428,23 @@ func TestHealthTrait(t *testing.T) {
t.Run("Startup condition with never ready route", func(t *testing.T) {
name := RandomizedSuffixName("startup-probe-never-ready-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/NeverReady.java",
"--name", name,
"-t", "health.enabled=true",
"-t", "health.startup-probe-enabled=true",
"-t", "health.startup-timeout=60",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).Should(Equal(corev1.ConditionFalse))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Consistently(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), 1*time.Minute).Should(Equal(corev1.ConditionFalse))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionRuntimeNotReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 pods are not ready"))))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *v1.IntegrationCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
@@ -490,17 +490,17 @@ func TestHealthTrait(t *testing.T) {
t.Run("Startup condition with ready route", func(t *testing.T) {
name := RandomizedSuffixName("startup-probe-ready-route")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "health.enabled=true",
"-t", "health.startup-probe-enabled=true",
"-t", "health.startup-timeout=60",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPhase(t, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
- Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(And(
+ g.Eventually(IntegrationCondition(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(And(
WithTransform(IntegrationConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(IntegrationConditionMessage, Equal("1/1 ready replicas"))))
@@ -513,6 +513,6 @@ func TestHealthTrait(t *testing.T) {
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index c66019349..3a80c4278 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -37,33 +37,33 @@ import (
func TestIstioTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run Java with Istio", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "istio.enabled=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.ObjectMeta.Annotations).NotTo(BeNil())
+ g.Expect(pod.ObjectMeta.Annotations).NotTo(BeNil())
annotations := pod.ObjectMeta.Annotations
- Expect(annotations["sidecar.istio.io/inject"]).To(Equal("true"))
- Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).To(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"))
+ g.Expect(annotations["sidecar.istio.io/inject"]).To(Equal("true"))
+ g.Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).To(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
istioTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "istio")
- Expect(istioTrait).ToNot(BeNil())
- Expect(len(istioTrait)).To(Equal(1))
- Expect(istioTrait["enabled"]).To(Equal(true))
+ g.Expect(istioTrait).ToNot(BeNil())
+ g.Expect(len(istioTrait)).To(Equal(1))
+ g.Expect(istioTrait["enabled"]).To(Equal(true))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go
index d43c9385d..97dd558a7 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -38,39 +38,39 @@ import (
func TestJolokiaTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run Java with Jolokia", func(t *testing.T) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "jolokia.enabled=true",
"-t", "jolokia.use-ssl-client-authentication=false",
"-t", "jolokia.protocol=http",
"-t", "jolokia.extended-client-check=false").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)
response, err := TestClient(t).CoreV1().RESTClient().Get().
AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod().Name)).DoRaw(TestContext)
- Expect(err).To(BeNil())
- Expect(response).To(ContainSubstring(`"status":200`))
+ g.Expect(err).To(BeNil())
+ g.Expect(response).To(ContainSubstring(`"status":200`))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
jolokiaTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jolokia")
- Expect(jolokiaTrait).ToNot(BeNil())
- Expect(len(jolokiaTrait)).To(Equal(4))
- Expect(jolokiaTrait["enabled"]).To(Equal(true))
- Expect(jolokiaTrait["useSSLClientAuthentication"]).To(Equal(false))
- Expect(jolokiaTrait["protocol"]).To(Equal("http"))
- Expect(jolokiaTrait["extendedClientCheck"]).To(Equal(false))
+ g.Expect(jolokiaTrait).ToNot(BeNil())
+ g.Expect(len(jolokiaTrait)).To(Equal(4))
+ g.Expect(jolokiaTrait["enabled"]).To(Equal(true))
+ g.Expect(jolokiaTrait["useSSLClientAuthentication"]).To(Equal(false))
+ g.Expect(jolokiaTrait["protocol"]).To(Equal("http"))
+ g.Expect(jolokiaTrait["extendedClientCheck"]).To(Equal(false))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go
index 6ea2dc89b..87fc90cdd 100644
--- a/e2e/common/traits/jvm_test.go
+++ b/e2e/common/traits/jvm_test.go
@@ -39,7 +39,7 @@ import (
func TestJVMTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// Store a configmap holding a jar
var cmData = make(map[string][]byte)
@@ -51,23 +51,23 @@ func TestJVMTrait(t *testing.T) {
require.NoError(t, err)
t.Run("JVM trait classpath", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "./files/jvm/Classpath.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "./files/jvm/Classpath.java",
"--resource", "configmap:my-deps",
"-t", "jvm.classpath=/etc/camel/resources/my-deps/sample-1.0.jar",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "classpath")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "classpath")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "classpath")()
jvmTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jvm")
- Expect(jvmTrait).ToNot(BeNil())
- Expect(len(jvmTrait)).To(Equal(1))
- Expect(jvmTrait["classpath"]).To(Equal("/etc/camel/resources/my-deps/sample-1.0.jar"))
+ g.Expect(jvmTrait).ToNot(BeNil())
+ g.Expect(len(jvmTrait)).To(Equal(1))
+ g.Expect(jvmTrait["classpath"]).To(Equal("/etc/camel/resources/my-deps/sample-1.0.jar"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go
index a0476a662..31e27323a 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -36,7 +36,7 @@ import (
func TestKameletTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("discover kamelet capabilities", func(t *testing.T) {
template := map[string]interface{}{
@@ -49,22 +49,22 @@ func TestKameletTrait(t *testing.T) {
},
},
}
- Expect(CreateKamelet(t, ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
+ g.Expect(CreateKamelet(t, ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
name := RandomizedSuffixName("webhook")
- Expect(KamelRunWithID(t, operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Started capabilities-webhook-source-1 (platform-http:///webhook)"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Started capabilities-webhook-source-1 (platform-http:///webhook)"))
// Verify Integration capabilities
- Eventually(IntegrationStatusCapabilities(t, ns, name), TestTimeoutShort).Should(ContainElements("platform-http"))
+ g.Eventually(IntegrationStatusCapabilities(t, ns, name), TestTimeoutShort).Should(ContainElements("platform-http"))
// Verify expected resources from Kamelet (Service in this case)
service := Service(t, ns, name)
- Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(service, TestTimeoutShort).ShouldNot(BeNil())
})
// Clean-up
- Expect(DeleteKamelet(t, ns, "capabilities-webhook-source")).To(Succeed())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(DeleteKamelet(t, ns, "capabilities-webhook-source")).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go
index bd5980872..ce52fb46c 100644
--- a/e2e/common/traits/master_test.go
+++ b/e2e/common/traits/master_test.go
@@ -37,48 +37,48 @@ import (
func TestMasterTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("master works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "master"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "master"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "master"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "master"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("only one integration with master runs", func(t *testing.T) {
nameFirst := RandomizedSuffixName("first")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
"--name", nameFirst,
"--label", "leader-group=same",
"-t", "master.label-key=leader-group",
"-t", "master.label-value=same",
"-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Start a second integration with the same lock (it should not start the route)
nameSecond := RandomizedSuffixName("second")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Master.java",
"--name", nameSecond,
"--label", "leader-group=same",
"-t", "master.label-key=leader-group",
"-t", "master.label-value=same",
"-t", "master.resource-name=first-lock",
"-t", "owner.target-labels=leader-group").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in"))
- Eventually(IntegrationLogs(t, ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in"))
+ g.Eventually(IntegrationLogs(t, ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, nameFirst)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, nameFirst)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, nameFirst)()
builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "addons", "master")
- Expect(builderTrait).ToNot(BeNil())
- Expect(len(builderTrait)).To(Equal(2))
- Expect(builderTrait["labelKey"]).To(Equal("leader-group"))
- Expect(builderTrait["labelValue"]).To(Equal("same"))
+ g.Expect(builderTrait).ToNot(BeNil())
+ g.Expect(len(builderTrait)).To(Equal(2))
+ g.Expect(builderTrait["labelKey"]).To(Equal("leader-group"))
+ g.Expect(builderTrait["labelValue"]).To(Equal("same"))
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go
index 8036058a8..afd60051a 100644
--- a/e2e/common/traits/openapi_test.go
+++ b/e2e/common/traits/openapi_test.go
@@ -37,7 +37,7 @@ import (
func TestOpenAPI(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
openapiContent, err := ioutil.ReadFile("./files/openapi/petstore-api.yaml")
require.NoError(t, err)
@@ -45,24 +45,24 @@ func TestOpenAPI(t *testing.T) {
cmDataProps["petstore-api.yaml"] = string(openapiContent)
CreatePlainTextConfigmap(t, ns, "my-openapi", cmDataProps)
- Expect(KamelRunWithID(t, operatorID, ns,
+ g.Expect(KamelRunWithID(t, operatorID, ns,
"--name", "petstore",
"--open-api", "configmap:my-openapi",
"files/openapi/petstore.groovy",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "petstore"), TestTimeoutLong).
+ g.Eventually(IntegrationPodPhase(t, ns, "petstore"), TestTimeoutLong).
Should(Equal(corev1.PodRunning))
- Eventually(DeploymentWithIntegrationLabel(t, ns, "petstore"), TestTimeoutLong).
+ g.Eventually(DeploymentWithIntegrationLabel(t, ns, "petstore"), TestTimeoutLong).
Should(Not(BeNil()))
- Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
+ g.Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started listPets (rest://get:/v1:/pets)"))
- Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
+ g.Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started createPets (rest://post:/v1:/pets)"))
- Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
+ g.Eventually(IntegrationLogs(t, ns, "petstore"), TestTimeoutMedium).
Should(ContainSubstring("Started showPetById (rest://get:/v1:/pets/%7BpetId%7D)"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index d8d0a7759..a3cb8e803 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -45,35 +45,35 @@ import (
func TestPodDisruptionBudgetTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "pdb.enabled=true",
"-t", "pdb.min-available=2",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
pdbTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pdb")
- Expect(pdbTrait).ToNot(BeNil())
- Expect(len(pdbTrait)).To(Equal(2))
- Expect(pdbTrait["enabled"]).To(Equal(true))
- Expect(pdbTrait["minAvailable"]).To(Equal("2"))
+ g.Expect(pdbTrait).ToNot(BeNil())
+ g.Expect(len(pdbTrait)).To(Equal(2))
+ g.Expect(pdbTrait["enabled"]).To(Equal(true))
+ g.Expect(pdbTrait["minAvailable"]).To(Equal("2"))
// Check PodDisruptionBudget
- Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).ShouldNot(BeNil())
pdb := podDisruptionBudget(t, ns, name)()
// Assert PDB Spec
- Expect(pdb.Spec.MinAvailable).To(PointTo(Equal(intstr.FromInt(2))))
+ g.Expect(pdb.Spec.MinAvailable).To(PointTo(Equal(intstr.FromInt(2))))
// Assert PDB Status
- Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
+ g.Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
Should(MatchFieldsP(IgnoreExtras, Fields{
"Status": MatchFields(IgnoreExtras, Fields{
"ObservedGeneration": BeNumerically("==", 1),
@@ -85,17 +85,17 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
}))
// Scale Integration
- Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
- Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(2))
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Expect(ScaleIntegration(t, ns, name, 2)).To(Succeed())
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(2))
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(PointTo(BeNumerically("==", 2)))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
// Check PodDisruptionBudget
pdb = podDisruptionBudget(t, ns, name)()
- Expect(pdb).NotTo(BeNil())
+ g.Expect(pdb).NotTo(BeNil())
// Assert PDB Status according to the scale change
- Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
+ g.Eventually(podDisruptionBudget(t, ns, name), TestTimeoutShort).
Should(MatchFieldsP(IgnoreExtras, Fields{
"Status": MatchFields(IgnoreExtras, Fields{
"ObservedGeneration": BeNumerically("==", 1),
@@ -108,13 +108,13 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
// Eviction attempt
pods := IntegrationPods(t, ns, name)()
- Expect(pods).To(HaveLen(2))
+ g.Expect(pods).To(HaveLen(2))
err := TestClient(t).CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
ObjectMeta: metav1.ObjectMeta{
Name: pods[0].Name,
},
})
- Expect(err).To(MatchError(&k8serrors.StatusError{
+ g.Expect(err).To(MatchError(&k8serrors.StatusError{
ErrStatus: metav1.Status{
Status: "Failure",
Message: "Cannot evict pod as it would violate the pod's disruption budget.",
@@ -133,22 +133,22 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
// Scale Integration to Scale > PodDisruptionBudgetSpec.MinAvailable
// for the eviction request to succeed once replicas are ready
- Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
- Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(3))
- Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
+ g.Expect(ScaleIntegration(t, ns, name, 3)).To(Succeed())
+ g.Eventually(IntegrationPods(t, ns, name), TestTimeoutMedium).Should(HaveLen(3))
+ g.Eventually(IntegrationStatusReplicas(t, ns, name), TestTimeoutShort).
Should(PointTo(BeNumerically("==", 3)))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
pods = IntegrationPods(t, ns, name)()
- Expect(pods).To(HaveLen(3))
- Expect(TestClient(t).CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
+ g.Expect(pods).To(HaveLen(3))
+ g.Expect(TestClient(t).CoreV1().Pods(ns).EvictV1(TestContext, &policyv1.Eviction{
ObjectMeta: metav1.ObjectMeta{
Name: pods[0].Name,
},
})).To(Succeed())
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go
index a8f0d6b99..66360f55f 100644
--- a/e2e/common/traits/pod_test.go
+++ b/e2e/common/traits/pod_test.go
@@ -36,7 +36,7 @@ import (
func TestPodTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
tc := []struct {
name string
@@ -49,14 +49,14 @@ func TestPodTrait(t *testing.T) {
//nolint: thelper
assertions: func(t *testing.T, ns string, name string) {
// check that integrations is working and reading data created by sidecar container
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Content from the sidecar container"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Content from the sidecar container"))
// check that env var is injected
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hello from the template"))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hello from the template"))
pod := IntegrationPod(t, ns, name)()
// check if ENV variable is applied
envValue := getEnvVar("TEST_VARIABLE", pod.Spec)
- Expect(envValue).To(Equal("hello from the template"))
+ g.Expect(envValue).To(Equal("hello from the template"))
},
},
{
@@ -64,7 +64,7 @@ func TestPodTrait(t *testing.T) {
templateName: "files/template-with-supplemental-groups.yaml",
//nolint: thelper
assertions: func(t *testing.T, ns string, name string) {
- Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
+ g.Eventually(IntegrationPodHas(t, ns, name, func(pod *corev1.Pod) bool {
if pod.Spec.SecurityContext == nil {
return false
}
@@ -85,23 +85,23 @@ func TestPodTrait(t *testing.T) {
test := tc[i]
t.Run(test.name, func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PodTest.groovy",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PodTest.groovy",
"--name", name,
"--pod-template", test.templateName,
).Execute()).To(Succeed())
// check integration is deployed
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
test.assertions(t, ns, name)
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go
index aa359e0bc..b2ad103f5 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -45,27 +45,27 @@ import (
func TestPrometheusTrait(t *testing.T) {
// test not able to run in parallel
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
require.NoError(t, err)
// Do not create PodMonitor for the time being as CI test runs on OCP 3.11
createPodMonitor := false
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"-t", "prometheus.enabled=true",
"-t", fmt.Sprintf("prometheus.pod-monitor=%v", createPodMonitor)).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "java")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "java")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "java")()
prometheusTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "prometheus")
- Expect(prometheusTrait).ToNot(BeNil())
- Expect(len(prometheusTrait)).To(Equal(2))
- Expect(prometheusTrait["enabled"]).To(Equal(true))
- Expect(prometheusTrait["podMonitor"]).ToNot(BeNil())
+ g.Expect(prometheusTrait).ToNot(BeNil())
+ g.Expect(len(prometheusTrait)).To(Equal(2))
+ g.Expect(prometheusTrait["enabled"]).To(Equal(true))
+ g.Expect(prometheusTrait["podMonitor"]).ToNot(BeNil())
t.Run("Metrics endpoint works", func(t *testing.T) {
pod := IntegrationPod(t, ns, "java")
response, err := TestClient(t).CoreV1().RESTClient().Get().
@@ -79,11 +79,11 @@ func TestPrometheusTrait(t *testing.T) {
if ocp && createPodMonitor {
t.Run("PodMonitor is created", func(t *testing.T) {
sm := podMonitor(t, ns, "java")
- Eventually(sm, TestTimeoutShort).ShouldNot(BeNil())
+ g.Eventually(sm, TestTimeoutShort).ShouldNot(BeNil())
})
}
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go
index a2e2f5499..d8ec4fb20 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -38,46 +38,46 @@ import (
func TestPullSecretTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
t.Run("Image pull secret is set on pod", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "pull-secret.enabled=true",
"-t", "pull-secret.secret-name=dummy-secret").Execute()).To(Succeed())
// pod may not run because the pull secret is dummy
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Or(Equal(corev1.PodRunning), Equal(corev1.PodPending)))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Or(Equal(corev1.PodRunning), Equal(corev1.PodPending)))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
- Expect(pod.Spec.ImagePullSecrets[0].Name).To(Equal("dummy-secret"))
+ g.Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
+ g.Expect(pod.Spec.ImagePullSecrets[0].Name).To(Equal("dummy-secret"))
})
t.Run("Explicitly disable image pull secret", func(t *testing.T) {
name := RandomizedSuffixName("java2")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name,
"-t", "pull-secret.enabled=false").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, name)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, name)()
pullSecretTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pull-secret")
- Expect(pullSecretTrait).ToNot(BeNil())
- Expect(len(pullSecretTrait)).To(Equal(1))
- Expect(pullSecretTrait["enabled"]).To(Equal(false))
+ g.Expect(pullSecretTrait).ToNot(BeNil())
+ g.Expect(len(pullSecretTrait)).To(Equal(1))
+ g.Expect(pullSecretTrait["enabled"]).To(Equal(false))
pod := IntegrationPod(t, ns, name)()
if ocp {
// OpenShift `default` service account has imagePullSecrets so it's always set
- Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
+ g.Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
} else {
- Expect(pod.Spec.ImagePullSecrets).To(BeNil())
+ g.Expect(pod.Spec.ImagePullSecrets).To(BeNil())
}
})
@@ -85,18 +85,18 @@ func TestPullSecretTrait(t *testing.T) {
// OpenShift always has an internal registry so image pull secret is set by default
t.Run("Image pull secret is automatically set by default", func(t *testing.T) {
name := RandomizedSuffixName("java3")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
- Expect(pod.Spec.ImagePullSecrets[0].Name).To(HavePrefix("default-dockercfg-"))
+ g.Expect(pod.Spec.ImagePullSecrets).NotTo(BeEmpty())
+ g.Expect(pod.Spec.ImagePullSecrets[0].Name).To(HavePrefix("default-dockercfg-"))
})
}
// Clean-up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index c192aae1f..52807a0b8 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -73,7 +73,7 @@ var skipClientTLSVerification = true
func TestRunRoutes(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
ocp, err := openshift.IsOpenShift(TestClient(t))
if !ocp {
@@ -83,7 +83,7 @@ func TestRunRoutes(t *testing.T) {
require.NoError(t, err)
operatorID := "camel-k-trait-route"
- Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
// create a test secret of type tls with certificates
// this secret is used to setupt the route TLS object across diferent tests
@@ -98,60 +98,60 @@ func TestRunRoutes(t *testing.T) {
// Insecure Route / No TLS
// =============================
t.Run("Route unsecure http works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before doing an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
url := fmt.Sprintf("http://%s/hello?name=Simple", route().Spec.Host)
- Eventually(httpRequest(url, false), TestTimeoutShort).Should(Equal("Hello Simple"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, false), TestTimeoutShort).Should(Equal("Hello Simple"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Edge
// =============================
t.Run("Route Edge https works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java", "-t", "route.tls-termination=edge").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java", "-t", "route.tls-termination=edge").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
url := fmt.Sprintf("https://%s/hello?name=TLS_Edge", route().Spec.Host)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello TLS_Edge"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello TLS_Edge"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Edge with custom certificate
// =============================
t.Run("Route Edge (custom certificate) https works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "route.tls-termination=edge",
"-t", "route.tls-certificate-secret="+refCert,
"-t", "route.tls-key-secret="+refKey,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
code := "TLS_EdgeCustomCertificate"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Passthrough
// =============================
t.Run("Route passthrough https works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
// the --resource mounts the certificates inside secret as files in the integration pod
"--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
// quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
@@ -160,23 +160,23 @@ func TestRunRoutes(t *testing.T) {
"-t", "route.tls-termination=passthrough",
"-t", "container.port=8443",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
code := "TLS_Passthrough"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
// =============================
// TLS Route Reencrypt
// =============================
t.Run("Route Reencrypt https works", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
// the --resource mounts the certificates inside secret as files in the integration pod
"--resource", "secret:"+secretName+"@/etc/ssl/"+secretName,
// quarkus platform-http uses these two properties to setup the HTTP endpoint with TLS support
@@ -189,42 +189,42 @@ func TestRunRoutes(t *testing.T) {
"-t", "route.tls-key-secret="+refKey,
"-t", "container.port=8443",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := Route(t, ns, integrationName)
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
code := "TLS_Reencrypt"
url := fmt.Sprintf("https://%s/hello?name=%s", route().Spec.Host, code)
- Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Eventually(httpRequest(url, true), TestTimeoutShort).Should(Equal("Hello " + code))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
t.Run("Route annotations added", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "route.annotations.'haproxy.router.openshift.io/balance'=roundrobin").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, integrationName), TestTimeoutLong).Should(Equal(corev1.PodRunning))
route := RouteFull(t, ns, integrationName)()
- Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(route, TestTimeoutMedium).ShouldNot(BeNil())
// must wait a little time after route is created, before an http request,
// otherwise the route is unavailable and the http request will fail
time.Sleep(waitBeforeHttpRequest)
var annotations = route.ObjectMeta.Annotations
- Expect(annotations["haproxy.router.openshift.io/balance"]).To(Equal("roundrobin"))
+ g.Expect(annotations["haproxy.router.openshift.io/balance"]).To(Equal("roundrobin"))
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, integrationName)).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, integrationName)).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, integrationName)()
routeTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "route")
- Expect(routeTrait).ToNot(BeNil())
- Expect(len(routeTrait)).To(Equal(1))
- Expect(routeTrait["enabled"]).To(Equal(true))
+ g.Expect(routeTrait).ToNot(BeNil())
+ g.Expect(len(routeTrait)).To(Equal(1))
+ g.Expect(routeTrait["enabled"]).To(Equal(true))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).Should(BeNil())
})
- Expect(TestClient(t).Delete(TestContext, &secret)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, &secret)).To(Succeed())
})
}
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 45ddeae49..656b90360 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -38,7 +38,7 @@ import (
func TestServiceBindingTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Integration Service Binding", func(t *testing.T) {
// Create our mock service config
@@ -63,17 +63,17 @@ func TestServiceBindingTrait(t *testing.T) {
},
}
serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
- Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Create integration and bind it to our service
name := RandomizedSuffixName("service-binding")
- Expect(KamelRunWithID(t, operatorID, ns, "files/ServiceBinding.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/ServiceBinding.java",
"--name", name,
"--connect", serviceRef,
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
})
t.Run("Binding Service Binding", func(t *testing.T) {
@@ -96,16 +96,16 @@ func TestServiceBindingTrait(t *testing.T) {
},
}
serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
- Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
- Expect(CreateTimerKamelet(t, ns, "my-timer-source")()).To(Succeed())
- Expect(KamelBindWithID(t, operatorID, ns, "my-timer-source", "log:info",
+ g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, ns, "my-timer-source")()).To(Succeed())
+ g.Expect(KamelBindWithID(t, operatorID, ns, "my-timer-source", "log:info",
"-p", "source.message=Hello+world",
"--connect", serviceRef).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "my-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, "my-timer-source-to-log")).Should(ContainSubstring("Body: Hello+world"))
+ g.Eventually(IntegrationPodPhase(t, ns, "my-timer-source-to-log"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, "my-timer-source-to-log")).Should(ContainSubstring("Body: Hello+world"))
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go
index ad40c9783..02f486610 100644
--- a/e2e/common/traits/service_test.go
+++ b/e2e/common/traits/service_test.go
@@ -36,89 +36,89 @@ import (
func TestServiceTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("NodePort service", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.node-port=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("Default service (ClusterIP)", func(t *testing.T) {
// Service trait is enabled by default
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("NodePort service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=NodePort").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeNodePort), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("ClusterIP service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=ClusterIP").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
// check integration schema does not contains unwanted default trait value.
- Eventually(UnstructuredIntegration(t, ns, "platform-http-server")).ShouldNot(BeNil())
+ g.Eventually(UnstructuredIntegration(t, ns, "platform-http-server")).ShouldNot(BeNil())
unstructuredIntegration := UnstructuredIntegration(t, ns, "platform-http-server")()
serviceTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "service")
- Expect(serviceTrait).ToNot(BeNil())
- Expect(len(serviceTrait)).To(Equal(2))
- Expect(serviceTrait["enabled"]).To(Equal(true))
- Expect(serviceTrait["type"]).To(Equal("ClusterIP"))
+ g.Expect(serviceTrait).ToNot(BeNil())
+ g.Expect(len(serviceTrait)).To(Equal(2))
+ g.Expect(serviceTrait["enabled"]).To(Equal(true))
+ g.Expect(serviceTrait["type"]).To(Equal("ClusterIP"))
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
t.Run("LoadBalancer service from Type", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/PlatformHttpServer.java",
"-t", "service.enabled=true",
"-t", "service.type=LoadBalancer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationPodPhase(t, ns, "platform-http-server"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
//
// Service names can vary with the ExternalName Service
// sometimes being created first and being given the root name
//
- Eventually(ServicesByType(t, ns, corev1.ServiceTypeLoadBalancer), TestTimeoutLong).ShouldNot(BeEmpty())
+ g.Eventually(ServicesByType(t, ns, corev1.ServiceTypeLoadBalancer), TestTimeoutLong).ShouldNot(BeEmpty())
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
})
}
diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go
index c57eb4544..2bd3050a8 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -38,23 +38,23 @@ import (
func TestTolerationTrait(t *testing.T) {
t.Parallel()
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run Java with node toleration operation exists", func(t *testing.T) {
name := RandomizedSuffixName("java1")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "toleration.enabled=true",
"-t", "toleration.taints=camel.apache.org/master:NoExecute:300",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.Spec.Tolerations).NotTo(BeNil())
+ g.Expect(pod.Spec.Tolerations).NotTo(BeNil())
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ g.Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
Key: "camel.apache.org/master",
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoExecute,
@@ -64,19 +64,19 @@ func TestTolerationTrait(t *testing.T) {
t.Run("Run Java with node toleration operation equals", func(t *testing.T) {
name := RandomizedSuffixName("java2")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
"-t", "toleration.enabled=true",
"-t", "toleration.taints=camel.apache.org/master=test:NoExecute:300",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod.Spec.Tolerations).NotTo(BeNil())
+ g.Expect(pod.Spec.Tolerations).NotTo(BeNil())
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ g.Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
Key: "camel.apache.org/master",
Operator: corev1.TolerationOpEqual,
Value: "test", Effect: corev1.TaintEffectNoExecute,
@@ -90,7 +90,7 @@ func TestTolerationTrait(t *testing.T) {
}
name := RandomizedSuffixName("java3")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
"--name", name,
// Use the affinity trait to force the scheduling of the Integration pod onto a master node
"-t", "affinity.enabled=true",
@@ -100,23 +100,23 @@ func TestTolerationTrait(t *testing.T) {
"-t", "toleration.taints=node-role.kubernetes.io/master:NoSchedule",
).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := IntegrationPod(t, ns, name)()
- Expect(pod).NotTo(BeNil())
+ g.Expect(pod).NotTo(BeNil())
// Check the Integration pod contains the toleration
- Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
+ g.Expect(pod.Spec.Tolerations).To(ContainElement(corev1.Toleration{
Key: "node-role.kubernetes.io/master",
Operator: corev1.TolerationOpExists,
Effect: corev1.TaintEffectNoSchedule,
}))
// Check the Integration pod is running on a master node
- Expect(Node(t, pod.Spec.NodeName)()).NotTo(BeNil())
- Expect(Node(t, pod.Spec.NodeName)()).To(PointTo(MatchFields(IgnoreExtras, Fields{
+ g.Expect(Node(t, pod.Spec.NodeName)()).NotTo(BeNil())
+ g.Expect(Node(t, pod.Spec.NodeName)()).To(PointTo(MatchFields(IgnoreExtras, Fields{
"Spec": MatchFields(IgnoreExtras, Fields{
"Taints": ContainElement(corev1.Taint{
Key: "node-role.kubernetes.io/master",
@@ -127,6 +127,6 @@ func TestTolerationTrait(t *testing.T) {
})
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/install/cli/global_kamelet_test.go b/e2e/install/cli/global_kamelet_test.go
index e01ce9d3f..5becde9c3 100644
--- a/e2e/install/cli/global_kamelet_test.go
+++ b/e2e/install/cli/global_kamelet_test.go
@@ -32,42 +32,42 @@ import (
)
func TestRunGlobalKamelet(t *testing.T) {
- WithGlobalOperatorNamespace(t, func(operatorNamespace string) {
+ WithGlobalOperatorNamespace(t, func(g *WithT, operatorNamespace string) {
operatorID := "camel-k-global-kamelet"
- Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
t.Run("Global operator + namespaced kamelet test", func(t *testing.T) {
// NS2: namespace without operator
- WithNewTestNamespace(t, func(ns2 string) {
- Expect(CreateTimerKamelet(t, ns2, "my-own-timer-source")()).To(Succeed())
+ WithNewTestNamespace(t, func(g *WithT, ns2 string) {
+ g.Expect(CreateTimerKamelet(t, ns2, "my-own-timer-source")()).To(Succeed())
- Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
- Expect(KamelRunWithID(t, operatorID, ns2, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns2, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns2, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
- Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns2, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns2, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns2, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
})
})
t.Run("Global operator + global kamelet test", func(t *testing.T) {
- Expect(CreateTimerKamelet(t, operatorNamespace, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorNamespace, "my-own-timer-source")()).To(Succeed())
// NS3: namespace without operator
- WithNewTestNamespace(t, func(ns3 string) {
- Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
-
- Expect(KamelRunWithID(t, operatorID, ns3, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns3, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns3, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
- Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, Kamelet(t, "my-own-timer-source", operatorNamespace)())).To(Succeed())
+ WithNewTestNamespace(t, func(g *WithT, ns3 string) {
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+
+ g.Expect(KamelRunWithID(t, operatorID, ns3, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns3, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns3, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, Kamelet(t, "my-own-timer-source", operatorNamespace)())).To(Succeed())
})
})
- Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles=false", "--skip-cluster-role-bindings=false").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles=false", "--skip-cluster-role-bindings=false").Execute()).To(Succeed())
})
}
diff --git a/e2e/install/cli/global_test.go b/e2e/install/cli/global_test.go
index 76d1cb396..c0f3cb05d 100644
--- a/e2e/install/cli/global_test.go
+++ b/e2e/install/cli/global_test.go
@@ -40,91 +40,89 @@ import (
)
func TestRunGlobalInstall(t *testing.T) {
- RegisterTestingT(t)
-
- WithGlobalOperatorNamespace(t, func(operatorNamespace string) {
- Expect(KamelInstall(t, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
- Eventually(OperatorPodPhase(t, operatorNamespace), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ WithGlobalOperatorNamespace(t, func(g *WithT, operatorNamespace string) {
+ g.Expect(KamelInstall(t, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(OperatorPodPhase(t, operatorNamespace), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
t.Run("Global CamelCatalog reconciliation", func(t *testing.T) {
- Eventually(Platform(t, operatorNamespace)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(t, operatorNamespace, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ g.Eventually(Platform(t, operatorNamespace)).ShouldNot(BeNil())
+ g.Eventually(PlatformConditionStatus(t, operatorNamespace, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion))
- Eventually(CamelCatalog(t, operatorNamespace, catalogName)).ShouldNot(BeNil())
- Eventually(CamelCatalogPhase(t, operatorNamespace, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Eventually(CamelCatalog(t, operatorNamespace, catalogName)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogPhase(t, operatorNamespace, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
})
t.Run("Global test on namespace with platform", func(t *testing.T) {
- WithNewTestNamespace(t, func(ns2 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns2 string) {
// Creating namespace local platform
- Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
- Eventually(Platform(t, ns2)).ShouldNot(BeNil())
+ g.Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Eventually(Platform(t, ns2)).ShouldNot(BeNil())
// Run with global operator id
- Expect(KamelRun(t, ns2, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns2, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns2, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(t, ns2, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns2 + "\\/.*"))
+ g.Expect(KamelRun(t, ns2, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns2, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns2, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationConditionMessage(IntegrationCondition(t, ns2, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns2 + "\\/.*"))
kit := IntegrationKit(t, ns2, "java")()
- Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
- Expect(Kits(t, ns2)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
- Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns2).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns2)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
+ g.Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
- Expect(Lease(t, ns2, platform.DefaultPlatformName)()).To(BeNil(), "No locking Leases expected")
+ g.Expect(Lease(t, ns2, platform.DefaultPlatformName)()).To(BeNil(), "No locking Leases expected")
})
})
t.Run("Global test on namespace with its own operator", func(t *testing.T) {
- WithNewTestNamespace(t, func(ns3 string) {
+ WithNewTestNamespace(t, func(g *WithT, ns3 string) {
operatorID := "camel-k-local-ns3"
if NoOlmOperatorImage != "" {
- Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage).Execute()).To(Succeed())
} else {
- Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false").Execute()).To(Succeed())
}
- Eventually(OperatorPodPhase(t, ns3), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Expect(KamelRunWithID(t, operatorID, ns3, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns3, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns3, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(t, ns3, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns3 + "\\/.*"))
+ g.Eventually(OperatorPodPhase(t, ns3), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Expect(KamelRunWithID(t, operatorID, ns3, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns3, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns3, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationConditionMessage(IntegrationCondition(t, ns3, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(ns3 + "\\/.*"))
kit := IntegrationKit(t, ns3, "java")()
- Expect(Kits(t, ns3)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
- Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns3)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit)))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns3).Execute()).To(Succeed())
- Expect(Lease(t, ns3, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
- Expect(Lease(t, ns3, platform.GetOperatorLockName(operatorID))()).ShouldNot(BeNil(),
+ g.Expect(Lease(t, ns3, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ g.Expect(Lease(t, ns3, platform.GetOperatorLockName(operatorID))()).ShouldNot(BeNil(),
"Controller Runtime is expected to use Leases for leader election: if this changes we should update our locking logic",
)
})
})
t.Run("Global test on namespace without platform", func(t *testing.T) {
- WithNewTestNamespace(t, func(ns4 string) {
- Expect(KamelRun(t, ns4, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns4, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns4, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(t, ns4, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
+ WithNewTestNamespace(t, func(g *WithT, ns4 string) {
+ g.Expect(KamelRun(t, ns4, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns4, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns4, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationConditionMessage(IntegrationCondition(t, ns4, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
kit := IntegrationKit(t, ns4, "java")()
- Expect(Kamel(t, "delete", "--all", "-n", ns4).Execute()).To(Succeed())
- Expect(Kits(t, ns4)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
- Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Kit built globally
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns4).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns4)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+ g.Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Kit built globally
- Expect(Lease(t, ns4, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ g.Expect(Lease(t, ns4, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
})
})
t.Run("Global test on namespace without platform with external kit", func(t *testing.T) {
- WithNewTestNamespace(t, func(ns5 string) {
- Expect(KamelRun(t, ns5, "files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns5, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns5, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationConditionMessage(IntegrationCondition(t, ns5, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
+ WithNewTestNamespace(t, func(g *WithT, ns5 string) {
+ g.Expect(KamelRun(t, ns5, "files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns5, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns5, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationConditionMessage(IntegrationCondition(t, ns5, "java", v1.IntegrationConditionPlatformAvailable)())).To(MatchRegexp(operatorNamespace + "\\/.*"))
kit := IntegrationKit(t, ns5, "java")()
- Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
- Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), Not(ContainElement(kit))))
globalKits := Kits(t, operatorNamespace)()
- Expect(globalKits).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Reusing the same global kit
+ g.Expect(globalKits).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // Reusing the same global kit
// external kit mirroring the global one
externalKit := v1.IntegrationKit{
@@ -139,21 +137,21 @@ func TestRunGlobalInstall(t *testing.T) {
Image: getKitImage(t, operatorNamespace, kit),
},
}
- Expect(TestClient(t).Create(TestContext, &externalKit)).Should(BeNil())
+ g.Expect(TestClient(t).Create(TestContext, &externalKit)).Should(BeNil())
- Expect(KamelRun(t, ns5, "files/Java.java", "--name", "ext", "--kit", "external", "-t", "jvm.enabled=true").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns5, "ext"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns5, "ext"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
- Expect(IntegrationKit(t, ns5, "ext")()).Should(Equal("external"))
- Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
- Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement("external"))) // the external one
- Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // the global one
+ g.Expect(KamelRun(t, ns5, "files/Java.java", "--name", "ext", "--kit", "external", "-t", "jvm.enabled=true").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns5, "ext"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns5, "ext"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(IntegrationKit(t, ns5, "ext")()).Should(Equal("external"))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns5).Execute()).To(Succeed())
+ g.Expect(Kits(t, ns5)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement("external"))) // the external one
+ g.Expect(Kits(t, operatorNamespace)()).Should(WithTransform(integrationKitsToNamesTransform(), ContainElement(kit))) // the global one
- Expect(Lease(t, ns5, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
+ g.Expect(Lease(t, ns5, platform.OperatorLockName)()).To(BeNil(), "No locking Leases expected")
})
})
- Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "uninstall", "-n", operatorNamespace, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
})
}
diff --git a/e2e/install/cli/install_test.go b/e2e/install/cli/install_test.go
index 2cf087e7a..35fdb2e84 100644
--- a/e2e/install/cli/install_test.go
+++ b/e2e/install/cli/install_test.go
@@ -47,30 +47,30 @@ import (
)
func TestBasicInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
// Check if restricted security context has been applyed
operatorPod := OperatorPod(t, ns)()
- Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
t.Run("run yaml", func(t *testing.T) {
- Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Check if file exists in operator pod
- Expect(OperatorPod(t, ns)().Name).NotTo(Equal(""))
- Expect(OperatorPod(t, ns)().Spec.Containers[0].Name).NotTo(Equal(""))
+ g.Expect(OperatorPod(t, ns)().Name).NotTo(Equal(""))
+ g.Expect(OperatorPod(t, ns)().Spec.Containers[0].Name).NotTo(Equal(""))
req := TestClient(t).CoreV1().RESTClient().Post().
Resource("pods").
@@ -89,7 +89,7 @@ func TestBasicInstallation(t *testing.T) {
}, scheme.ParameterCodec)
exec, err := remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// returns an error if file does not exists
execErr := exec.Stream(remotecommand.StreamOptions{
@@ -97,38 +97,38 @@ func TestBasicInstallation(t *testing.T) {
Stderr: os.Stderr,
Tty: false,
})
- Expect(execErr).To(BeNil())
+ g.Expect(execErr).To(BeNil())
})
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
func TestAlternativeImageInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest").Execute()).To(Succeed())
- Eventually(OperatorImage(t, ns)).Should(Equal("x/y:latest"))
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest").Execute()).To(Succeed())
+ g.Eventually(OperatorImage(t, ns)).Should(Equal("x/y:latest"))
})
}
func TestKitMainInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Expect(Kamel(t, "kit", "create", "timer", "-d", "camel:timer", "-x", operatorID, "-n", ns).Execute()).To(Succeed())
- Eventually(Build(t, ns, "timer"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "kit", "create", "timer", "-d", "camel:timer", "-x", operatorID, "-n", ns).Execute()).To(Succeed())
+ g.Eventually(Build(t, ns, "timer"), TestTimeoutMedium).ShouldNot(BeNil())
})
}
func TestMavenRepositoryInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/").Execute()).To(Succeed())
configmapName := fmt.Sprintf("%s-maven-settings", operatorID)
- Eventually(Configmap(t, ns, configmapName)).Should(Not(BeNil()))
- Eventually(func() string {
+ g.Eventually(Configmap(t, ns, configmapName)).Should(Not(BeNil()))
+ g.Eventually(func() string {
return Configmap(t, ns, configmapName)().Data["settings.xml"]
}).Should(ContainSubstring("https://my.repo.org/public/"))
})
@@ -139,11 +139,11 @@ func TestMavenRepositoryInstallation(t *testing.T) {
* so the Platform will have an empty Registry structure
*/
func TestSkipRegistryInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup").Execute()).To(Succeed())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
- Eventually(func() v1.RegistrySpec {
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup").Execute()).To(Succeed())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(func() v1.RegistrySpec {
return Platform(t, ns)().Spec.Build.Registry
}, TestTimeoutMedium).Should(Equal(v1.RegistrySpec{}))
})
@@ -173,16 +173,16 @@ func TestConsoleCliDownload(t *testing.T) {
templt, err := template.New("downloadLink").Parse(downloadUrlTemplate)
require.NoError(t, err)
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// make sure there is no preinstalled CliDownload resource
cliDownload := ConsoleCLIDownload(t, name)()
if cliDownload != nil {
- Expect(TestClient(t).Delete(TestContext, cliDownload)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, cliDownload)).To(Succeed())
}
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(ConsoleCLIDownload(t, name), TestTimeoutMedium).Should(Not(BeNil()))
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(ConsoleCLIDownload(t, name), TestTimeoutMedium).Should(Not(BeNil()))
cliDownload = ConsoleCLIDownload(t, name)()
links := cliDownload.Spec.Links
@@ -198,25 +198,25 @@ func TestConsoleCliDownload(t *testing.T) {
}
templt.Execute(&buf, args)
- Expect(link.Href).To(MatchRegexp(buf.String()))
+ g.Expect(link.Href).To(MatchRegexp(buf.String()))
}
})
}
func TestInstallSkipDefaultKameletsInstallation(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Expect(KameletList(t, ns)()).Should(BeEmpty())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KameletList(t, ns)()).Should(BeEmpty())
})
}
func TestInstallDebugLogging(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug").Execute()).To(Succeed())
- Eventually(OperatorEnvVarValue(t, ns, "LOG_LEVEL"), TestTimeoutLong).Should(Equal("debug"))
+ g.Eventually(OperatorEnvVarValue(t, ns, "LOG_LEVEL"), TestTimeoutLong).Should(Equal("debug"))
})
}
diff --git a/e2e/install/cli/maven_ca_secret_test.go b/e2e/install/cli/maven_ca_secret_test.go
index 337cc3c52..e5096735c 100644
--- a/e2e/install/cli/maven_ca_secret_test.go
+++ b/e2e/install/cli/maven_ca_secret_test.go
@@ -56,7 +56,7 @@ import (
)
func TestMavenCASecret(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
hostname := fmt.Sprintf("%s.%s.svc", "nexus", ns)
tlsMountPath := "/etc/tls/private"
@@ -77,7 +77,7 @@ func TestMavenCASecret(t *testing.T) {
// generate certPem private key
certPrivateKey, err := rsa.GenerateKey(rand.Reader, 2048)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
privateKeyBytes := x509.MarshalPKCS1PrivateKey(certPrivateKey)
// encode for storing into secret
@@ -88,7 +88,7 @@ func TestMavenCASecret(t *testing.T) {
},
)
certBytes, err := x509.CreateCertificate(rand.Reader, cert, cert, &certPrivateKey.PublicKey, certPrivateKey)
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
// encode for storing into secret
certPem := pem.EncodeToMemory(&pem.Block{
@@ -111,7 +111,7 @@ func TestMavenCASecret(t *testing.T) {
corev1.TLSPrivateKeyKey: privateKeyPem,
},
}
- Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, secret)).To(Succeed())
// HTTPD configuration
config := &corev1.ConfigMap{
@@ -179,7 +179,7 @@ ProxyPreserveHost On
),
},
}
- Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, config)).To(Succeed())
// Deploy Nexus
// https://help.sonatype.com/repomanager3/installation/run-behind-a-reverse-proxy
@@ -296,7 +296,7 @@ ProxyPreserveHost On
},
},
}
- Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, deployment)).To(Succeed())
service := &corev1.Service{
TypeMeta: metav1.TypeMeta{
@@ -318,10 +318,10 @@ ProxyPreserveHost On
},
},
}
- Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
// Wait for the Deployment to become ready
- Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
+ g.Eventually(Deployment(t, ns, deployment.Name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras,
Fields{
"Status": MatchFields(IgnoreExtras,
Fields{
@@ -337,11 +337,11 @@ ProxyPreserveHost On
APIVersion: corev1.SchemeGroupVersion.String(),
},
}
- Expect(TestClient(t).List(TestContext, pods,
+ g.Expect(TestClient(t).List(TestContext, pods,
ctrl.InNamespace(ns),
ctrl.MatchingLabels{"camel-k": "maven-test-nexus"},
)).To(Succeed())
- Expect(pods.Items).To(HaveLen(1))
+ g.Expect(pods.Items).To(HaveLen(1))
// Retrieve the Nexus admin password
req := TestClient(t).CoreV1().RESTClient().Post().
@@ -360,10 +360,10 @@ ProxyPreserveHost On
}, scheme.ParameterCodec)
exec, err := remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
var password bytes.Buffer
- Expect(exec.Stream(remotecommand.StreamOptions{
+ g.Expect(exec.Stream(remotecommand.StreamOptions{
Stdout: bufio.NewWriter(&password),
Stderr: os.Stderr,
Tty: false,
@@ -411,9 +411,9 @@ ProxyPreserveHost On
}, scheme.ParameterCodec)
exec, err = remotecommand.NewSPDYExecutor(TestClient(t).GetConfig(), "POST", req.URL())
- Expect(err).To(BeNil())
+ g.Expect(err).To(BeNil())
- Expect(exec.Stream(remotecommand.StreamOptions{
+ g.Expect(exec.Stream(remotecommand.StreamOptions{
Stdout: os.Stdout,
Stderr: os.Stderr,
Tty: false,
@@ -421,7 +421,7 @@ ProxyPreserveHost On
// Install Camel K with the Maven Central Nexus proxy and the corresponding Maven CA secret
operatorID := "camel-k-maven-ca-secret"
- Expect(KamelInstallWithID(t, operatorID, ns,
+ g.Expect(KamelInstallWithID(t, operatorID, ns,
"--maven-repository", fmt.Sprintf(`https://%s/repository/maven-public/@id=central-internal@mirrorOf=central`, hostname),
"--maven-repository", fmt.Sprintf(`https://%s/repository/%s/%s`, hostname, stagingRepository.ID, strings.Join(getRepositoryAttributes(stagingRepository), "")),
"--maven-ca-secret", secret.Name+"/"+corev1.TLSCertKey,
@@ -429,32 +429,32 @@ ProxyPreserveHost On
"--maven-cli-option", "--batch-mode",
).Execute()).To(Succeed())
- Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the Integration
name := RandomizedSuffixName("java")
- Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
+ g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("Magicstring!"))
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutLong).Should(ContainSubstring("Magicstring!"))
// Assert no dependencies have been downloaded from the Maven central repository
// Note: this should be adapted for the Pod build strategy
pod := OperatorPod(t, ns)()
- Expect(pod).NotTo(BeNil())
+ g.Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
logs := Logs(t, pod.Namespace, pod.Name, corev1.PodLogOptions{})()
- Expect(logs).NotTo(BeEmpty())
- Expect(logs).NotTo(ContainSubstring("Downloaded from central:"))
+ g.Expect(logs).NotTo(BeEmpty())
+ g.Expect(logs).NotTo(ContainSubstring("Downloaded from central:"))
// Clean up
- Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
- Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, deployment)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, service)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, secret)).To(Succeed())
+ g.Expect(TestClient(t).Delete(TestContext, config)).To(Succeed())
})
}
diff --git a/e2e/install/cli/uninstall_test.go b/e2e/install/cli/uninstall_test.go
index ea6e20a44..5989848ae 100644
--- a/e2e/install/cli/uninstall_test.go
+++ b/e2e/install/cli/uninstall_test.go
@@ -33,15 +33,15 @@ import (
)
func TestBasicUninstall(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
// should be completely removed on uninstall
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles").Execute()).To(Succeed())
// Roles only removed in non-olm use-case
uninstallViaOLM := false
@@ -52,105 +52,105 @@ func TestBasicUninstall(t *testing.T) {
}
if !uninstallViaOLM {
- Eventually(Role(t, ns)).Should(BeNil())
- Eventually(RoleBinding(t, ns)).Should(BeNil())
- Eventually(ServiceAccount(t, ns, "camel-k-operator")).Should(BeNil())
+ g.Eventually(Role(t, ns)).Should(BeNil())
+ g.Eventually(RoleBinding(t, ns)).Should(BeNil())
+ g.Eventually(ServiceAccount(t, ns, "camel-k-operator")).Should(BeNil())
} else {
- Eventually(Role(t, ns)).ShouldNot(BeNil())
- Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Role(t, ns)).ShouldNot(BeNil())
+ g.Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
}
- Eventually(Configmap(t, ns, "camel-k-maven-settings")).Should(BeNil())
- Eventually(OperatorPod(t, ns), TestTimeoutMedium).Should(BeNil())
- Eventually(KameletList(t, ns), TestTimeoutMedium).Should(BeEmpty())
- Eventually(CamelCatalogList(t, ns), TestTimeoutMedium).Should(BeEmpty())
+ g.Eventually(Configmap(t, ns, "camel-k-maven-settings")).Should(BeNil())
+ g.Eventually(OperatorPod(t, ns), TestTimeoutMedium).Should(BeNil())
+ g.Eventually(KameletList(t, ns), TestTimeoutMedium).Should(BeEmpty())
+ g.Eventually(CamelCatalogList(t, ns), TestTimeoutMedium).Should(BeEmpty())
})
}
func TestUninstallSkipOperator(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except operator
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-operator").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-operator").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
})
}
func TestUninstallSkipRole(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except roles
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-roles").Execute()).To(Succeed())
- Eventually(Role(t, ns)).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-roles").Execute()).To(Succeed())
+ g.Eventually(Role(t, ns)).ShouldNot(BeNil())
})
}
func TestUninstallSkipRoleBinding(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except role-bindings
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-role-bindings").Execute()).To(Succeed())
- Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-role-bindings").Execute()).To(Succeed())
+ g.Eventually(RoleBinding(t, ns)).ShouldNot(BeNil())
})
}
func TestUninstallSkipServiceAccounts(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-service-accounts").Execute()).To(Succeed())
- Eventually(ServiceAccount(t, ns, "camel-k-operator")).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-service-accounts").Execute()).To(Succeed())
+ g.Eventually(ServiceAccount(t, ns, "camel-k-operator")).ShouldNot(BeNil())
})
}
func TestUninstallSkipIntegrationPlatform(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
// NOTE: skip CRDs is also required in addition to skip integration platform
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-integration-platform").Execute()).To(Succeed())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-integration-platform").Execute()).To(Succeed())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
})
}
func TestUninstallSkipKamelets(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except kamelets
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-kamelets").Execute()).To(Succeed())
- Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-kamelets").Execute()).To(Succeed())
+ g.Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
})
}
func TestUninstallSkipCamelCatalogs(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except camel catalogs
- Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-camel-catalogs").Execute()).To(Succeed())
- Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
+ g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-camel-catalogs").Execute()).To(Succeed())
+ g.Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
})
}
diff --git a/e2e/install/helm/setup_test.go b/e2e/install/helm/setup_test.go
index 05c6f89ef..471afac44 100644
--- a/e2e/install/helm/setup_test.go
+++ b/e2e/install/helm/setup_test.go
@@ -37,17 +37,15 @@ import (
)
func TestHelmInstallRunUninstall(t *testing.T) {
- RegisterTestingT(t)
-
KAMEL_INSTALL_REGISTRY := os.Getenv("KAMEL_INSTALL_REGISTRY")
customImage := fmt.Sprintf("%s/apache/camel-k", KAMEL_INSTALL_REGISTRY)
os.Setenv("CAMEL_K_TEST_MAKE_DIR", "../../../")
- WithNewTestNamespace(t, func(ns string) {
- ExpectExecSucceed(t, Make(t, fmt.Sprintf("CUSTOM_IMAGE=%s", customImage), "set-version"))
- ExpectExecSucceed(t, Make(t, "release-helm"))
- ExpectExecSucceed(t,
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
+ ExpectExecSucceed(t, g, Make(t, fmt.Sprintf("CUSTOM_IMAGE=%s", customImage), "set-version"))
+ ExpectExecSucceed(t, g, Make(t, "release-helm"))
+ ExpectExecSucceed(t, g,
exec.Command(
"helm",
"install",
@@ -62,24 +60,24 @@ func TestHelmInstallRunUninstall(t *testing.T) {
),
)
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// Check if restricted security context has been applyed
operatorPod := OperatorPod(t, ns)()
- Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
//Test a simple route
t.Run("simple route", func(t *testing.T) {
name := RandomizedSuffixName("yaml")
- Expect(KamelRun(t, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(KamelRun(t, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
- ExpectExecSucceed(t,
+ ExpectExecSucceed(t, g,
exec.Command(
"helm",
"uninstall",
@@ -89,6 +87,6 @@ func TestHelmInstallRunUninstall(t *testing.T) {
),
)
- Eventually(OperatorPod(t, ns)).Should(BeNil())
+ g.Eventually(OperatorPod(t, ns)).Should(BeNil())
})
}
diff --git a/e2e/install/kustomize/operator_test.go b/e2e/install/kustomize/operator_test.go
index a2fb78f99..03a23555e 100644
--- a/e2e/install/kustomize/operator_test.go
+++ b/e2e/install/kustomize/operator_test.go
@@ -41,40 +41,40 @@ func TestOperatorBasic(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- RegisterTestingT(t)
- Expect(UninstallAll(t)).To(Succeed())
+ g := NewWithT(t)
+ g.Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
defer Cleanup(t)
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make(t, "setup", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup", namespaceArg))
// Skip default kamelets installation for faster test runs
- ExpectExecSucceed(t, Make(t, "operator",
+ ExpectExecSucceed(t, g, Make(t, "operator",
namespaceArg,
"INSTALL_DEFAULT_KAMELETS=false"))
// Refresh the test client to account for the newly installed CRDs
RefreshClient(t)
- Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
- Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
+ g.Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
// Check if restricted security context has been applyed
operatorPod := OperatorPod(t, ns)()
- Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
- Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.RunAsNonRoot).To(Equal(kubernetes.DefaultOperatorSecurityContext().RunAsNonRoot))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.Capabilities).To(Equal(kubernetes.DefaultOperatorSecurityContext().Capabilities))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.SeccompProfile).To(Equal(kubernetes.DefaultOperatorSecurityContext().SeccompProfile))
+ g.Expect(operatorPod.Spec.Containers[0].SecurityContext.AllowPrivilegeEscalation).To(Equal(kubernetes.DefaultOperatorSecurityContext().AllowPrivilegeEscalation))
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
registry := os.Getenv("KIND_REGISTRY")
if registry != "" {
platform := Platform(t, ns)()
- Expect(platform.Status.Build.Registry).ShouldNot(BeNil())
- Expect(platform.Status.Build.Registry.Address).To(Equal(registry))
+ g.Expect(platform.Status.Build.Registry).ShouldNot(BeNil())
+ g.Expect(platform.Status.Build.Registry.Address).To(Equal(registry))
}
})
@@ -85,21 +85,21 @@ func TestOperatorKustomizeAlternativeImage(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- RegisterTestingT(t)
- Expect(UninstallAll(t)).To(Succeed())
+ g := NewWithT(t)
+ g.Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
defer Cleanup(t)
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make(t, "setup", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup", namespaceArg))
// Skip default kamelets installation for faster test runs
newImage := "quay.io/kameltest/kamel-operator"
newTag := "1.1.1"
- ExpectExecSucceed(t, Make(t, "operator",
+ ExpectExecSucceed(t, g, Make(t, "operator",
fmt.Sprintf("CUSTOM_IMAGE=%s", newImage),
fmt.Sprintf("CUSTOM_VERSION=%s", newTag),
namespaceArg,
@@ -108,7 +108,7 @@ func TestOperatorKustomizeAlternativeImage(t *testing.T) {
// Refresh the test client to account for the newly installed CRDs
RefreshClient(t)
- Eventually(OperatorImage(t, ns)).Should(Equal(fmt.Sprintf("%s:%s", newImage, newTag)))
+ g.Eventually(OperatorImage(t, ns)).Should(Equal(fmt.Sprintf("%s:%s", newImage, newTag)))
})
}
@@ -117,19 +117,19 @@ func TestOperatorKustomizeGlobal(t *testing.T) {
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- RegisterTestingT(t)
- Expect(UninstallAll(t)).To(Succeed())
+ g := NewWithT(t)
+ g.Expect(UninstallAll(t)).To(Succeed())
// Return the cluster to previous state
defer Cleanup(t)
- WithNewTestNamespace(t, func(ns string) {
+ WithNewTestNamespace(t, func(g *WithT, ns string) {
namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
- ExpectExecSucceed(t, Make(t, "setup-cluster", namespaceArg))
- ExpectExecSucceed(t, Make(t, "setup", namespaceArg, "GLOBAL=true"))
+ ExpectExecSucceed(t, g, Make(t, "setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, g, Make(t, "setup", namespaceArg, "GLOBAL=true"))
// Skip default kamelets installation for faster test runs
- ExpectExecSucceed(t, Make(t, "operator",
+ ExpectExecSucceed(t, g, Make(t, "operator",
namespaceArg,
"GLOBAL=true",
"INSTALL_DEFAULT_KAMELETS=false"))
@@ -138,26 +138,26 @@ func TestOperatorKustomizeGlobal(t *testing.T) {
RefreshClient(t)
podFunc := OperatorPod(t, ns)
- Eventually(podFunc).ShouldNot(BeNil())
- Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ g.Eventually(podFunc).ShouldNot(BeNil())
+ g.Eventually(OperatorPodPhase(t, ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
pod := podFunc()
containers := pod.Spec.Containers
- Expect(containers).NotTo(BeEmpty())
+ g.Expect(containers).NotTo(BeEmpty())
envvars := containers[0].Env
- Expect(envvars).NotTo(BeEmpty())
+ g.Expect(envvars).NotTo(BeEmpty())
found := false
for _, v := range envvars {
if v.Name == "WATCH_NAMESPACE" {
- Expect(v.Value).To(Equal("\"\""))
+ g.Expect(v.Value).To(Equal("\"\""))
found = true
break
}
}
- Expect(found).To(BeTrue())
+ g.Expect(found).To(BeTrue())
- Eventually(Platform(t, ns)).ShouldNot(BeNil())
+ g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
})
}
diff --git a/e2e/install/kustomize/setup_test.go b/e2e/install/kustomize/setup_test.go
index bcde0f9d6..4ec9989ea 100644
--- a/e2e/install/kustomize/setup_test.go
+++ b/e2e/install/kustomize/setup_test.go
@@ -34,34 +34,34 @@ import (
)
func TestSetupKustomizeBasic(t *testing.T) {
- RegisterTestingT(t)
+ g := NewWithT(t)
makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
- Expect(UninstallAll(t)).To(Succeed())
- Eventually(CRDs(t)).Should(HaveLen(0))
+ g.Expect(UninstallAll(t)).To(Succeed())
+ g.Eventually(CRDs(t)).Should(HaveLen(0))
// Return the cluster to previous state
... 2088 lines suppressed ...
(camel-k) 04/10: chore(e2e): Use operator instance per package in common tests
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 19199b2ec8030ba225834095d470f20245d359c3
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Mon Mar 4 11:05:45 2024 +0100
chore(e2e): Use operator instance per package in common tests
- Gain execution speed on GitHub CI jobs
- Custom Kamelets creation need to use proper operatorID
---
e2e/advanced/build_order_strategy_test.go | 2 +-
e2e/advanced/incremental_build_test.go | 5 +-
e2e/advanced/main_test.go | 5 ++
e2e/advanced/promote_test.go | 8 +--
e2e/common/cli/bind_test.go | 2 +-
e2e/common/config/default.go | 4 +-
e2e/common/config/kamelet_config_test.go | 100 +++++++++++++--------------
e2e/common/{setup => config}/main_test.go | 35 ++++------
e2e/common/config/pipe_config_test.go | 4 +-
e2e/common/languages/default.go | 4 +-
e2e/common/{setup => languages}/main_test.go | 35 ++++------
e2e/common/misc/default.go | 4 +-
e2e/common/misc/kamelet_update_test.go | 12 ++--
e2e/common/{setup => misc}/main_test.go | 36 +++++-----
e2e/common/misc/pipe_test.go | 10 +--
e2e/common/misc/registry_maven_wagon_test.go | 52 +++++++-------
e2e/common/misc/structured_logs_test.go | 3 +-
e2e/common/runtimes/default.go | 1 -
e2e/common/setup/testdata/Java.java | 28 --------
e2e/common/setup/testdata/yaml.yaml | 28 --------
e2e/common/traits/builder_test.go | 5 +-
e2e/common/traits/default.go | 4 +-
e2e/common/traits/deployment_test.go | 2 +
e2e/common/traits/health_test.go | 4 +-
e2e/common/traits/istio_test.go | 7 ++
e2e/common/traits/kamelet_test.go | 2 +-
e2e/common/{setup => traits}/main_test.go | 35 ++++------
e2e/common/traits/service_binding_test.go | 2 +-
e2e/install/cli/global_kamelet_test.go | 4 +-
e2e/knative/kamelet_test.go | 2 +-
e2e/support/test_support.go | 23 +++---
e2e/support/test_util.go | 5 ++
pkg/apis/camel/v1/kamelet_types_support.go | 5 ++
script/Makefile | 10 +--
34 files changed, 216 insertions(+), 272 deletions(-)
diff --git a/e2e/advanced/build_order_strategy_test.go b/e2e/advanced/build_order_strategy_test.go
index 83dcdce8c..ad30b02e8 100644
--- a/e2e/advanced/build_order_strategy_test.go
+++ b/e2e/advanced/build_order_strategy_test.go
@@ -46,7 +46,7 @@ func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
"--build-order-strategy", string(v1.BuildOrderStrategyDependencies)).Execute()).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- g.Expect(CreateTimerKamelet(t, ns, "timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "timer-source")()).To(Succeed())
integrationA := RandomizedSuffixName("java-a")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/advanced/incremental_build_test.go b/e2e/advanced/incremental_build_test.go
index 09172c6ca..40db5479a 100644
--- a/e2e/advanced/incremental_build_test.go
+++ b/e2e/advanced/incremental_build_test.go
@@ -98,6 +98,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
operatorID := "camel-k-incremental-build-pod"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
@@ -141,7 +142,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
integrationIncrementalKitName := IntegrationKit(t, ns, nameIncremental)()
// the container comes in a format like
// 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
- // we should be save just to check the substring is contained
+ // we should be saving just to check the substring is contained
g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
g.Eventually(Kit(t, ns, integrationIncrementalKitName)().Status.RootImage).Should(Equal(defaults.BaseImage()))
g.Eventually(BuilderPodsCount(t, ns)).Should(Equal(2))
@@ -158,6 +159,7 @@ func TestRunIncrementalBuildOff(t *testing.T) {
operatorID := "camel-k-standard-build"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
@@ -209,6 +211,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
operatorID := "camel-k-incremental-different-base"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/advanced/main_test.go b/e2e/advanced/main_test.go
index 1127038b2..b579b4c7d 100644
--- a/e2e/advanced/main_test.go
+++ b/e2e/advanced/main_test.go
@@ -37,6 +37,11 @@ import (
)
func TestMain(m *testing.M) {
+ justCompile := GetEnvOrDefault("CAMEL_K_E2E_JUST_COMPILE", "false")
+ if justCompile == "true" {
+ os.Exit(m.Run())
+ }
+
fastSetup := GetEnvOrDefault("CAMEL_K_E2E_FAST_SETUP", "false")
if fastSetup != "true" {
os.Exit(m.Run())
diff --git a/e2e/advanced/promote_test.go b/e2e/advanced/promote_test.go
index 0051dd0cb..6327b0fc5 100644
--- a/e2e/advanced/promote_test.go
+++ b/e2e/advanced/promote_test.go
@@ -68,14 +68,14 @@ func TestKamelCLIPromote(t *testing.T) {
})
t.Run("kamelet integration dev", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, nsDev, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorDevID, nsDev, "my-own-timer-source")()).To(Succeed())
g.Expect(KamelRunWithID(t, operatorDevID, nsDev, "./files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, nsDev, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationLogs(t, nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
})
t.Run("binding dev", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, nsDev, "kb-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorDevID, nsDev, "kb-timer-source")()).To(Succeed())
g.Expect(KamelBindWithID(t, operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationLogs(t, nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
@@ -147,7 +147,7 @@ func TestKamelCLIPromote(t *testing.T) {
})
t.Run("kamelet integration promotion", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, nsProd, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorProdID, nsProd, "my-own-timer-source")()).To(Succeed())
g.Expect(Kamel(t, "promote", "-n", nsDev, "timer-kamelet-usage", "--to", nsProd).Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, nsProd, "timer-kamelet-usage"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationLogs(t, nsProd, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
@@ -160,7 +160,7 @@ func TestKamelCLIPromote(t *testing.T) {
})
t.Run("binding promotion", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, nsProd, "kb-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorProdID, nsProd, "kb-timer-source")()).To(Succeed())
g.Expect(Kamel(t, "promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationLogs(t, nsProd, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks"))
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index ed98095c8..40e1afe09 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -35,7 +35,7 @@ import (
func TestKamelCLIBind(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
kameletName := "test-timer-source"
- g.Expect(CreateTimerKamelet(t, ns, kameletName)()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, kameletName)()).To(Succeed())
t.Run("bind timer to log", func(t *testing.T) {
g.Expect(KamelBindWithID(t, operatorID, ns, kameletName, "log:info", "-p", "source.message=helloTest").Execute()).To(Succeed())
diff --git a/e2e/common/config/default.go b/e2e/common/config/default.go
index 13e78b4f1..d92514a52 100644
--- a/e2e/common/config/default.go
+++ b/e2e/common/config/default.go
@@ -25,5 +25,5 @@ import (
"github.com/apache/camel-k/v2/pkg/platform"
)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
+var operatorNS = support.TestDefaultNamespace + "-config"
+var operatorID = platform.DefaultPlatformName + "-config"
diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go
index 913a3f206..8cc946cb9 100644
--- a/e2e/common/config/kamelet_config_test.go
+++ b/e2e/common/config/kamelet_config_test.go
@@ -40,7 +40,7 @@ func TestKameletImplicitConfigDefaultUserPropery(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using properties", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "iconfig01-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig01-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int01")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationConfiguration01.java",
@@ -63,7 +63,7 @@ func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
t.Run("run test default config using mounted secret", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "iconfig03-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig03-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int3")
secretName := "my-iconfig-int3-secret"
@@ -95,7 +95,7 @@ func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
t.Run("run test default config using mounted configmap", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "iconfig04-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig04-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int4")
cmName := "my-iconfig-int4-configmap"
@@ -123,7 +123,7 @@ func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
func TestKameletImplicitConfigNamedUserPropery(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using properties", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "iconfig05-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig05-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int5")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/TimerKameletIntegrationNamedConfiguration05.java",
@@ -145,7 +145,7 @@ func TestKameletImplicitConfigNamedUserPropery(t *testing.T) {
func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using labeled secret", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "iconfig06-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig06-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int6")
secretName := "my-iconfig-int6-secret"
@@ -178,7 +178,7 @@ func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using mounted secret", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "iconfig07-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig07-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int7")
secretName := "my-iconfig-int7-secret"
@@ -209,7 +209,7 @@ func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test named config using mounted configmap", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "iconfig08-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig08-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int8")
cmName := "my-iconfig-int8-configmap"
@@ -238,7 +238,7 @@ func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config using labeled secret", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "iconfig09-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig09-timer-source")()).To(Succeed())
name := RandomizedSuffixName("iconfig-test-timer-source-int9")
secretName := "my-iconfig-int9-secret"
@@ -271,8 +271,8 @@ func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
func TestKameletConfigInlinedUserPropery(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("run test default config inlined properties", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "config01-timer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, ns, "config01-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "config01-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, ns, "config01-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int1")
@@ -296,34 +296,32 @@ func TestKameletConfigDefaultParamUserPropery(t *testing.T) {
g := NewWithT(t)
t.Run("run test default config parameters properties", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "config02-timer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, ns, "config02-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, operatorNS, "config02-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, operatorNS, "config02-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int2")
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/timer-kamelet-integration-parameters-configuration-02.yaml",
"-p", "my-message='My parameter message 02'",
"-p", "my-logger='myIntegrationLogger02'",
"--name", name).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My parameter message 02"))
- g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myIntegrationLogger02"))
-
- g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- g.Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
- g.Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("My parameter message 02"))
+ g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("myIntegrationLogger02"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", operatorNS).Execute()).To(Succeed())
+ g.Eventually(Integration(t, operatorNS, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteKamelet(t, operatorNS, "config02-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, operatorNS, "config02-log-sink")).To(Succeed())
})
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
g := NewWithT(t)
t.Run("run test default config secret properties", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "config03-timer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, ns, "config03-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, operatorNS, "config03-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, operatorNS, "config03-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int3")
secretName := "my-config-int3-secret"
@@ -331,31 +329,29 @@ func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
var secData = make(map[string]string)
secData["my-message"] = "My secret message 03"
secData["my-logger"] = "mySecretIntegrationLogger03"
- g.Expect(CreatePlainTextSecret(t, ns, secretName, secData)).To(Succeed())
+ g.Expect(CreatePlainTextSecret(t, operatorNS, secretName, secData)).To(Succeed())
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/timer-kamelet-integration-parameters-configuration-03.yaml",
"-t", "mount.configs=secret:"+secretName,
"--name", name).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My secret message 03"))
- g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
-
- g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
- g.Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
- g.Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("My secret message 03"))
+ g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("mySecretIntegrationLogger03"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", operatorNS).Execute()).To(Succeed())
+ g.Eventually(Integration(t, operatorNS, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteSecret(t, operatorNS, secretName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, operatorNS, "config03-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, operatorNS, "config03-log-sink")).To(Succeed())
})
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
g := NewWithT(t)
t.Run("run test default config configmap properties", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "config04-timer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, ns, "config04-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, operatorNS, "config04-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, operatorNS, "config04-log-sink")()).To(Succeed())
name := RandomizedSuffixName("config-test-timer-source-int4")
cmName := "my-config-int4-configmap"
@@ -363,21 +359,19 @@ func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
var cmData = make(map[string]string)
cmData["my-message"] = "My configmap message 04"
cmData["my-logger"] = "myConfigmapIntegrationLogger04"
- g.Expect(CreatePlainTextConfigmap(t, ns, cmName, cmData)).To(Succeed())
+ g.Expect(CreatePlainTextConfigmap(t, operatorNS, cmName, cmData)).To(Succeed())
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/timer-kamelet-integration-parameters-configuration-04.yaml",
"-t", "mount.configs=configmap:"+cmName,
"--name", name).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("My configmap message 04"))
- g.Eventually(IntegrationLogs(t, ns, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
-
- g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
- g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
- g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
- g.Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
- g.Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("My configmap message 04"))
+ g.Eventually(IntegrationLogs(t, operatorNS, name)).Should(ContainSubstring("myConfigmapIntegrationLogger04"))
+
+ g.Expect(Kamel(t, "delete", name, "-n", operatorNS).Execute()).To(Succeed())
+ g.Eventually(Integration(t, operatorNS, name), TestTimeoutLong).Should(BeNil())
+ g.Expect(DeleteConfigmap(t, operatorNS, cmName)).To(Succeed())
+ g.Expect(DeleteKamelet(t, operatorNS, "config04-timer-source")).To(Succeed())
+ g.Expect(DeleteKamelet(t, operatorNS, "config04-log-sink")).To(Succeed())
})
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
}
diff --git a/e2e/common/setup/main_test.go b/e2e/common/config/main_test.go
similarity index 50%
copy from e2e/common/setup/main_test.go
copy to e2e/common/config/main_test.go
index d303f2483..1f977eab9 100644
--- a/e2e/common/setup/main_test.go
+++ b/e2e/common/config/main_test.go
@@ -20,48 +20,43 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package setup
+package config
import (
"fmt"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"os"
"testing"
. "github.com/onsi/gomega"
. "github.com/apache/camel-k/v2/e2e/support"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/platform"
-
- corev1 "k8s.io/api/core/v1"
)
func TestMain(m *testing.M) {
- fastSetup := GetEnvOrDefault("CAMEL_K_E2E_FAST_SETUP", "false")
- if fastSetup != "true" {
+ justCompile := GetEnvOrDefault("CAMEL_K_E2E_JUST_COMPILE", "false")
+ if justCompile == "true" {
os.Exit(m.Run())
}
- operatorID := platform.DefaultPlatformName
- ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
-
g := NewGomega(func(message string, callerSkip ...int) {
- fmt.Printf("Test fast setup failed! - %s\n", message)
+ fmt.Printf("Test setup failed! - %s\n", message)
})
var t *testing.T
g.Expect(TestClient(t)).ShouldNot(BeNil())
- g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // Install global operator for tests in this package, all tests must use this operatorID so tests can run in parallel and gain execution speed
+ g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
+ g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ exitCode := m.Run()
- g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(UninstallFromNamespace(t, operatorNS))
+ g.Expect(DeleteNamespace(t, operatorNS)).To(Succeed())
- os.Exit(m.Run())
+ os.Exit(exitCode)
}
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index 1e8af0462..272ed84de 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -37,8 +37,8 @@ func TestPipeConfig(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("test custom source/sink pipe", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "my-pipe-timer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, ns, "my-pipe-log-sink")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "my-pipe-timer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, ns, "my-pipe-log-sink")()).To(Succeed())
t.Run("run test default config using properties", func(t *testing.T) {
name := RandomizedSuffixName("my-pipe-with-properties")
diff --git a/e2e/common/languages/default.go b/e2e/common/languages/default.go
index 63569d2b2..2a7e2e176 100644
--- a/e2e/common/languages/default.go
+++ b/e2e/common/languages/default.go
@@ -25,5 +25,5 @@ import (
"github.com/apache/camel-k/v2/pkg/platform"
)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
+var operatorNS = support.TestDefaultNamespace + "-languages"
+var operatorID = platform.DefaultPlatformName + "-languages"
diff --git a/e2e/common/setup/main_test.go b/e2e/common/languages/main_test.go
similarity index 50%
copy from e2e/common/setup/main_test.go
copy to e2e/common/languages/main_test.go
index d303f2483..10800b385 100644
--- a/e2e/common/setup/main_test.go
+++ b/e2e/common/languages/main_test.go
@@ -20,48 +20,43 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package setup
+package languages
import (
"fmt"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"os"
"testing"
. "github.com/onsi/gomega"
. "github.com/apache/camel-k/v2/e2e/support"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/platform"
-
- corev1 "k8s.io/api/core/v1"
)
func TestMain(m *testing.M) {
- fastSetup := GetEnvOrDefault("CAMEL_K_E2E_FAST_SETUP", "false")
- if fastSetup != "true" {
+ justCompile := GetEnvOrDefault("CAMEL_K_E2E_JUST_COMPILE", "false")
+ if justCompile == "true" {
os.Exit(m.Run())
}
- operatorID := platform.DefaultPlatformName
- ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
-
g := NewGomega(func(message string, callerSkip ...int) {
- fmt.Printf("Test fast setup failed! - %s\n", message)
+ fmt.Printf("Test setup failed! - %s\n", message)
})
var t *testing.T
g.Expect(TestClient(t)).ShouldNot(BeNil())
- g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // Install global operator for tests in this package, all tests must use this operatorID so tests can run in parallel and gain execution speed
+ g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
+ g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ exitCode := m.Run()
- g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(UninstallFromNamespace(t, operatorNS))
+ g.Expect(DeleteNamespace(t, operatorNS)).To(Succeed())
- os.Exit(m.Run())
+ os.Exit(exitCode)
}
diff --git a/e2e/common/misc/default.go b/e2e/common/misc/default.go
index 794d34d8e..9e677ac69 100644
--- a/e2e/common/misc/default.go
+++ b/e2e/common/misc/default.go
@@ -25,5 +25,5 @@ import (
"github.com/apache/camel-k/v2/pkg/platform"
)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
+var operatorNS = support.TestDefaultNamespace + "-misc"
+var operatorID = platform.DefaultPlatformName + "-misc"
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index adc0a326f..faf251b42 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -39,8 +39,8 @@ func TestBundleKameletUpdate(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
- g.Expect(createBundleKamelet(t, ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
- g.Expect(createUserKamelet(t, ns, "user-sink")()).To(Succeed()) // Left intact by the operator
+ g.Expect(createBundleKamelet(t, operatorID, ns, "my-http-sink")()).To(Succeed()) // Going to be replaced
+ g.Expect(createUserKamelet(t, operatorID, ns, "user-sink")()).To(Succeed()) // Left intact by the operator
g.Eventually(Kamelet(t, "my-http-sink", ns)).
Should(WithTransform(KameletLabels, HaveKeyWithValue(customLabel, "true")))
@@ -51,7 +51,7 @@ func TestBundleKameletUpdate(t *testing.T) {
})
}
-func createBundleKamelet(t *testing.T, ns string, name string) func() error {
+func createBundleKamelet(t *testing.T, operatorID string, ns string, name string) func() error {
flow := map[string]interface{}{
"from": map[string]interface{}{
"uri": "kamelet:source",
@@ -62,10 +62,10 @@ func createBundleKamelet(t *testing.T, ns string, name string) func() error {
customLabel: "true",
v1.KameletBundledLabel: "true",
}
- return CreateKamelet(t, ns, name, flow, nil, labels)
+ return CreateKamelet(t, operatorID, ns, name, flow, nil, labels)
}
-func createUserKamelet(t *testing.T, ns string, name string) func() error {
+func createUserKamelet(t *testing.T, operatorID string, ns string, name string) func() error {
flow := map[string]interface{}{
"from": map[string]interface{}{
"uri": "kamelet:source",
@@ -75,5 +75,5 @@ func createUserKamelet(t *testing.T, ns string, name string) func() error {
labels := map[string]string{
customLabel: "true",
}
- return CreateKamelet(t, ns, name, flow, nil, labels)
+ return CreateKamelet(t, operatorID, ns, name, flow, nil, labels)
}
diff --git a/e2e/common/setup/main_test.go b/e2e/common/misc/main_test.go
similarity index 50%
copy from e2e/common/setup/main_test.go
copy to e2e/common/misc/main_test.go
index d303f2483..bf4aea736 100644
--- a/e2e/common/setup/main_test.go
+++ b/e2e/common/misc/main_test.go
@@ -20,48 +20,44 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package setup
+package misc
import (
"fmt"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"os"
"testing"
. "github.com/onsi/gomega"
. "github.com/apache/camel-k/v2/e2e/support"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/platform"
-
- corev1 "k8s.io/api/core/v1"
)
func TestMain(m *testing.M) {
- fastSetup := GetEnvOrDefault("CAMEL_K_E2E_FAST_SETUP", "false")
- if fastSetup != "true" {
+ justCompile := GetEnvOrDefault("CAMEL_K_E2E_JUST_COMPILE", "false")
+ if justCompile == "true" {
os.Exit(m.Run())
}
- operatorID := platform.DefaultPlatformName
- ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
-
g := NewGomega(func(message string, callerSkip ...int) {
- fmt.Printf("Test fast setup failed! - %s\n", message)
+ fmt.Printf("Test setup failed! - %s\n", message)
})
var t *testing.T
g.Expect(TestClient(t)).ShouldNot(BeNil())
- g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // Install global operator for tests in this package, all tests must use this operatorID so tests can run in parallel and gain execution speed
+ g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
+ g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
+ // Need Kamelet catalog for pipe bind tests
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ exitCode := m.Run()
- g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(UninstallFromNamespace(t, operatorNS))
+ g.Expect(DeleteNamespace(t, operatorNS)).To(Succeed())
- os.Exit(m.Run())
+ os.Exit(exitCode)
}
diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go
index 60abb04ba..ab143b47f 100644
--- a/e2e/common/misc/pipe_test.go
+++ b/e2e/common/misc/pipe_test.go
@@ -41,8 +41,8 @@ func TestPipe(t *testing.T) {
// Error Handler testing
t.Run("test error handler", func(t *testing.T) {
- g.Expect(createErrorProducerKamelet(t, ns, "my-own-error-producer-source")()).To(Succeed())
- g.Expect(CreateLogKamelet(t, ns, "my-own-log-sink")()).To(Succeed())
+ g.Expect(createErrorProducerKamelet(t, operatorID, ns, "my-own-error-producer-source")()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, ns, "my-own-log-sink")()).To(Succeed())
t.Run("throw error test", func(t *testing.T) {
g.Expect(KamelBindWithID(t, operatorID, ns,
@@ -85,7 +85,7 @@ func TestPipe(t *testing.T) {
//Pipe with traits testing
t.Run("test Pipe with trait", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, ns, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "my-own-timer-source")()).To(Succeed())
// Log sink kamelet exists from previous test
g.Expect(KamelBindWithID(t, operatorID, ns,
@@ -122,7 +122,7 @@ func TestPipe(t *testing.T) {
})
}
-func createErrorProducerKamelet(t *testing.T, ns string, name string) func() error {
+func createErrorProducerKamelet(t *testing.T, operatorID string, ns string, name string) func() error {
props := map[string]v1.JSONSchemaProp{
"message": {
Type: "string",
@@ -150,5 +150,5 @@ func createErrorProducerKamelet(t *testing.T, ns string, name string) func() err
},
}
- return CreateKamelet(t, ns, name, flow, props, nil)
+ return CreateKamelet(t, operatorID, ns, name, flow, props, nil)
}
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index fe2b90f10..6a13787c3 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -56,59 +56,59 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
pom, err := filepath.Abs("files/registry/sample-decryption-1.0.pom")
require.NoError(t, err)
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/FoobarDecryption.java",
"--name", name,
"-d", fmt.Sprintf("file://%s", jar),
"-d", fmt.Sprintf("file://%s", pom),
).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
t.Run("local files are mounted in the integration container at the default path", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-default-path")
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/LaughingRoute.java",
"--name", name,
"-p", "location=/deployments/?filename=laugh.txt",
"-d", "file://files/registry/laugh.txt",
).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("haha"))
})
t.Run("local files are mounted in the integration container at a custom path", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-custom-path")
customPath := "this/is/a/custom/path/"
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/LaughingRoute.java",
"--name", name,
"-p", fmt.Sprintf("location=%s", customPath),
"-d", fmt.Sprintf("file://files/registry/laugh.txt?targetPath=%slaugh.txt", customPath),
).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("haha"))
})
t.Run("local directory is mounted in the integration container", func(t *testing.T) {
name := RandomizedSuffixName("laughing-route-directory")
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/LaughingRoute.java",
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/LaughingRoute.java",
"--name", name,
"-p", "location=files/registry/",
"-d", fmt.Sprintf("file://files/registry/laughs/?targetPath=files/registry/"),
).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("haha"))
- g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("haha"))
+ g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("hehe"))
})
t.Run("pom file is extracted from JAR", func(t *testing.T) {
@@ -117,28 +117,28 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
jar, err := filepath.Abs("files/registry/sample-decryption-1.0.jar")
require.NoError(t, err)
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/FoobarDecryption.java",
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/FoobarDecryption.java",
"--name", name,
"-d", fmt.Sprintf("file://%s", jar),
).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("foobar"))
})
t.Run("dependency can be used at build time", func(t *testing.T) {
// Create integration that should run an Xslt transformation whose template needs to be present at build time
name := RandomizedSuffixName("xslt")
- g.Expect(KamelRunWithID(t, operatorID, ns, "files/registry/classpath/Xslt.java", "--name", name,
+ g.Expect(KamelRunWithID(t, operatorID, operatorNS, "files/registry/classpath/Xslt.java", "--name", name,
"-d", "file://files/registry/classpath/cheese.xsl?targetPath=xslt/cheese.xsl&classpath=true",
).Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
+ g.Eventually(IntegrationPodPhase(t, operatorNS, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, operatorNS, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, operatorNS, name), TestTimeoutShort).Should(ContainSubstring("<cheese><item>A</item></cheese>"))
})
// Clean up
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ g.Expect(Kamel(t, "delete", "--all", "-n", operatorNS).Execute()).To(Succeed())
}
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index 2182f4579..9bb03c8c3 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -46,8 +46,7 @@ func TestStructuredLogs(t *testing.T) {
g.Eventually(IntegrationPodPhase(t, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationConditionStatus(t, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- pod := OperatorPod(t, opns)()
+ pod := OperatorPod(t, operatorNS)()
g.Expect(pod).NotTo(BeNil())
// pod.Namespace could be different from ns if using global operator
diff --git a/e2e/common/runtimes/default.go b/e2e/common/runtimes/default.go
index dec3b52c7..7191aee4f 100644
--- a/e2e/common/runtimes/default.go
+++ b/e2e/common/runtimes/default.go
@@ -25,5 +25,4 @@ import (
"github.com/apache/camel-k/v2/pkg/platform"
)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
diff --git a/e2e/common/setup/testdata/Java.java b/e2e/common/setup/testdata/Java.java
deleted file mode 100644
index 66fef5fe8..000000000
--- a/e2e/common/setup/testdata/Java.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.camel.builder.RouteBuilder;
-
-public class Java extends RouteBuilder {
- @Override
- public void configure() throws Exception {
- from("timer:tick")
- .setHeader("m").constant("string!")
- .setBody().simple("Magic${header.m}")
- .log("${body}");
- }
-}
diff --git a/e2e/common/setup/testdata/yaml.yaml b/e2e/common/setup/testdata/yaml.yaml
deleted file mode 100644
index 8877c8557..000000000
--- a/e2e/common/setup/testdata/yaml.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-- from:
- uri: "timer:yaml"
- parameters:
- period: "5000"
- steps:
- - setHeader:
- name: "m"
- constant: "string!"
- - setBody:
- simple: "Magic${header.m}"
- - to: "log:info"
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index 3f0ea3650..e9be79107 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -237,10 +237,9 @@ func TestBuilderTrait(t *testing.T) {
t.Run("Run maven profile", func(t *testing.T) {
name := RandomizedSuffixName("java-maven-profile")
- opns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
- mavenProfile1Cm := newMavenProfileConfigMap(opns, "maven-profile-owasp", "owasp-profile")
+ mavenProfile1Cm := newMavenProfileConfigMap(operatorNS, "maven-profile-owasp", "owasp-profile")
g.Expect(TestClient(t).Create(TestContext, mavenProfile1Cm)).To(Succeed())
- mavenProfile2Cm := newMavenProfileConfigMap(opns, "maven-profile-dependency", "dependency-profile")
+ mavenProfile2Cm := newMavenProfileConfigMap(operatorNS, "maven-profile-dependency", "dependency-profile")
g.Expect(TestClient(t).Create(TestContext, mavenProfile2Cm)).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/common/traits/default.go b/e2e/common/traits/default.go
index bc4034843..4721ebd36 100644
--- a/e2e/common/traits/default.go
+++ b/e2e/common/traits/default.go
@@ -25,5 +25,5 @@ import (
"github.com/apache/camel-k/v2/pkg/platform"
)
-var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.TestDefaultNamespace)
-var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName)
+var operatorNS = support.TestDefaultNamespace + "-traits"
+var operatorID = platform.DefaultPlatformName + "-traits"
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index 6021b70a7..1ed16e07b 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -80,6 +80,8 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
}
func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
+ t.Parallel()
+
WithNewTestNamespace(t, func(g *WithT, ns string) {
t.Run("Run with RollingUpdate Deployment Strategy", func(t *testing.T) {
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 658c66535..87bca537f 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -252,8 +252,8 @@ func TestHealthTrait(t *testing.T) {
source := RandomizedSuffixName("my-health-timer-source")
sink := RandomizedSuffixName("my-health-log-sink")
- g.Expect(CreateTimerKamelet(t, ns, source)()).To(Succeed())
- g.Expect(CreateLogKamelet(t, ns, sink)()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, source)()).To(Succeed())
+ g.Expect(CreateLogKamelet(t, operatorID, ns, sink)()).To(Succeed())
g.Expect(KamelBindWithID(t, operatorID, ns,
source,
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index 3a80c4278..95c3323c8 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -23,6 +23,7 @@ limitations under the License.
package traits
import (
+ "fmt"
"testing"
. "github.com/onsi/gomega"
@@ -38,6 +39,12 @@ func TestIstioTrait(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
+ operatorID := fmt.Sprintf("camel-k-%s", ns)
+ g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
+ g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Run Java with Istio", func(t *testing.T) {
name := RandomizedSuffixName("java")
diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go
index 31e27323a..b79870091 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -49,7 +49,7 @@ func TestKameletTrait(t *testing.T) {
},
},
}
- g.Expect(CreateKamelet(t, ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
+ g.Expect(CreateKamelet(t, operatorID, ns, "capabilities-webhook-source", template, nil, nil)()).To(Succeed())
name := RandomizedSuffixName("webhook")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/webhook.yaml", "--name", name).Execute()).To(Succeed())
diff --git a/e2e/common/setup/main_test.go b/e2e/common/traits/main_test.go
similarity index 50%
rename from e2e/common/setup/main_test.go
rename to e2e/common/traits/main_test.go
index d303f2483..f7f835f6a 100644
--- a/e2e/common/setup/main_test.go
+++ b/e2e/common/traits/main_test.go
@@ -20,48 +20,43 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package setup
+package traits
import (
"fmt"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"os"
"testing"
. "github.com/onsi/gomega"
. "github.com/apache/camel-k/v2/e2e/support"
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/platform"
-
- corev1 "k8s.io/api/core/v1"
)
func TestMain(m *testing.M) {
- fastSetup := GetEnvOrDefault("CAMEL_K_E2E_FAST_SETUP", "false")
- if fastSetup != "true" {
+ justCompile := GetEnvOrDefault("CAMEL_K_E2E_JUST_COMPILE", "false")
+ if justCompile == "true" {
os.Exit(m.Run())
}
- operatorID := platform.DefaultPlatformName
- ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS", TestDefaultNamespace)
-
g := NewGomega(func(message string, callerSkip ...int) {
- fmt.Printf("Test fast setup failed! - %s\n", message)
+ fmt.Printf("Test setup failed! - %s\n", message)
})
var t *testing.T
g.Expect(TestClient(t)).ShouldNot(BeNil())
- g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/Java.java").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ // Install global operator for tests in this package, all tests must use this operatorID so tests can run in parallel and gain execution speed
+ g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
+ g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ exitCode := m.Run()
- g.Expect(KamelRunWithID(t, operatorID, ns, "testdata/yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ns, "yaml", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ns, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ g.Expect(UninstallFromNamespace(t, operatorNS))
+ g.Expect(DeleteNamespace(t, operatorNS)).To(Succeed())
- os.Exit(m.Run())
+ os.Exit(exitCode)
}
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 656b90360..a6b66ef87 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -97,7 +97,7 @@ func TestServiceBindingTrait(t *testing.T) {
}
serviceRef := fmt.Sprintf("%s:%s/%s", service.TypeMeta.Kind, ns, service.ObjectMeta.Name)
g.Expect(TestClient(t).Create(TestContext, service)).To(Succeed())
- g.Expect(CreateTimerKamelet(t, ns, "my-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, "my-timer-source")()).To(Succeed())
g.Expect(KamelBindWithID(t, operatorID, ns, "my-timer-source", "log:info",
"-p", "source.message=Hello+world",
"--connect", serviceRef).Execute()).To(Succeed())
diff --git a/e2e/install/cli/global_kamelet_test.go b/e2e/install/cli/global_kamelet_test.go
index 5becde9c3..15ae5871e 100644
--- a/e2e/install/cli/global_kamelet_test.go
+++ b/e2e/install/cli/global_kamelet_test.go
@@ -40,7 +40,7 @@ func TestRunGlobalKamelet(t *testing.T) {
// NS2: namespace without operator
WithNewTestNamespace(t, func(g *WithT, ns2 string) {
- g.Expect(CreateTimerKamelet(t, ns2, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns2, "my-own-timer-source")()).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
@@ -53,7 +53,7 @@ func TestRunGlobalKamelet(t *testing.T) {
t.Run("Global operator + global kamelet test", func(t *testing.T) {
- g.Expect(CreateTimerKamelet(t, operatorNamespace, "my-own-timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, operatorNamespace, "my-own-timer-source")()).To(Succeed())
// NS3: namespace without operator
WithNewTestNamespace(t, func(g *WithT, ns3 string) {
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index 2826af61a..50c76767b 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -44,7 +44,7 @@ func TestKameletChange(t *testing.T) {
knChannel := "test-kamelet-messages"
knChannelConf := fmt.Sprintf("%s:InMemoryChannel:%s", messaging.SchemeGroupVersion.String(), knChannel)
timerSource := "my-timer-source"
- g.Expect(CreateTimerKamelet(t, ns, timerSource)()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns, timerSource)()).To(Succeed())
g.Expect(CreateKnativeChannel(t, ns, knChannel)()).To(Succeed())
// Consumer route that will read from the KNative channel
g.Expect(KamelRunWithID(t, operatorID, ns, "files/test-kamelet-display.groovy", "-w").Execute()).To(Succeed())
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 95564f1ff..3fac8750c 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -2668,7 +2668,7 @@ func CreateKnativeBroker(t *testing.T, ns string, name string) func() error {
Kamelets
*/
-func CreateKamelet(t *testing.T, ns string, name string, template map[string]interface{}, properties map[string]v1.JSONSchemaProp, labels map[string]string) func() error {
+func CreateKamelet(t *testing.T, operatorID string, ns string, name string, template map[string]interface{}, properties map[string]v1.JSONSchemaProp, labels map[string]string) func() error {
return func() error {
kamelet := v1.Kamelet{
ObjectMeta: metav1.ObjectMeta{
@@ -2683,11 +2683,13 @@ func CreateKamelet(t *testing.T, ns string, name string, template map[string]int
Template: asTemplate(t, template),
},
}
+
+ kamelet.SetOperatorID(operatorID)
return TestClient(t).Create(TestContext, &kamelet)
}
}
-func CreateTimerKamelet(t *testing.T, ns string, name string) func() error {
+func CreateTimerKamelet(t *testing.T, operatorID string, ns string, name string) func() error {
props := map[string]v1.JSONSchemaProp{
"message": {
Type: "string",
@@ -2710,7 +2712,7 @@ func CreateTimerKamelet(t *testing.T, ns string, name string) func() error {
},
}
- return CreateKamelet(t, ns, name, flow, props, nil)
+ return CreateKamelet(t, operatorID, ns, name, flow, props, nil)
}
func DeleteKamelet(t *testing.T, ns string, name string) error {
@@ -2869,7 +2871,7 @@ func deleteKnativeBroker(t *testing.T, ns metav1.Object) {
func deleteTestNamespace(t *testing.T, ns ctrl.Object) {
value, saveNS := os.LookupEnv("CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE")
- if t.Failed() && saveNS && value == "true" {
+ if t != nil && t.Failed() && saveNS && value == "true" {
t.Logf("Warning: retaining failed test project %q", ns.GetName())
return
}
@@ -2946,12 +2948,10 @@ func DeleteNamespace(t *testing.T, ns string) error {
}
func NewTestNamespace(t *testing.T, injectKnativeBroker bool) ctrl.Object {
- brokerLabel := "eventing.knative.dev/injection"
name := os.Getenv("CAMEL_K_TEST_NS")
if name == "" {
name = "test-" + uuid.New().String()
}
- c := TestClient(t)
if exists, err := testNamespaceExists(t, name); err != nil {
failTest(t, err)
@@ -2960,6 +2960,13 @@ func NewTestNamespace(t *testing.T, injectKnativeBroker bool) ctrl.Object {
name = fmt.Sprintf("%s-%d", name, time.Now().Second())
}
+ return NewNamedTestNamespace(t, name, injectKnativeBroker)
+}
+
+func NewNamedTestNamespace(t *testing.T, name string, injectKnativeBroker bool) ctrl.Object {
+ brokerLabel := "eventing.knative.dev/injection"
+ c := TestClient(t)
+
if oc, err := openshift.IsOpenShift(TestClient(t)); err != nil {
failTest(t, err)
} else if oc {
@@ -3058,7 +3065,7 @@ func GetOutputStringAsync(cmd *cobra.Command) func() string {
}
}
-func CreateLogKamelet(t *testing.T, ns string, name string) func() error {
+func CreateLogKamelet(t *testing.T, operatorID string, ns string, name string) func() error {
flow := map[string]interface{}{
"from": map[string]interface{}{
"uri": "kamelet:source",
@@ -3076,7 +3083,7 @@ func CreateLogKamelet(t *testing.T, ns string, name string) func() error {
},
}
- return CreateKamelet(t, ns, name, flow, props, nil)
+ return CreateKamelet(t, operatorID, ns, name, flow, props, nil)
}
func GetCIProcessID() string {
diff --git a/e2e/support/test_util.go b/e2e/support/test_util.go
index 59fd514de..4973a2599 100644
--- a/e2e/support/test_util.go
+++ b/e2e/support/test_util.go
@@ -117,3 +117,8 @@ func Cleanup(t *testing.T) {
func UninstallAll(t *testing.T) error {
return Kamel(t, "uninstall", "--olm=false", "--all").Execute()
}
+
+// UninstallFromNamespace Removes operator from given namespace
+func UninstallFromNamespace(t *testing.T, ns string) error {
+ return Kamel(t, "uninstall", "--olm=false", "-n", ns).Execute()
+}
diff --git a/pkg/apis/camel/v1/kamelet_types_support.go b/pkg/apis/camel/v1/kamelet_types_support.go
index a95f425f1..e8818cb9e 100644
--- a/pkg/apis/camel/v1/kamelet_types_support.go
+++ b/pkg/apis/camel/v1/kamelet_types_support.go
@@ -214,3 +214,8 @@ func NewKameletList() KameletList {
},
}
}
+
+// SetOperatorID sets the given operator id as an annotation.
+func (k *Kamelet) SetOperatorID(operatorID string) {
+ SetAnnotation(&k.ObjectMeta, OperatorIDAnnotation, operatorID)
+}
diff --git a/script/Makefile b/script/Makefile
index e2e60d58f..68ed85910 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -250,13 +250,7 @@ test: do-build
#
test-common: do-build
FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \
- go test -timeout 10m -v ./e2e/common/setup -tags=integration $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 30m -v ./e2e/common/languages -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 30m -v ./e2e/common/cli -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 30m -v ./e2e/common/config -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 30m -v ./e2e/common/misc -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 60m -v ./e2e/common/traits -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
- go test -timeout 20m -v ./e2e/common/runtimes -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
+ go test -timeout 90m -v ./e2e/common/... -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
exit $${FAILED}
#
@@ -264,7 +258,6 @@ test-common: do-build
#
test-smoke: do-build
FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \
- go test -timeout 10m -v ./e2e/common/setup -tags=integration $(TEST_COMMON_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v ./e2e/common/languages -tags=integration -parallel=$(TEST_COMMON_PARALLEL_COUNT) $(TEST_INTEGRATION_COMMON_LANG_RUN) $(GOTESTFMT) || FAILED=1; \
go test -timeout 30m -v \
./e2e/common/misc/default.go \
@@ -370,6 +363,7 @@ endif
build-compile-integration-tests:
@echo "####### Compiling integration tests..."
+ export CAMEL_K_E2E_JUST_COMPILE="true" ;\
go test -run nope -tags="integration" ./e2e/...
clean:
(camel-k) 10/10: chore(e2e): Fix E2E tests
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 39097a550ccc6b49408b31f09d4b42ecb1e1a456
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Wed Mar 6 23:23:33 2024 +0100
chore(e2e): Fix E2E tests
---
e2e/common/cli/bind_test.go | 2 +-
e2e/common/cli/describe_test.go | 4 ++--
e2e/common/cli/dev_mode_test.go | 2 +-
e2e/common/config/pipe_config_test.go | 2 +-
e2e/common/misc/cron_test.go | 6 +++---
e2e/common/misc/registry_maven_wagon_test.go | 2 +-
e2e/common/misc/scale_binding_test.go | 2 +-
e2e/install/upgrade/cli_upgrade_test.go | 2 +-
e2e/install/upgrade/helm_upgrade_test.go | 2 +-
e2e/knative/knative_test.go | 2 ++
e2e/support/test_support.go | 5 +++++
pkg/cmd/builder_test.go | 2 +-
12 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index a03c984c6..6e45011c6 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -46,7 +46,7 @@ func TestKamelCLIBind(t *testing.T) {
})
t.Run("unsuccessful binding, no property", func(t *testing.T) {
- g.Expect(KamelBindWithID(t, operatorID, ns, "timer-source", "log:info").Execute()).NotTo(Succeed())
+ g.Expect(KamelBindWithID(t, operatorID, ns, operatorNS+"/timer-source", "log:info").Execute()).NotTo(Succeed())
})
t.Run("bind uris", func(t *testing.T) {
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index 656b14d98..8e5f6a562 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -71,10 +71,10 @@ func TestKamelCliDescribe(t *testing.T) {
})
t.Run("Test kamel describe integration platform", func(t *testing.T) {
- platform := GetOutputString(Kamel(t, "describe", "platform", operatorID, "-n", ns))
+ platform := GetOutputString(Kamel(t, "describe", "platform", operatorID, "-n", operatorNS))
g.Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s", operatorID)))
- r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + ns + ".*")
+ r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + operatorNS + ".*")
g.Expect(platform).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" + defaults.DefaultRuntimeVersion + ".*")
diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go
index 6bfd136d7..c257a3723 100644
--- a/e2e/common/cli/dev_mode_test.go
+++ b/e2e/common/cli/dev_mode_test.go
@@ -143,7 +143,7 @@ func TestRunDevMode(t *testing.T) {
go kamelRun.Execute()
// Second run should start up within a few seconds
- timeout := 10 * time.Second
+ timeout := 20 * time.Second
g.Eventually(logScanner.IsFound(`integration "`+name+`" in phase Running`), timeout).Should(BeTrue())
g.Eventually(logScanner.IsFound("Magicstring!"), timeout).Should(BeTrue())
})
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index b896e7f8a..b471b1012 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -37,7 +37,7 @@ func TestPipeConfig(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config"
+ operatorID := "camel-k-pipe-config"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index 76948bbb8..339af3da7 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -46,21 +46,21 @@ func TestRunCronExample(t *testing.T) {
t.Run("cron", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationCronJob(t, ns, "cron"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationCronJob(t, ns, "cron"), TestTimeoutLong).ShouldNot(BeNil())
g.Eventually(IntegrationConditionStatus(t, ns, "cron", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "cron"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-yaml", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationCronJob(t, ns, "cron-yaml"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationCronJob(t, ns, "cron-yaml"), TestTimeoutLong).ShouldNot(BeNil())
g.Eventually(IntegrationConditionStatus(t, ns, "cron-yaml", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "cron-yaml"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
t.Run("cron-timer", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns, "files/cron-timer.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationCronJob(t, ns, "cron-timer"), TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationCronJob(t, ns, "cron-timer"), TestTimeoutLong).ShouldNot(BeNil())
g.Eventually(IntegrationConditionStatus(t, ns, "cron-timer", v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ns, "cron-timer"), TestTimeoutMedium).Should(ContainSubstring("Magicstring!"))
})
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index a7643f175..3d590a3e8 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -48,7 +48,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
}
WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-rest"
+ operatorID := "camel-k-registry-maven-repo"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index adc9fd36b..dc9bbe3b5 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -46,7 +46,7 @@ func TestPipeScale(t *testing.T) {
operatorID := "camel-k-pipe-scale"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/install/upgrade/cli_upgrade_test.go b/e2e/install/upgrade/cli_upgrade_test.go
index 2fffef78a..12c38f20e 100644
--- a/e2e/install/upgrade/cli_upgrade_test.go
+++ b/e2e/install/upgrade/cli_upgrade_test.go
@@ -95,7 +95,7 @@ func TestCLIOperatorUpgrade(t *testing.T) {
g.Expect(os.Setenv("KAMEL_BIN", "")).To(Succeed())
// Upgrade the operator by installing the current version
- g.Expect(KamelInstall(t, ns, "--olm=false", "--force", "--operator-image", image, "--base-image", defaults.BaseImage())).To(Succeed())
+ g.Expect(Kamel(t, "install", "-n", ns, "--olm=false", "--skip-default-kamelets-setup", "--force", "--operator-image", image, "--base-image", defaults.BaseImage()).Execute()).To(Succeed())
// Check the operator image is the current built one
g.Eventually(OperatorImage(t, ns)).Should(Equal(image))
diff --git a/e2e/install/upgrade/helm_upgrade_test.go b/e2e/install/upgrade/helm_upgrade_test.go
index edffae090..927b08bcb 100644
--- a/e2e/install/upgrade/helm_upgrade_test.go
+++ b/e2e/install/upgrade/helm_upgrade_test.go
@@ -65,7 +65,7 @@ func TestHelmOperatorUpgrade(t *testing.T) {
t.FailNow()
}
}
- g.Eventually(CRDs(t)).Should(HaveLen(0))
+ g.Eventually(CRDs(t), TestTimeoutMedium).Should(HaveLen(0))
WithNewTestNamespace(t, func(g *WithT, ns string) {
// Install operator in last released version
diff --git a/e2e/knative/knative_test.go b/e2e/knative/knative_test.go
index 600f423fa..e35b44ed2 100644
--- a/e2e/knative/knative_test.go
+++ b/e2e/knative/knative_test.go
@@ -141,6 +141,8 @@ func TestRunBroker(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile", "knative")).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(camelv1.IntegrationPlatformPhaseReady))
+
g.Expect(KamelRunWithID(t, operatorID, ns, "files/knativeevt1.groovy").Execute()).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/knativeevt2.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns, "knativeevt1"), TestTimeoutLong).Should(Equal(v1.PodRunning))
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index c088c33d8..cce80567d 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -140,6 +140,7 @@ var TestContext context.Context
var testClient client.Client
var clientMutex = sync.Mutex{}
+var testSetupMutex = sync.Mutex{}
var kamelInstallMutex = sync.Mutex{}
// Only panic the test if absolutely necessary and there is
@@ -2069,12 +2070,16 @@ func UpdateIntegrationProfile(t *testing.T, ns string, upd func(ipr *v1.Integrat
func CreateCamelCatalog(t *testing.T, catalog *v1.CamelCatalog) func() error {
return func() error {
+ testSetupMutex.Lock()
+ defer testSetupMutex.Unlock()
return TestClient(t).Create(TestContext, catalog)
}
}
func CreateIntegrationKit(t *testing.T, kit *v1.IntegrationKit) func() error {
return func() error {
+ testSetupMutex.Lock()
+ defer testSetupMutex.Unlock()
return TestClient(t).Create(TestContext, kit)
}
}
diff --git a/pkg/cmd/builder_test.go b/pkg/cmd/builder_test.go
index 0d506edaf..4f5ee39e3 100644
--- a/pkg/cmd/builder_test.go
+++ b/pkg/cmd/builder_test.go
@@ -56,7 +56,7 @@ func addTestBuilderCmd(options RootCmdOptions, rootCmd *cobra.Command) *builderC
func TestBuilderNonExistingFlag(t *testing.T) {
_, rootCmd, _ := initializeBuilderCmdOptions(t)
_, err := test.ExecuteCommand(rootCmd, cmdBuilder, "--nonExistingFlag")
- require.NoError(t, err)
+ require.Error(t, err)
}
func TestBuilderBuildNameFlag(t *testing.T) {