diff --git a/bot/deployments.go b/bot/deployments.go index 4b11b2a5..4c2a3856 100644 --- a/bot/deployments.go +++ b/bot/deployments.go @@ -7,7 +7,7 @@ import ( "github.com/keel-hq/keel/bot/formatter" "github.com/keel-hq/keel/provider/kubernetes" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" log "github.com/sirupsen/logrus" ) diff --git a/secrets/secrets.go b/secrets/secrets.go index 6dda5eaa..a1d1a8b2 100644 --- a/secrets/secrets.go +++ b/secrets/secrets.go @@ -12,7 +12,7 @@ import ( "github.com/keel-hq/keel/provider/kubernetes" "github.com/keel-hq/keel/types" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" log "github.com/sirupsen/logrus" ) diff --git a/secrets/secrets_test.go b/secrets/secrets_test.go index 3c564714..0ac13033 100644 --- a/secrets/secrets_test.go +++ b/secrets/secrets_test.go @@ -8,7 +8,7 @@ import ( "github.com/keel-hq/keel/types" "github.com/keel-hq/keel/util/image" testutil "github.com/keel-hq/keel/util/testing" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) var secretDataPayload = `{"https://index.docker.io/v1/":{"username":"user-x","password":"pass-x","email":"karolis.rusenas@gmail.com","auth":"somethinghere"}}` diff --git a/util/image/reference.go b/util/image/reference.go index 9d9b374c..7e4e418d 100644 --- a/util/image/reference.go +++ b/util/image/reference.go @@ -5,8 +5,9 @@ import ( "fmt" "strings" - "github.com/docker/distribution/digest" + // "github.com/docker/distribution/digest" "github.com/docker/distribution/reference" + "github.com/opencontainers/go-digest" ) const ( diff --git a/util/testing/testing.go b/util/testing/testing.go index 1a42d28c..1be6af82 100644 --- a/util/testing/testing.go +++ b/util/testing/testing.go @@ -1,9 +1,9 @@ package testing import ( + "k8s.io/api/core/v1" + "k8s.io/api/extensions/v1beta1" core_v1 "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" ) // FakeK8sImplementer - fake implementer used for testing