Merge pull request #810 from tjamet/metadata/cleanup

Delete unused metadata functions

Author: k8s-ci-robot

pkg/graph/builder.go

@@ -465,7 +465,7 @@ func (b *Builder) buildInstanceResource(
 	// CRD declarations.
 
 	// The instance resource is a Kubernetes resource, so it has a GroupVersionKind.
-	gvk := metadata.GetResourceGraphDefinitionInstanceGVK(group, apiVersion, kind)
+	gvr := metadata.GetResourceGraphDefinitionInstanceGVR(group, apiVersion, kind)
 
 	// The instance resource has a schema defined using the "SimpleSchema" format.
 	instanceSpecSchema, err := buildInstanceSpecSchema(rgDefinition)
@@ -497,7 +497,7 @@ func (b *Builder) buildInstanceResource(
 	// The instance resource has a set of variables that need to be resolved.
 	instance := &Resource{
 		id:     "instance",
-		gvr:    metadata.GVKtoGVR(gvk),
+		gvr:    gvr,
 		schema: instanceSchema,
 		crd:    instanceCRD,
 	}

pkg/metadata/groupversion.go

@@ -59,16 +59,6 @@ func ExtractGVKFromUnstructured(unstructured map[string]interface{}) (schema.Gro
 	}, nil
 }
 
-func GetResourceGraphDefinitionInstanceGVK(group, apiVersion, kind string) schema.GroupVersionKind {
-	//pluralKind := flect.Pluralize(strings.ToLower(kind))
-
-	return schema.GroupVersionKind{
-		Group:   group,
-		Version: apiVersion,
-		Kind:    kind,
-	}
-}
-
 func GetResourceGraphDefinitionInstanceGVR(group, apiVersion, kind string) schema.GroupVersionResource {
 	pluralKind := flect.Pluralize(strings.ToLower(kind))
 	return schema.GroupVersionResource{
@@ -77,21 +67,3 @@ func GetResourceGraphDefinitionInstanceGVR(group, apiVersion, kind string) schem
 		Resource: pluralKind,
 	}
 }
-
-func GVRtoGVK(gvr schema.GroupVersionResource) schema.GroupVersionKind {
-	singular := flect.Singularize(gvr.Resource)
-	return schema.GroupVersionKind{
-		Group:   gvr.Group,
-		Version: gvr.Version,
-		Kind:    singular,
-	}
-}
-
-func GVKtoGVR(gvk schema.GroupVersionKind) schema.GroupVersionResource {
-	resource := flect.Pluralize(strings.ToLower(gvk.Kind))
-	return schema.GroupVersionResource{
-		Group:    gvk.Group,
-		Version:  gvk.Version,
-		Resource: resource,
-	}
-}