Remove AssignTypeKind and GetGroupVersionKind util methods (#1029)

voyagermesh · May 9, 2018 · 941c9a4 · 941c9a4
1 parent e18f3fe
commit 941c9a4
Show file tree

Hide file tree

Showing 47 changed files with 5,754 additions and 1,026 deletions.
diff --git a/client/clientset/versioned/typed/voyager/v1beta1/util/certificate.go b/client/clientset/versioned/typed/voyager/v1beta1/util/certificate.go
@@ -1,8 +1,6 @@
 package util
 
 import (
-	"encoding/json"
-
 	"github.com/appscode/kutil"
 	api "github.com/appscode/voyager/apis/voyager/v1beta1"
 	cs "github.com/appscode/voyager/client/clientset/versioned/typed/voyager/v1beta1"

diff --git a/client/clientset/versioned/typed/voyager/v1beta1/util/ingress.go b/client/clientset/versioned/typed/voyager/v1beta1/util/ingress.go
@@ -1,8 +1,6 @@
 package util
 
 import (
-	"encoding/json"
-
 	"github.com/appscode/kutil"
 	api "github.com/appscode/voyager/apis/voyager/v1beta1"
 	cs "github.com/appscode/voyager/client/clientset/versioned/typed/voyager/v1beta1"

diff --git a/client/clientset/versioned/typed/voyager/v1beta1/util/kubernetes.go b/client/clientset/versioned/typed/voyager/v1beta1/util/kubernetes.go
@@ -1,32 +1,7 @@
 package util
 
 import (
-	"github.com/appscode/kutil/meta"
-	api "github.com/appscode/voyager/apis/voyager/v1beta1"
-	"github.com/pkg/errors"
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"github.com/json-iterator/go"
 )
 
-func GetGroupVersionKind(v interface{}) schema.GroupVersionKind {
-	return api.SchemeGroupVersion.WithKind(meta.GetKind(v))
-}
-
-func AssignTypeKind(v interface{}) error {
-	_, err := conversion.EnforcePtr(v)
-	if err != nil {
-		return err
-	}
-
-	switch u := v.(type) {
-	case *api.Ingress:
-		u.APIVersion = api.SchemeGroupVersion.String()
-		u.Kind = api.ResourceKindIngress
-		return nil
-	case *api.Certificate:
-		u.APIVersion = api.SchemeGroupVersion.String()
-		u.Kind = api.ResourceKindCertificate
-		return nil
-	}
-	return errors.New("unknown api object type")
-}
+var json = jsoniter.ConfigFastest
diff --git a/glide.lock b/glide.lock
diff --git a/test/e2e/tcp-sni.go b/test/e2e/tcp-sni.go
@@ -153,7 +153,7 @@ var _ = Describe("Ingress TCP SNI", func() {
 					IngressRuleValue: api.IngressRuleValue{
 						TCP: &api.TCPIngressRuleValue{
 							NoTLS: true,
-							Port: intstr.FromInt(8443),
+							Port:  intstr.FromInt(8443),
 							Backend: api.IngressBackend{
 								ServiceName: f.Ingress.TestServerHTTPSName(),
 								ServicePort: intstr.FromInt(443),

diff --git a/vendor/github.com/appscode/kutil/core/v1/pod.go b/vendor/github.com/appscode/kutil/core/v1/pod.go