From e82ce99de0b1e5333b6cf954a34b349b9cf6e6cc Mon Sep 17 00:00:00 2001 From: Mario Manno Date: Wed, 10 Jul 2024 11:32:28 +0200 Subject: [PATCH] Remove e2e "difficult" label All tests in multi-cluster are difficult --- e2e/multi-cluster/bundle_namespace_mapping_test.go | 4 +++- e2e/multi-cluster/depends_on_test.go | 2 +- internal/cmd/cli/apply/apply.go | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/e2e/multi-cluster/bundle_namespace_mapping_test.go b/e2e/multi-cluster/bundle_namespace_mapping_test.go index 91e86ed0a4..f509680dbe 100644 --- a/e2e/multi-cluster/bundle_namespace_mapping_test.go +++ b/e2e/multi-cluster/bundle_namespace_mapping_test.go @@ -11,7 +11,9 @@ import ( "github.com/rancher/fleet/e2e/testenv/kubectl" ) -var _ = Describe("Bundle Namespace Mapping", Label("difficult"), func() { +// This test uses two clusters to demonstrate matching clusters in different +// namespaces. Therefore it's setup and input configuration is difficult. +var _ = Describe("Bundle Namespace Mapping", func() { var ( k kubectl.Command kd kubectl.Command diff --git a/e2e/multi-cluster/depends_on_test.go b/e2e/multi-cluster/depends_on_test.go index 59b02782f4..c1a4364b62 100644 --- a/e2e/multi-cluster/depends_on_test.go +++ b/e2e/multi-cluster/depends_on_test.go @@ -13,7 +13,7 @@ import ( fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1" ) -var _ = Describe("Bundle Depends On", Label("difficult"), func() { +var _ = Describe("Bundle Depends On", func() { var ( k kubectl.Command diff --git a/internal/cmd/cli/apply/apply.go b/internal/cmd/cli/apply/apply.go index a4c472b00b..14ce2e097a 100644 --- a/internal/cmd/cli/apply/apply.go +++ b/internal/cmd/cli/apply/apply.go @@ -213,7 +213,8 @@ func Dir(ctx context.Context, client Getter, name, baseDir string, opts *Options if opts == nil { opts = &Options{} } - // the bundleID is a valid helm release name, it's used as a default if a release name is not specified in helm options + // The bundleID is a valid helm release name, it's used as a default if a release name is not specified in helm options. + // It's also used to create the bundle name. bundleID := filepath.Join(name, baseDir) bundleID = name2.HelmReleaseName(bundleID)