Merge pull request kubernetes#89678 from tanjunchen/manifest

test/e2e/manifest:remove unused function

Author: k8s-ci-robot

test/e2e/manifest/BUILD

@@ -12,7 +12,6 @@ go_library(
     deps = [
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
-        "//staging/src/k8s.io/api/rbac/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/yaml:go_default_library",

test/e2e/manifest/manifest.go

@@ -19,11 +19,10 @@ package manifest
 import (
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/api/core/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
-	scheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/kubernetes/scheme"
 	e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles"
 )
 
@@ -45,24 +44,6 @@ func PodFromManifest(filename string) (*v1.Pod, error) {
 	return &pod, nil
 }
 
-// RcFromManifest reads a .json/yaml file and returns the rc in it.
-func RcFromManifest(fileName string) (*v1.ReplicationController, error) {
-	var controller v1.ReplicationController
-	data, err := e2etestfiles.Read(fileName)
-	if err != nil {
-		return nil, err
-	}
-
-	json, err := utilyaml.ToJSON(data)
-	if err != nil {
-		return nil, err
-	}
-	if err := runtime.DecodeInto(scheme.Codecs.UniversalDecoder(), json, &controller); err != nil {
-		return nil, err
-	}
-	return &controller, nil
-}
-
 // SvcFromManifest reads a .json/yaml file and returns the service in it.
 func SvcFromManifest(fileName string) (*v1.Service, error) {
 	var svc v1.Service
@@ -104,43 +85,3 @@ func StatefulSetFromManifest(fileName, ns string) (*appsv1.StatefulSet, error) {
 	}
 	return &ss, nil
 }
-
-// DaemonSetFromManifest returns a DaemonSet from a manifest stored in fileName in the Namespace indicated by ns.
-func DaemonSetFromManifest(fileName, ns string) (*appsv1.DaemonSet, error) {
-	var ds appsv1.DaemonSet
-	data, err := e2etestfiles.Read(fileName)
-	if err != nil {
-		return nil, err
-	}
-
-	json, err := utilyaml.ToJSON(data)
-	if err != nil {
-		return nil, err
-	}
-	err = runtime.DecodeInto(scheme.Codecs.UniversalDecoder(), json, &ds)
-	if err != nil {
-		return nil, err
-	}
-	ds.Namespace = ns
-	return &ds, nil
-}
-
-// RoleFromManifest returns a Role from a manifest stored in fileName in the Namespace indicated by ns.
-func RoleFromManifest(fileName, ns string) (*rbacv1.Role, error) {
-	var role rbacv1.Role
-	data, err := e2etestfiles.Read(fileName)
-	if err != nil {
-		return nil, err
-	}
-
-	json, err := utilyaml.ToJSON(data)
-	if err != nil {
-		return nil, err
-	}
-	err = runtime.DecodeInto(scheme.Codecs.UniversalDecoder(), json, &role)
-	if err != nil {
-		return nil, err
-	}
-	role.Namespace = ns
-	return &role, nil
-}