debug2

lunarwhite · Dec 19, 2024 · 8f418f6 · 8f418f6
1 parent 2431c18
commit 8f418f6
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 22 deletions.
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -235,7 +235,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, serviceAccountName),
 				"--", "/bin/sh", "-c", fmt.Sprintf(
@@ -247,13 +247,14 @@ var _ = Describe("Manager", Ordered, func() {
 			By("waiting for the curl-metrics pod to complete.")
 			verifyCurlUp := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get", "pods", "curl-metrics",
-					"-o", "jsonpath={.status.phase}",
+					"-o=yaml",
 					"-n", namespace)
 				output, err := utils.Run(cmd)
+				fmt.Fprintf(GinkgoWriter, "curl-metrics output:\n %s", output)
 				g.Expect(err).NotTo(HaveOccurred())
 				g.Expect(output).To(Equal("Succeeded"), "curl pod in wrong status")
 			}
-			Eventually(verifyCurlUp, 5*time.Minute).Should(Succeed())
+			Eventually(verifyCurlUp, 3*time.Minute).Should(Succeed())
 
 			By("getting the metrics by checking curl-metrics logs")
 			metricsOutput := getMetricsOutput()

diff --git a/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go b/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go
@@ -235,7 +235,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, serviceAccountName),
 				"--", "/bin/sh", "-c", fmt.Sprintf(
@@ -247,13 +247,14 @@ var _ = Describe("Manager", Ordered, func() {
 			By("waiting for the curl-metrics pod to complete.")
 			verifyCurlUp := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get", "pods", "curl-metrics",
-					"-o", "jsonpath={.status.phase}",
+					"-o=yaml",
 					"-n", namespace)
 				output, err := utils.Run(cmd)
+				fmt.Fprintf(GinkgoWriter, "curl-metrics output:\n %s", output)
 				g.Expect(err).NotTo(HaveOccurred())
 				g.Expect(output).To(Equal("Succeeded"), "curl pod in wrong status")
 			}
-			Eventually(verifyCurlUp, 5*time.Minute).Should(Succeed())
+			Eventually(verifyCurlUp, 3*time.Minute).Should(Succeed())
 
 			By("getting the metrics by checking curl-metrics logs")
 			metricsOutput := getMetricsOutput()

diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -235,7 +235,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, serviceAccountName),
 				"--", "/bin/sh", "-c", fmt.Sprintf(
@@ -247,13 +247,14 @@ var _ = Describe("Manager", Ordered, func() {
 			By("waiting for the curl-metrics pod to complete.")
 			verifyCurlUp := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get", "pods", "curl-metrics",
-					"-o", "jsonpath={.status.phase}",
+					"-o=yaml",
 					"-n", namespace)
 				output, err := utils.Run(cmd)
+				fmt.Fprintf(GinkgoWriter, "curl-metrics output:\n %s", output)
 				g.Expect(err).NotTo(HaveOccurred())
 				g.Expect(output).To(Equal("Succeeded"), "curl pod in wrong status")
 			}
-			Eventually(verifyCurlUp, 5*time.Minute).Should(Succeed())
+			Eventually(verifyCurlUp, 3*time.Minute).Should(Succeed())
 
 			By("getting the metrics by checking curl-metrics logs")
 			metricsOutput := getMetricsOutput()

diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go
@@ -396,7 +396,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}` + "`" + `, serviceAccountName),
 				"--", "/bin/sh", "-c", fmt.Sprintf(
@@ -408,13 +408,14 @@ var _ = Describe("Manager", Ordered, func() {
 			By("waiting for the curl-metrics pod to complete.")
 			verifyCurlUp := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get", "pods", "curl-metrics",
-					"-o", "jsonpath={.status.phase}",
+					"-o=yaml",
 					"-n", namespace)
 				output, err := utils.Run(cmd)
+				fmt.Fprintf(GinkgoWriter, "curl-metrics output:\n %s", output)
 				g.Expect(err).NotTo(HaveOccurred())
 				g.Expect(output).To(Equal("Succeeded"), "curl pod in wrong status")
 			}
-			Eventually(verifyCurlUp, 5 * time.Minute).Should(Succeed())
+			Eventually(verifyCurlUp, 3 * time.Minute).Should(Succeed())
 
 			By("getting the metrics by checking curl-metrics logs")
 			metricsOutput := getMetricsOutput()

diff --git a/test/e2e/v4/plugin_cluster_test.go b/test/e2e/v4/plugin_cluster_test.go
@@ -600,7 +600,7 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {
 						}
 					}
 				}],
