diff --git a/controllers/rollingupgrade_controller.go b/controllers/rollingupgrade_controller.go index 0eabfac2..3ae5f92c 100644 --- a/controllers/rollingupgrade_controller.go +++ b/controllers/rollingupgrade_controller.go @@ -39,7 +39,7 @@ import ( "github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface" "github.com/go-logr/logr" - "github.com/keikoproj/upgrade-manager/pkg/log" + log "github.com/keikoproj/upgrade-manager/pkg/log" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/controllers/rollingupgrade_controller_test.go b/controllers/rollingupgrade_controller_test.go index 9c343c83..2c4353b2 100644 --- a/controllers/rollingupgrade_controller_test.go +++ b/controllers/rollingupgrade_controller_test.go @@ -3,13 +3,14 @@ package controllers import ( "encoding/json" "fmt" - "log" "os" "path/filepath" "sync" "testing" "time" + log "github.com/keikoproj/upgrade-manager/pkg/log" + "k8s.io/apimachinery/pkg/util/intstr" "gopkg.in/yaml.v2" diff --git a/go.sum b/go.sum index 4d5625dc..141a70a2 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,6 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=