Revendor kutil (#230)

stashed · Nov 18, 2017 · 46b995a · 46b995a
1 parent 06f4dad
commit 46b995a
Show file tree

Hide file tree

Showing 20 changed files with 1,799 additions and 254 deletions.
diff --git a/client/typed/stash/v1alpha1/util/kubernetes.go b/client/typed/stash/v1alpha1/util/kubernetes.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/appscode/kutil"
+	"github.com/appscode/kutil/meta"
 	api "github.com/appscode/stash/apis/stash/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 func GetGroupVersionKind(v interface{}) schema.GroupVersionKind {
-	return api.SchemeGroupVersion.WithKind(kutil.GetKind(v))
+	return api.SchemeGroupVersion.WithKind(meta.GetKind(v))
 }
 
 func AssignTypeKind(v interface{}) error {
@@ -22,7 +22,7 @@ func AssignTypeKind(v interface{}) error {
 	switch u := v.(type) {
 	case *api.Restic:
 		u.APIVersion = api.SchemeGroupVersion.String()
-		u.Kind = kutil.GetKind(v)
+		u.Kind = meta.GetKind(v)
 		return nil
 	}
 	return errors.New("unknown api object type")

diff --git a/glide.lock b/glide.lock
diff --git a/pkg/migrator/migrate.go b/pkg/migrator/migrate.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/appscode/go/log"
-	"github.com/appscode/kutil"
+	apiext_util "github.com/appscode/kutil/apiextensions/v1beta1"
 	"github.com/appscode/stash/apis/stash"
 	api "github.com/appscode/stash/apis/stash/v1alpha1"
 	"github.com/hashicorp/go-version"
@@ -151,7 +151,7 @@ func (m *migrator) createCRDs() error {
 			}
 		}
 	}
-	return kutil.WaitForCRDReady(m.kubeClient.CoreV1().RESTClient(), crds)
+	return apiext_util.WaitForCRDReady(m.kubeClient.CoreV1().RESTClient(), crds)
 }
 
 func (m *migrator) rollback() error {

diff --git a/vendor/github.com/appscode/kutil/apiextensions/v1beta1/kubernetes.go b/vendor/github.com/appscode/kutil/apiextensions/v1beta1/kubernetes.go
diff --git a/vendor/github.com/appscode/kutil/apps/v1beta1/kubernetes.go b/vendor/github.com/appscode/kutil/apps/v1beta1/kubernetes.go
diff --git a/vendor/github.com/appscode/kutil/core/v1/kubernetes.go b/vendor/github.com/appscode/kutil/core/v1/kubernetes.go
diff --git a/vendor/github.com/appscode/kutil/extensions/v1beta1/daemonset.go b/vendor/github.com/appscode/kutil/extensions/v1beta1/daemonset.go
diff --git a/vendor/github.com/appscode/kutil/extensions/v1beta1/kubernetes.go b/vendor/github.com/appscode/kutil/extensions/v1beta1/kubernetes.go