Skip to content

Commit

Permalink
chore: fix import path mismerge
Browse files Browse the repository at this point in the history 
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 <smirnov.andrey@gmail.com>
  • Loading branch information
@smira @talos-bot
smira authored and talos-bot committed Apr 12, 2021
1 parent 2402f20 commit 3dc7b8a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 3dc7b8a

Please sign in to comment.