Merge pull request kubernetes#81925 from SataQiu/fix-test-kubeadm

k8s-ci-robot · web-flow · commit 1810bc8d82f1 · 2019-08-26T10:20:50.000-07:00
e2e_kubeadm: use log functions of core framework
diff --git a/test/e2e_kubeadm/BUILD b/test/e2e_kubeadm/BUILD
@@ -35,7 +35,6 @@ go_test(
         "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
         "//test/e2e/framework:go_default_library",
         "//test/e2e/framework/config:go_default_library",
-        "//test/e2e/framework/log:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/ginkgo/config:go_default_library",
         "//vendor/github.com/onsi/ginkgo/reporters:go_default_library",
@@ -81,7 +80,6 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//test/e2e/framework:go_default_library",
-        "//test/e2e/framework/log:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/github.com/onsi/gomega/gstruct:go_default_library",
diff --git a/test/e2e_kubeadm/kubeadm_config_test.go b/test/e2e_kubeadm/kubeadm_config_test.go
@@ -22,7 +22,6 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
@@ -72,11 +71,11 @@ var _ = KubeadmDescribe("kubeadm-config ConfigMap", func() {
 			// checks that all the control-plane nodes are in the apiEndpoints list
 			for _, cp := range controlPlanes.Items {
 				if _, ok := d[cp.Name]; !ok {
-					e2elog.Failf("failed to get apiEndpoints for control-plane %s in %s", cp.Name, kubeadmConfigClusterStatusConfigMapKey)
+					framework.Failf("failed to get apiEndpoints for control-plane %s in %s", cp.Name, kubeadmConfigClusterStatusConfigMapKey)
 				}
 			}
 		} else {
-			e2elog.Failf("failed to get apiEndpoints from %s", kubeadmConfigClusterStatusConfigMapKey)
+			framework.Failf("failed to get apiEndpoints from %s", kubeadmConfigClusterStatusConfigMapKey)
 		}
 	})
 
@@ -112,7 +111,7 @@ func unmarshalYaml(data string) map[interface{}]interface{} {
 	m := make(map[interface{}]interface{})
 	err := yaml.Unmarshal([]byte(data), &m)
 	if err != nil {
-		e2elog.Failf("error parsing %s ConfigMap: %v", kubeadmConfigName, err)
+		framework.Failf("error parsing %s ConfigMap: %v", kubeadmConfigName, err)
 	}
 	return m
 }
diff --git a/test/e2e_kubeadm/kubelet_config_test.go b/test/e2e_kubeadm/kubelet_config_test.go
@@ -23,7 +23,6 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
@@ -74,7 +73,7 @@ var _ = KubeadmDescribe("kubelet-config ConfigMap", func() {
 		k8sVersionString := m["kubernetesVersion"].(string)
 		k8sVersion, err := version.ParseSemantic(k8sVersionString)
 		if err != nil {
-			e2elog.Failf("error reading kubernetesVersion from %s ConfigMap: %v", kubeadmConfigName, err)
+			framework.Failf("error reading kubernetesVersion from %s ConfigMap: %v", kubeadmConfigName, err)
 		}
 
 		// Computes all the names derived from the kubernetesVersion
diff --git a/test/e2e_kubeadm/networking_test.go b/test/e2e_kubeadm/networking_test.go
@@ -22,7 +22,6 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 
 	"github.com/onsi/ginkgo"
 )
@@ -90,7 +89,7 @@ var _ = KubeadmDescribe("networking [setup-networking]", func() {
 						framework.ExpectNoError(err, "error listing nodes")
 						for _, node := range nodes.Items {
 							if !subnetWithinSubnet(ps.(string), node.Spec.PodCIDR) {
-								e2elog.Failf("failed due to node(%v) IP %v not inside configured pod subnet: %s", node.Name, node.Spec.PodCIDR, ps)
+								framework.Failf("failed due to node(%v) IP %v not inside configured pod subnet: %s", node.Name, node.Spec.PodCIDR, ps)
 							}
 						}
 					}
@@ -114,7 +113,7 @@ var _ = KubeadmDescribe("networking [setup-networking]", func() {
 						svc, err := f.ClientSet.CoreV1().Services("default").Get("kubernetes", metav1.GetOptions{})
 						framework.ExpectNoError(err, "error getting Service %q from namespace %q", "kubernetes", "default")
 						if !ipWithinSubnet(ss.(string), svc.Spec.ClusterIP) {
-							e2elog.Failf("failed due to service(%v) cluster-IP %v not inside configured service subnet: %s", svc.Name, svc.Spec.ClusterIP, ss)
+							framework.Failf("failed due to service(%v) cluster-IP %v not inside configured service subnet: %s", svc.Name, svc.Spec.ClusterIP, ss)
 						}
 					}
 				}
@@ -149,7 +148,7 @@ var _ = KubeadmDescribe("networking [setup-networking]", func() {
 									}
 								}
 								if !found {
-									e2elog.Failf("failed due to the PodCIDRs (%v) of Node %q not being inside the configuration podSubnet CIDR %q", node.Spec.PodCIDRs, node.Name, configCIDRs)
+									framework.Failf("failed due to the PodCIDRs (%v) of Node %q not being inside the configuration podSubnet CIDR %q", node.Spec.PodCIDRs, node.Name, configCIDRs)
 								}
 							}
 						}