-				"serviceAccountName": "%s"
+				"serviceAccount": "%s"
 			}
     }`, kbc.Kubectl.ServiceAccount),
 		"--",

diff --git a/testdata/project-v4-multigroup/test/e2e/e2e_test.go b/testdata/project-v4-multigroup/test/e2e/e2e_test.go
@@ -235,7 +235,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, serviceAccountName),
 				"--", "/bin/sh", "-c", fmt.Sprintf(
@@ -247,13 +247,14 @@ var _ = Describe("Manager", Ordered, func() {
 			By("waiting for the curl-metrics pod to complete.")
 			verifyCurlUp := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get", "pods", "curl-metrics",
-					"-o", "jsonpath={.status.phase}",
+					"-o=yaml",
 					"-n", namespace)
 				output, err := utils.Run(cmd)
+				fmt.Fprintf(GinkgoWriter, "curl-metrics output:\n %s", output)
 				g.Expect(err).NotTo(HaveOccurred())
 				g.Expect(output).To(Equal("Succeeded"), "curl pod in wrong status")
 			}
-			Eventually(verifyCurlUp, 5*time.Minute).Should(Succeed())
+			Eventually(verifyCurlUp, 3*time.Minute).Should(Succeed())
 
 			By("getting the metrics by checking curl-metrics logs")
 			metricsOutput := getMetricsOutput()

diff --git a/testdata/project-v4-with-plugins/test/e2e/e2e_test.go b/testdata/project-v4-with-plugins/test/e2e/e2e_test.go
@@ -235,7 +235,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, serviceAccountName),
 				"--", "/bin/sh", "-c", fmt.Sprintf(
@@ -247,13 +247,14 @@ var _ = Describe("Manager", Ordered, func() {
 			By("waiting for the curl-metrics pod to complete.")
 			verifyCurlUp := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get", "pods", "curl-metrics",
-					"-o", "jsonpath={.status.phase}",
+					"-o=yaml",
 					"-n", namespace)
 				output, err := utils.Run(cmd)
+				fmt.Fprintf(GinkgoWriter, "curl-metrics output:\n %s", output)
 				g.Expect(err).NotTo(HaveOccurred())
 				g.Expect(output).To(Equal("Succeeded"), "curl pod in wrong status")
 			}
-			Eventually(verifyCurlUp, 5*time.Minute).Should(Succeed())
+			Eventually(verifyCurlUp, 3*time.Minute).Should(Succeed())
 
 			By("getting the metrics by checking curl-metrics logs")
 			metricsOutput := getMetricsOutput()

diff --git a/testdata/project-v4/test/e2e/e2e_test.go b/testdata/project-v4/test/e2e/e2e_test.go
@@ -235,7 +235,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, serviceAccountName),
 				"--", "/bin/sh", "-c", fmt.Sprintf(
@@ -247,13 +247,14 @@ var _ = Describe("Manager", Ordered, func() {
 			By("waiting for the curl-metrics pod to complete.")
 			verifyCurlUp := func(g Gomega) {
 				cmd := exec.Command("kubectl", "get", "pods", "curl-metrics",
-					"-o", "jsonpath={.status.phase}",
+					"-o=yaml",
 					"-n", namespace)
 				output, err := utils.Run(cmd)
+				fmt.Fprintf(GinkgoWriter, "curl-metrics output:\n %s", output)
 				g.Expect(err).NotTo(HaveOccurred())
 				g.Expect(output).To(Equal("Succeeded"), "curl pod in wrong status")
 			}
-			Eventually(verifyCurlUp, 5*time.Minute).Should(Succeed())
+			Eventually(verifyCurlUp, 3*time.Minute).Should(Succeed())
 
 			By("getting the metrics by checking curl-metrics logs")
 			metricsOutput := getMetricsOutput()
-Original file line number
+Diff line change
@@ Expand Up @@
     						}
     					}
     				}],
-    				"serviceAccountName": "%s"
+    				"serviceAccount": "%s"
     			}
         }`, kbc.Kubectl.ServiceAccount),
     		"--",
@@ Expand Down @@