Merge pull request kubernetes#95594 from soltysh/fix_e2e

k8s-ci-robot · web-flow · commit 161df49979fd · 2020-10-21T10:28:20.000-07:00
Fix --dry-run invocation in kubectl e2e
diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go
@@ -923,7 +923,7 @@ metadata:
 			if !strings.Contains(podJSON, busyboxImage) {
 				framework.Failf("Failed replacing image from %s to %s in:\n%s\n", httpdImage, busyboxImage, podJSON)
 			}
-			framework.RunKubectlOrDieInput(ns, podJSON, "replace", "-f", "-", "--dry-run", "server")
+			framework.RunKubectlOrDieInput(ns, podJSON, "replace", "-f", "-", "--dry-run=server")
 
 			ginkgo.By("verifying the pod " + podName + " has the right image " + httpdImage)
 			pod, err := c.CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{})

Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,7 @@ metadata:`
`923`	`923`	`if !strings.Contains(podJSON, busyboxImage) {`
`924`	`924`	`framework.Failf("Failed replacing image from %s to %s in:\n%s\n", httpdImage, busyboxImage, podJSON)`
`925`	`925`	`}`
`926`		`- framework.RunKubectlOrDieInput(ns, podJSON, "replace", "-f", "-", "--dry-run", "server")`
	`926`	`+ framework.RunKubectlOrDieInput(ns, podJSON, "replace", "-f", "-", "--dry-run=server")`
`927`	`927`
`928`	`928`	`ginkgo.By("verifying the pod " + podName + " has the right image " + httpdImage)`
`929`	`929`	`pod, err := c.CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{})`