fix e2e err

kubeovn · Jul 10, 2023 · 4fb7f83 · 4fb7f83
1 parent b8eae39
commit 4fb7f83
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/test/e2e/kube-ovn/pod/pod.go b/test/e2e/kube-ovn/pod/pod.go
@@ -126,24 +126,21 @@ var _ = framework.Describe("[group:pod]", func() {
 		subnet := framework.MakeSubnet(vpcName, "", cidr, "", vpcName, "", nil, nil, []string{namespaceName})
 		_ = subnetClient.CreateSync(subnet)
 
-		ginkgo.By("Creating pod with HTTP liveness and readiness probe that port is accessible " + subnetName)
-
+		ginkgo.By("Creating pod with HTTP liveness and readiness probe that port is accessible " + podName)
 		pod := framework.MakePod(namespaceName, podName, nil, nil, framework.NginxImage, nil, nil)
 		pod.Spec.Containers[0].ReadinessProbe = &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				HTTPGet: &corev1.HTTPGetAction{
 					Port: intstr.FromInt(80),
 				},
 			},
-			InitialDelaySeconds: 15,
 		}
 		pod.Spec.Containers[0].LivenessProbe = &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				HTTPGet: &corev1.HTTPGetAction{
 					Port: intstr.FromInt(80),
 				},
 			},
-			InitialDelaySeconds: 10,
 		}
 
 		pod = podClient.CreateSync(pod)
@@ -152,23 +149,21 @@ var _ = framework.Describe("[group:pod]", func() {
 
 		podClient.DeleteSync(podName)
 
-		ginkgo.By("Creating pod with HTTP liveness and readiness probe that port is not accessible  " + subnetName)
+		ginkgo.By("Creating pod with HTTP liveness and readiness probe that port is not accessible  " + podName)
 		pod = framework.MakePod(namespaceName, podName, nil, nil, framework.NginxImage, nil, nil)
 		pod.Spec.Containers[0].ReadinessProbe = &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				TCPSocket: &corev1.TCPSocketAction{
 					Port: intstr.FromInt(81),
 				},
 			},
-			InitialDelaySeconds: 15,
 		}
 		pod.Spec.Containers[0].LivenessProbe = &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				TCPSocket: &corev1.TCPSocketAction{
 					Port: intstr.FromInt(81),
 				},
 			},
-			InitialDelaySeconds: 10,
 		}
 
 		_ = podClient.Create(pod)
@@ -179,47 +174,43 @@ var _ = framework.Describe("[group:pod]", func() {
 
 		podClient.DeleteSync(podName)
 
-		ginkgo.By("Creating pod with TCP probe liveness and readiness probe that port is accessible " + subnetName)
+		ginkgo.By("Creating pod with TCP probe liveness and readiness probe that port is accessible " + podName)
 		pod = framework.MakePod(namespaceName, podName, nil, nil, framework.NginxImage, nil, nil)
 		pod.Spec.Containers[0].ReadinessProbe = &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				TCPSocket: &corev1.TCPSocketAction{
 					Port: intstr.FromInt(80),
 				},
 			},
-			InitialDelaySeconds: 15,
 		}
 		pod.Spec.Containers[0].LivenessProbe = &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				TCPSocket: &corev1.TCPSocketAction{
 					Port: intstr.FromInt(80),
 				},
 			},
-			InitialDelaySeconds: 10,
 		}
 
 		pod = podClient.CreateSync(pod)
 		framework.ExpectEqual(pod.Status.ContainerStatuses[0].Ready, true)
 
 		podClient.DeleteSync(podName)
 
-		ginkgo.By("Creating pod with TCP probe liveness and readiness probe that port is not accessible  " + subnetName)
+		ginkgo.By("Creating pod with TCP probe liveness and readiness probe that port is not accessible  " + podName)
 		pod = framework.MakePod(namespaceName, podName, nil, nil, framework.NginxImage, nil, nil)
 		pod.Spec.Containers[0].ReadinessProbe = &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				TCPSocket: &corev1.TCPSocketAction{
 					Port: intstr.FromInt(81),
 				},
 			},
-			InitialDelaySeconds: 15,
 		}
 		pod.Spec.Containers[0].LivenessProbe = &corev1.Probe{
 			ProbeHandler: corev1.ProbeHandler{
 				TCPSocket: &corev1.TCPSocketAction{
 					Port: intstr.FromInt(81),
 				},
 			},
-			InitialDelaySeconds: 10,
 		}
 
 		_ = podClient.Create(pod)