From 3dc7b8a8a2ec669e6aa4e7d9b74761ab281ee29e Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Mon, 12 Apr 2021 20:40:57 +0300 Subject: [PATCH] chore: fix import path mismerge Two PRs got merged, one which had old import paths and another one which had import paths updated, and some paths didn't get updated properly. Signed-off-by: Andrey Smirnov --- .../pkg/controllers/k8s/extra_manifest_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go b/internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go index 68765d2fdf..d65f654a9d 100644 --- a/internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go +++ b/internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go @@ -14,13 +14,13 @@ import ( "testing" "time" + "github.com/cosi-project/runtime/pkg/controller/runtime" + "github.com/cosi-project/runtime/pkg/resource" + "github.com/cosi-project/runtime/pkg/state" + "github.com/cosi-project/runtime/pkg/state/impl/inmem" + "github.com/cosi-project/runtime/pkg/state/impl/namespaced" "github.com/stretchr/testify/suite" "github.com/talos-systems/go-retry/retry" - "github.com/talos-systems/os-runtime/pkg/controller/runtime" - "github.com/talos-systems/os-runtime/pkg/resource" - "github.com/talos-systems/os-runtime/pkg/state" - "github.com/talos-systems/os-runtime/pkg/state/impl/inmem" - "github.com/talos-systems/os-runtime/pkg/state/impl/namespaced" k8sctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/k8s" "github.com/talos-systems/talos/pkg/resources/config"