fix: remove extra type inference

operator-framework · Jun 25, 2020 · 48a7503 · 48a7503
1 parent 74da4a8
commit 48a7503
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 29 deletions.
diff --git a/pkg/lib/operatorlister/lister.go b/pkg/lib/operatorlister/lister.go
@@ -190,13 +190,13 @@ func newOperatorsV1Lister() *operatorsV1Lister {
 var _ OperatorLister = &lister{}
 
 type lister struct {
-	appsV1Lister            *appsV1Lister
-	coreV1Lister            *coreV1Lister
-	rbacV1Lister            *rbacV1Lister
-	apiRegistrationV1Lister *apiRegistrationV1Lister
-	apiExtensionsV1Lister   *apiExtensionsV1Lister
-	operatorsV1alpha1Lister *operatorsV1alpha1Lister
-	operatorsV1Lister       *operatorsV1Lister
+	appsV1Lister               *appsV1Lister
+	coreV1Lister               *coreV1Lister
+	rbacV1Lister               *rbacV1Lister
+	apiRegistrationV1Lister    *apiRegistrationV1Lister
+	apiExtensionsV1Lister      *apiExtensionsV1Lister
+	operatorsV1alpha1Lister    *operatorsV1alpha1Lister
+	operatorsV1Lister          *operatorsV1Lister
 }
 
 func (l *lister) AppsV1() AppsV1Lister {
@@ -230,12 +230,12 @@ func (l *lister) OperatorsV1() OperatorsV1Lister {
 func NewLister() OperatorLister {
 	// TODO: better initialization
 	return &lister{
-		appsV1Lister:            newAppsV1Lister(),
-		coreV1Lister:            newCoreV1Lister(),
-		rbacV1Lister:            newRbacV1Lister(),
-		apiRegistrationV1Lister: newAPIRegistrationV1Lister(),
-		apiExtensionsV1Lister:   newAPIExtensionsV1Lister(),
-		operatorsV1alpha1Lister: newOperatorsV1alpha1Lister(),
-		operatorsV1Lister:       newOperatorsV1Lister(),
+		appsV1Lister:               newAppsV1Lister(),
+		coreV1Lister:               newCoreV1Lister(),
+		rbacV1Lister:               newRbacV1Lister(),
+		apiRegistrationV1Lister:    newAPIRegistrationV1Lister(),
+		apiExtensionsV1Lister:      newAPIExtensionsV1Lister(),
+		operatorsV1alpha1Lister:    newOperatorsV1alpha1Lister(),
+		operatorsV1Lister:          newOperatorsV1Lister(),
 	}
 }
diff --git a/pkg/lib/ownerutil/util.go b/pkg/lib/ownerutil/util.go
@@ -8,9 +8,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
-	policyv1beta1 "k8s.io/api/policy/v1beta1"
 	rbac "k8s.io/api/rbac/v1"
-	schedulingv1 "k8s.io/api/scheduling/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -400,19 +398,6 @@ func InferGroupVersionKind(obj runtime.Object) error {
 			Version: apiextensionsv1.SchemeGroupVersion.Version,
 			Kind:    "CustomResourceDefinition",
 		})
-	case *policyv1beta1.PodDisruptionBudget:
-		objectKind.SetGroupVersionKind(schema.GroupVersionKind{
-			Group:   policyv1beta1.GroupName,
-			Version: policyv1beta1.SchemeGroupVersion.Version,
-			Kind:    "PodDisruptionBudget",
-		})
-	case *schedulingv1.PriorityClass:
-		objectKind.SetGroupVersionKind(schema.GroupVersionKind{
-			Group:   schedulingv1.GroupName,
-			Version: schedulingv1.SchemeGroupVersion.Version,
-			Kind:    "PriorityClass",
-		})
-		// TODO add GVK for VPA objects
 	default:
 		return fmt.Errorf("could not infer GVK for object: %#v, %#v", obj, objectKind)
 	}