diff --git a/test/e2e_kubeadm/util.go b/test/e2e_kubeadm/util.go
@@ -24,7 +24,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 
 	"github.com/onsi/gomega"
 	"github.com/onsi/gomega/gstruct"
@@ -168,7 +167,7 @@ func ExpectSubjectHasAccessToResource(c clientset.Interface, subjectKind, subjec
 			},
 		}
 	default:
-		e2elog.Failf("invalid subjectKind %s", subjectKind)
+		framework.Failf("invalid subjectKind %s", subjectKind)
 	}
 
 	s, err := c.AuthorizationV1().SubjectAccessReviews().Create(sar)

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ import (`
`22`	`22`	`rbacv1 "k8s.io/api/rbac/v1"`
`23`	`23`	`clientset "k8s.io/client-go/kubernetes"`
`24`	`24`	`"k8s.io/kubernetes/test/e2e/framework"`
`25`		`- e2elog "k8s.io/kubernetes/test/e2e/framework/log"`
`26`	`25`
`27`	`26`	`"github.com/onsi/ginkgo"`
`28`	`27`	`"github.com/onsi/gomega"`
`@@ -72,11 +71,11 @@ var _ = KubeadmDescribe("kubeadm-config ConfigMap", func() {`
`72`	`71`	`// checks that all the control-plane nodes are in the apiEndpoints list`
`73`	`72`	`for _, cp := range controlPlanes.Items {`
`74`	`73`	`if _, ok := d[cp.Name]; !ok {`
`75`		`- e2elog.Failf("failed to get apiEndpoints for control-plane %s in %s", cp.Name, kubeadmConfigClusterStatusConfigMapKey)`
	`74`	`+ framework.Failf("failed to get apiEndpoints for control-plane %s in %s", cp.Name, kubeadmConfigClusterStatusConfigMapKey)`
`76`	`75`	`}`
`77`	`76`	`}`
`78`	`77`	`} else {`
`79`		`- e2elog.Failf("failed to get apiEndpoints from %s", kubeadmConfigClusterStatusConfigMapKey)`
	`78`	`+ framework.Failf("failed to get apiEndpoints from %s", kubeadmConfigClusterStatusConfigMapKey)`
`80`	`79`	`}`
`81`	`80`	`})`
`82`	`81`
`@@ -112,7 +111,7 @@ func unmarshalYaml(data string) map[interface{}]interface{} {`
`112`	`111`	`m := make(map[interface{}]interface{})`
`113`	`112`	`err := yaml.Unmarshal([]byte(data), &m)`
`114`	`113`	`if err != nil {`
`115`		`- e2elog.Failf("error parsing %s ConfigMap: %v", kubeadmConfigName, err)`
	`114`	`+ framework.Failf("error parsing %s ConfigMap: %v", kubeadmConfigName, err)`
`116`	`115`	`}`
`117`	`116`	`return m`
`118`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ import (`
`24`	`24`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`25`	`25`	`clientset "k8s.io/client-go/kubernetes"`
`26`	`26`	`"k8s.io/kubernetes/test/e2e/framework"`
`27`		`- e2elog "k8s.io/kubernetes/test/e2e/framework/log"`
`28`	`27`
`29`	`28`	`"github.com/onsi/gomega"`
`30`	`29`	`"github.com/onsi/gomega/gstruct"`
`@@ -168,7 +167,7 @@ func ExpectSubjectHasAccessToResource(c clientset.Interface, subjectKind, subjec`
`168`	`167`	`},`
`169`	`168`	`}`
`170`	`169`	`default:`
`171`		`- e2elog.Failf("invalid subjectKind %s", subjectKind)`
	`170`	`+ framework.Failf("invalid subjectKind %s", subjectKind)`
`172`	`171`	`}`
`173`	`172`
`174`	`173`	`s, err := c.AuthorizationV1().SubjectAccessReviews().Create(sar)`