From dba04c81caec6a8eef5c064d60505941efbd45f9 Mon Sep 17 00:00:00 2001 From: Philippe Martin Date: Mon, 4 Apr 2022 11:23:22 +0200 Subject: [PATCH] Move to pkg/labels + doc --- pkg/component/component.go | 2 +- pkg/component/component_test.go | 2 +- pkg/component/delete/delete.go | 2 +- pkg/component/delete/delete_test.go | 2 +- pkg/component/pushed_component.go | 2 +- pkg/deploy/deploy.go | 2 +- .../adapters/kubernetes/component/adapter.go | 2 +- .../kubernetes/component/adapter_test.go | 2 +- .../adapters/kubernetes/storage/utils.go | 2 +- pkg/kclient/deployments.go | 2 +- pkg/kclient/services.go | 2 +- pkg/kclient/services_test.go | 2 +- pkg/{component => }/labels/builder.go | 4 +- pkg/labels/constants.go | 53 ++++++++++++++++++ pkg/{component => }/labels/labels.go | 56 ++----------------- pkg/{component => }/labels/labels_test.go | 2 +- .../labels/selector_builder.go | 2 +- pkg/service/link.go | 2 +- pkg/service/service.go | 2 +- pkg/storage/kubernetes.go | 4 +- pkg/storage/kubernetes_test.go | 2 +- pkg/storage/storage.go | 2 +- pkg/storage/storage_test.go | 2 +- pkg/storage/utils.go | 2 +- pkg/testingutil/deployments.go | 2 +- pkg/testingutil/pods.go | 2 +- pkg/testingutil/services.go | 2 +- tests/helper/helper_kubectl.go | 2 +- tests/helper/helper_oc.go | 2 +- tests/helper/helper_run.go | 2 +- 30 files changed, 88 insertions(+), 81 deletions(-) rename pkg/{component => }/labels/builder.go (96%) create mode 100644 pkg/labels/constants.go rename pkg/{component => }/labels/labels.go (63%) rename pkg/{component => }/labels/labels_test.go (96%) rename pkg/{component => }/labels/selector_builder.go (89%) diff --git a/pkg/component/component.go b/pkg/component/component.go index 67de4e7e5ce..ac44a192f9e 100644 --- a/pkg/component/component.go +++ b/pkg/component/component.go @@ -11,8 +11,8 @@ import ( "github.com/devfile/library/pkg/devfile/parser" dfutil "github.com/devfile/library/pkg/util" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" corev1 "k8s.io/api/core/v1" "k8s.io/klog" diff --git a/pkg/component/component_test.go b/pkg/component/component_test.go index 9d76a6d5b8e..cf786291137 100644 --- a/pkg/component/component_test.go +++ b/pkg/component/component_test.go @@ -7,8 +7,8 @@ import ( devfilepkg "github.com/devfile/api/v2/pkg/devfile" "github.com/golang/mock/gomock" "github.com/kylelemons/godebug/pretty" - "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + "github.com/redhat-developer/odo/pkg/labels" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/component/delete/delete.go b/pkg/component/delete/delete.go index ff80986046b..c113590b1be 100644 --- a/pkg/component/delete/delete.go +++ b/pkg/component/delete/delete.go @@ -12,8 +12,8 @@ import ( "k8s.io/klog" "github.com/redhat-developer/odo/pkg/component" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/libdevfile" "github.com/redhat-developer/odo/pkg/log" "github.com/redhat-developer/odo/pkg/util" diff --git a/pkg/component/delete/delete_test.go b/pkg/component/delete/delete_test.go index 669f6847bd0..f1548d35ef6 100644 --- a/pkg/component/delete/delete_test.go +++ b/pkg/component/delete/delete_test.go @@ -16,8 +16,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" odoTestingUtil "github.com/redhat-developer/odo/pkg/testingutil" "github.com/redhat-developer/odo/pkg/util" ) diff --git a/pkg/component/pushed_component.go b/pkg/component/pushed_component.go index ae182090791..9d3ca06a3bb 100644 --- a/pkg/component/pushed_component.go +++ b/pkg/component/pushed_component.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/storage" v1 "k8s.io/api/apps/v1" v12 "k8s.io/api/core/v1" diff --git a/pkg/deploy/deploy.go b/pkg/deploy/deploy.go index a40ebf316d5..3aaa7f85a98 100644 --- a/pkg/deploy/deploy.go +++ b/pkg/deploy/deploy.go @@ -11,9 +11,9 @@ import ( "k8s.io/klog" "github.com/redhat-developer/odo/pkg/component" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/devfile/image" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/libdevfile" "github.com/redhat-developer/odo/pkg/log" "github.com/redhat-developer/odo/pkg/service" diff --git a/pkg/devfile/adapters/kubernetes/component/adapter.go b/pkg/devfile/adapters/kubernetes/component/adapter.go index 5334c34247a..dede9103694 100644 --- a/pkg/devfile/adapters/kubernetes/component/adapter.go +++ b/pkg/devfile/adapters/kubernetes/component/adapter.go @@ -12,13 +12,13 @@ import ( "github.com/devfile/library/pkg/devfile/generator" "github.com/redhat-developer/odo/pkg/component" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/devfile" "github.com/redhat-developer/odo/pkg/devfile/adapters/common" "github.com/redhat-developer/odo/pkg/devfile/adapters/kubernetes/storage" "github.com/redhat-developer/odo/pkg/devfile/adapters/kubernetes/utils" "github.com/redhat-developer/odo/pkg/envinfo" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/libdevfile" "github.com/redhat-developer/odo/pkg/log" "github.com/redhat-developer/odo/pkg/preference" diff --git a/pkg/devfile/adapters/kubernetes/component/adapter_test.go b/pkg/devfile/adapters/kubernetes/component/adapter_test.go index 19b1b03b311..d5968190b72 100644 --- a/pkg/devfile/adapters/kubernetes/component/adapter_test.go +++ b/pkg/devfile/adapters/kubernetes/component/adapter_test.go @@ -18,9 +18,9 @@ import ( devfilev1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" devfileParser "github.com/devfile/library/pkg/devfile/parser" "github.com/devfile/library/pkg/testingutil" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" adaptersCommon "github.com/redhat-developer/odo/pkg/devfile/adapters/common" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" odoTestingUtil "github.com/redhat-developer/odo/pkg/testingutil" v1 "k8s.io/api/apps/v1" diff --git a/pkg/devfile/adapters/kubernetes/storage/utils.go b/pkg/devfile/adapters/kubernetes/storage/utils.go index 60e84c6787c..44fbede284d 100644 --- a/pkg/devfile/adapters/kubernetes/storage/utils.go +++ b/pkg/devfile/adapters/kubernetes/storage/utils.go @@ -9,8 +9,8 @@ import ( parsercommon "github.com/devfile/library/pkg/devfile/parser/data/v2/common" dfutil "github.com/devfile/library/pkg/util" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/storage" storagepkg "github.com/redhat-developer/odo/pkg/storage" diff --git a/pkg/kclient/deployments.go b/pkg/kclient/deployments.go index b4e84a3197a..6e9064c1ec4 100644 --- a/pkg/kclient/deployments.go +++ b/pkg/kclient/deployments.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" + odolabels "github.com/redhat-developer/odo/pkg/labels" apiMachineryWatch "k8s.io/apimachinery/pkg/watch" ) diff --git a/pkg/kclient/services.go b/pkg/kclient/services.go index 6eabee93f79..197835723a0 100644 --- a/pkg/kclient/services.go +++ b/pkg/kclient/services.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" + odolabels "github.com/redhat-developer/odo/pkg/labels" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/kclient/services_test.go b/pkg/kclient/services_test.go index ebdf61779d1..e66cffab06a 100644 --- a/pkg/kclient/services_test.go +++ b/pkg/kclient/services_test.go @@ -12,7 +12,7 @@ import ( devfileParser "github.com/devfile/library/pkg/devfile/parser" parsercommon "github.com/devfile/library/pkg/devfile/parser/data/v2/common" "github.com/devfile/library/pkg/testingutil" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" + odolabels "github.com/redhat-developer/odo/pkg/labels" odoTestingUtil "github.com/redhat-developer/odo/pkg/testingutil" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/component/labels/builder.go b/pkg/labels/builder.go similarity index 96% rename from pkg/component/labels/builder.go rename to pkg/labels/builder.go index 67888eafe02..ca6d9cf9c25 100644 --- a/pkg/component/labels/builder.go +++ b/pkg/labels/builder.go @@ -39,7 +39,7 @@ func (o builder) WithAppName(name string) builder { } func (o builder) WithApp(name string) builder { - o.m[app] = name + o.m[appLabel] = name return o } @@ -74,6 +74,6 @@ func (o builder) WithStorageName(name string) builder { } func (o builder) WithComponent(name string) builder { - o.m["component"] = name + o.m[componentLabel] = name return o } diff --git a/pkg/labels/constants.go b/pkg/labels/constants.go new file mode 100644 index 00000000000..e635b70e33f --- /dev/null +++ b/pkg/labels/constants.go @@ -0,0 +1,53 @@ +package labels + +const ( + + // kubernetesInstanceLabel identifies the component name + kubernetesInstanceLabel = "app.kubernetes.io/instance" + + // kubernetesNameLabel identifies the type of the component + // const kubernetesNameLabel = "app.kubernetes.io/name" + + // kubernetesManagedByLabel identifies the manager of the component + kubernetesManagedByLabel = "app.kubernetes.io/managed-by" + + // kubernetesManagedByVersionLabel identifies the version of manager used to deploy the resource + kubernetesManagedByVersionLabel = "app.kubernetes.io/managed-by-version" + + // kubernetesPartOfLabel identifies the application to which the component belongs + kubernetesPartOfLabel = "app.kubernetes.io/part-of" + + // kubernetesStorageNameLabel is applied to all storage resources that are created + kubernetesStorageNameLabel = "app.kubernetes.io/storage-name" + + // odoModeLabel indicates which command were used to create the component, either dev or deploy + odoModeLabel = "odo.dev/mode" + + // odoProjectTypeAnnotation indicates the project type fohe component + odoProjectTypeAnnotation = "odo.dev/project-type" + + appLabel = "app" + + componentLabel = "component" + + // devfileStorageLabel is applied to all storage resources for devfile components that are created + devfileStorageLabel = "storage-name" + + sourcePVCLabel = "odo-source-pvc" +) + +const ( + // ComponentDevMode indicates the resource is deployed using dev command + ComponentDevMode = "Dev" + + // ComponentDeployMode indicates the resource is deployed using deploy command + ComponentDeployMode = "Deploy" + + // ComponentAnyMode is used to search resources deployed using either dev or deploy comamnd + ComponentAnyMode = "" + + ComponentNoneName = "None" + + // odoManager is the value of the manager when a component is managed by odo + odoManager = "odo" +) diff --git a/pkg/component/labels/labels.go b/pkg/labels/labels.go similarity index 63% rename from pkg/component/labels/labels.go rename to pkg/labels/labels.go index 750ced6926f..56e3b7b8bf4 100644 --- a/pkg/component/labels/labels.go +++ b/pkg/labels/labels.go @@ -7,63 +7,17 @@ import ( "k8s.io/apimachinery/pkg/labels" ) -// kubernetesInstanceLabel identifies the component name -const kubernetesInstanceLabel = "app.kubernetes.io/instance" - -// kubernetesNameLabel identifies the type of the component -// const kubernetesNameLabel = "app.kubernetes.io/name" - -// kubernetesManagedByLabel identifies the manager of the component -const kubernetesManagedByLabel = "app.kubernetes.io/managed-by" - -// kubernetesManagedByVersionLabel identifies the version of manager used to deploy the resource -const kubernetesManagedByVersionLabel = "app.kubernetes.io/managed-by-version" - -// kubernetesPartOfLabel groups all object that belong to one application -const kubernetesPartOfLabel = "app.kubernetes.io/part-of" - -// kubernetesStorageNameLabel is the label key that is applied to all storage resources -// that are created -const kubernetesStorageNameLabel = "app.kubernetes.io/storage-name" - -// ComponentDevMode indicates the resource is deployed using dev command -const ComponentDevMode = "Dev" - -// ComponentDeployMode indicates the resource is deployed using deploy command -const ComponentDeployMode = "Deploy" - -// ComponentAnyMode is used to search resources deployed using either dev or deploy comamnd -const ComponentAnyMode = "" - -// ComponentNoneName ... -const ComponentNoneName = "None" - -// odoModeLabel ... -const odoModeLabel = "odo.dev/mode" - -// odoProjectTypeAnnotation ... -const odoProjectTypeAnnotation = "odo.dev/project-type" - -// app is the default name used when labeling -const app = "app" - -const odoManager = "odo" - -// devfileStorageLabel is the label key that is applied to all storage resources for devfile components -// that are created -const devfileStorageLabel = "storage-name" - -const sourcePVCLabel = "odo-source-pvc" - // GetLabels return labels that should be applied to every object for given component in active application // if you need labels to filter component then use GetSelector instead func GetLabels(componentName string, applicationName string, mode string) map[string]string { labels := getLabels(componentName, applicationName, mode, true) return labels } + +// AddStorageInfo adds labels for storage resources func AddStorageInfo(labels map[string]string, storageName string, isSourceVolume bool) { labels[kubernetesStorageNameLabel] = storageName - labels["component"] = labels[kubernetesInstanceLabel] + labels[componentLabel] = labels[kubernetesInstanceLabel] labels[devfileStorageLabel] = storageName if isSourceVolume { labels[sourcePVCLabel] = storageName @@ -114,7 +68,7 @@ func SetProjectType(annotations map[string]string, value string) { annotations[odoProjectTypeAnnotation] = value } -// GetSelector is used for selection of resources which are a part of the given component +// GetSelector returns a selector string used for selection of resources which are part of the given component in given mode func GetSelector(componentName string, applicationName string, mode string) string { labels := getLabels(componentName, applicationName, mode, false) return labels.String() @@ -143,7 +97,7 @@ func getApplicationLabels(application string, additional bool) labels.Set { kubernetesManagedByLabel: odoManager, } if additional { - labels[app] = application + labels[appLabel] = application labels[kubernetesManagedByVersionLabel] = version.VERSION } return labels diff --git a/pkg/component/labels/labels_test.go b/pkg/labels/labels_test.go similarity index 96% rename from pkg/component/labels/labels_test.go rename to pkg/labels/labels_test.go index 230236f82b9..d5a512f6d2f 100644 --- a/pkg/component/labels/labels_test.go +++ b/pkg/labels/labels_test.go @@ -41,7 +41,7 @@ func Test_getLabels(t *testing.T) { }, want: labels.Set{ kubernetesPartOfLabel: "applicationame", - app: "applicationame", + appLabel: "applicationame", kubernetesManagedByLabel: "odo", kubernetesManagedByVersionLabel: version.VERSION, kubernetesInstanceLabel: "componentname", diff --git a/pkg/component/labels/selector_builder.go b/pkg/labels/selector_builder.go similarity index 89% rename from pkg/component/labels/selector_builder.go rename to pkg/labels/selector_builder.go index 32ed2ef21ed..a31ab2e427e 100644 --- a/pkg/component/labels/selector_builder.go +++ b/pkg/labels/selector_builder.go @@ -16,7 +16,7 @@ func SelectorBuilder() selectorBuilder { } func (o selectorBuilder) WithComponent(name string) selectorBuilder { - req, err := labels.NewRequirement("component", selection.Equals, []string{name}) + req, err := labels.NewRequirement(componentLabel, selection.Equals, []string{name}) if err != nil { panic(err) } diff --git a/pkg/service/link.go b/pkg/service/link.go index 5b681eeaf47..d86fcaf2ba8 100644 --- a/pkg/service/link.go +++ b/pkg/service/link.go @@ -11,8 +11,8 @@ import ( "github.com/devfile/library/pkg/devfile/generator" devfilefs "github.com/devfile/library/pkg/testingutil/filesystem" "github.com/ghodss/yaml" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" v1 "k8s.io/api/apps/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/service/service.go b/pkg/service/service.go index d56310bd4ca..de9e932957d 100644 --- a/pkg/service/service.go +++ b/pkg/service/service.go @@ -8,8 +8,8 @@ import ( "github.com/redhat-developer/odo/pkg/libdevfile" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/log" devfile "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" diff --git a/pkg/storage/kubernetes.go b/pkg/storage/kubernetes.go index 3e0794a2213..edf9af83d92 100644 --- a/pkg/storage/kubernetes.go +++ b/pkg/storage/kubernetes.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/devfile/library/pkg/devfile/generator" - "github.com/redhat-developer/odo/pkg/component/labels" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + "github.com/redhat-developer/odo/pkg/labels" + odolabels "github.com/redhat-developer/odo/pkg/labels" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/storage/kubernetes_test.go b/pkg/storage/kubernetes_test.go index cd9763fdf38..666aa2f4038 100644 --- a/pkg/storage/kubernetes_test.go +++ b/pkg/storage/kubernetes_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/golang/mock/gomock" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/localConfigProvider" "github.com/redhat-developer/odo/pkg/testingutil" "github.com/redhat-developer/odo/pkg/util" diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index ffbcb2bf031..66be7a28802 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -3,8 +3,8 @@ package storage import ( "fmt" - "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/localConfigProvider" "github.com/redhat-developer/odo/pkg/log" v1 "k8s.io/api/apps/v1" diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go index 87d87af109b..4a42ee7514c 100644 --- a/pkg/storage/storage_test.go +++ b/pkg/storage/storage_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/golang/mock/gomock" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/localConfigProvider" "github.com/redhat-developer/odo/pkg/util" ) diff --git a/pkg/storage/utils.go b/pkg/storage/utils.go index 1495a32b9a5..17b1a1713c1 100644 --- a/pkg/storage/utils.go +++ b/pkg/storage/utils.go @@ -3,8 +3,8 @@ package storage import ( "fmt" - odolabels "github.com/redhat-developer/odo/pkg/component/labels" "github.com/redhat-developer/odo/pkg/kclient" + odolabels "github.com/redhat-developer/odo/pkg/labels" "github.com/redhat-developer/odo/pkg/localConfigProvider" "github.com/redhat-developer/odo/pkg/util" ) diff --git a/pkg/testingutil/deployments.go b/pkg/testingutil/deployments.go index 2330c0f158d..888999f8ecf 100644 --- a/pkg/testingutil/deployments.go +++ b/pkg/testingutil/deployments.go @@ -1,7 +1,7 @@ package testingutil import ( - odolabels "github.com/redhat-developer/odo/pkg/component/labels" + odolabels "github.com/redhat-developer/odo/pkg/labels" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/testingutil/pods.go b/pkg/testingutil/pods.go index b22dcdc29e0..6e88a84aae3 100644 --- a/pkg/testingutil/pods.go +++ b/pkg/testingutil/pods.go @@ -1,7 +1,7 @@ package testingutil import ( - odolabels "github.com/redhat-developer/odo/pkg/component/labels" + odolabels "github.com/redhat-developer/odo/pkg/labels" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/testingutil/services.go b/pkg/testingutil/services.go index 45424b2d1d8..9b1ae98941f 100644 --- a/pkg/testingutil/services.go +++ b/pkg/testingutil/services.go @@ -1,7 +1,7 @@ package testingutil import ( - odolabels "github.com/redhat-developer/odo/pkg/component/labels" + odolabels "github.com/redhat-developer/odo/pkg/labels" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/tests/helper/helper_kubectl.go b/tests/helper/helper_kubectl.go index 369da11e34f..2855f90bf09 100644 --- a/tests/helper/helper_kubectl.go +++ b/tests/helper/helper_kubectl.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" - "github.com/redhat-developer/odo/pkg/component/labels" + "github.com/redhat-developer/odo/pkg/labels" ) const ( diff --git a/tests/helper/helper_oc.go b/tests/helper/helper_oc.go index 35539c5b982..959627a5720 100644 --- a/tests/helper/helper_oc.go +++ b/tests/helper/helper_oc.go @@ -12,7 +12,7 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" - "github.com/redhat-developer/odo/pkg/component/labels" + "github.com/redhat-developer/odo/pkg/labels" ) const ( diff --git a/tests/helper/helper_run.go b/tests/helper/helper_run.go index e4933ccd2ae..9d09b0c53d0 100644 --- a/tests/helper/helper_run.go +++ b/tests/helper/helper_run.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" - "github.com/redhat-developer/odo/pkg/component/labels" + "github.com/redhat-developer/odo/pkg/labels" ) func runningCmd(cmd *exec.Cmd) string {