update

Author: AlinsRan

test/e2e/api7/route.go

@@ -76,13 +76,9 @@ spec:
 			err := s.CreateResourceFromString(fmt.Sprintf(ar, s.Namespace(), s.Namespace()))
 			Expect(err).NotTo(HaveOccurred(), "creating ApisixRoute")
 
-			By("get yaml from service")
-			serviceYaml, err := s.GetOutputFromStringWithNamespace(framework.Namespace, "svc", framework.DashboardServiceName, "-o", "yaml")
-			Expect(err).NotTo(HaveOccurred(), "getting service yaml")
-			By("update service to type ExternalName with invalid host")
-			var k8sservice corev1.Service
-			err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
-			Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
+			By("update service to invalid host")
+			k8sservice, err := s.GetService(framework.Namespace, framework.DashboardServiceName)
+			Expect(err).NotTo(HaveOccurred(), "getting service")
 			oldSpec := k8sservice.Spec
 			k8sservice.Spec = corev1.ServiceSpec{
 				Type:         corev1.ServiceTypeExternalName,
@@ -116,10 +112,7 @@ spec:
 				)
 
 			By("update service to original spec")
-			serviceYaml, err = s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
-			Expect(err).NotTo(HaveOccurred(), "getting service yaml")
-			err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
-			Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
+			k8sservice, err = s.GetService(framework.Namespace, framework.DashboardServiceName)
 			k8sservice.Spec = oldSpec
 			newServiceYaml, err = yaml.Marshal(k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "marshalling service")

test/e2e/scaffold/k8s.go

@@ -107,10 +107,10 @@ func (s *Scaffold) GetOutputFromStringWithNamespace(ns string, shell ...string)
 	cmdArgs := []string{}
 	cmdArgs = append(cmdArgs, "get")
 	cmdArgs = append(cmdArgs, shell...)
-	var newOpts *k8s.KubectlOptions
-	reflect.Copy(reflect.ValueOf(newOpts), reflect.ValueOf(s.kubectlOptions))
+	var newOpts k8s.KubectlOptions
+	reflect.Copy(reflect.ValueOf(newOpts), reflect.ValueOf(*s.kubectlOptions))
 	newOpts.Namespace = ns
-	output, err := k8s.RunKubectlAndGetOutputE(GinkgoT(), newOpts, cmdArgs...)
+	output, err := k8s.RunKubectlAndGetOutputE(GinkgoT(), &newOpts, cmdArgs...)
 	return output, err
 }
 
@@ -133,6 +133,11 @@ func (s *Scaffold) GetServiceByName(name string) (*corev1.Service, error) {
 	return k8s.GetServiceE(s.t, s.kubectlOptions, name)
 }
 
+func (s *Scaffold) GetService(namespace, name string) (*corev1.Service, error) {
+	kubectlOptions := k8s.NewKubectlOptions("", "", namespace)
+	return k8s.GetServiceE(s.t, kubectlOptions, name)
+}
+
 // ListPodsByLabels lists all pods which matching the label selector.
 func (s *Scaffold) ListPodsByLabels(labels string) ([]corev1.Pod, error) {
 	return k8s.ListPodsE(s.t, s.kubectlOptions, metav1.ListOptions{