Merge pull request #4868 from camilamacedo86/fix-sa

🐛 (go/v4): e2e tests SA spec name is not accurate to inform the SA

Author: k8s-ci-robot

docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go

@@ -238,7 +238,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)

docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go

@@ -233,7 +233,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)

docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go

@@ -238,7 +238,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)

pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go

@@ -396,7 +396,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}` + "`" + `, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)

test/e2e/v4/plugin_cluster_test.go

@@ -560,15 +560,25 @@ func metricsShouldBeUnavailable(kbc *utils.TestContext) {
 
 	By("validating that the curl pod fail as expected")
 	verifyCurlUp := func(g Gomega) {
-		status, err := kbc.Kubectl.Get(
+		status, errCurl := kbc.Kubectl.Get(
 			true,
 			"pods", "curl", "-o", "jsonpath={.status.phase}")
-		g.Expect(err).NotTo(HaveOccurred())
+		g.Expect(errCurl).NotTo(HaveOccurred())
 		g.Expect(status).NotTo(Equal("Failed"),
 			fmt.Sprintf("curl pod in %s status when should fail with an error", status))
 	}
 	Eventually(verifyCurlUp, 240*time.Second, time.Second).Should(Succeed())
 
+	By("validating that the correct ServiceAccount is being used")
+	saName := kbc.Kubectl.ServiceAccount
+	currentSAOutput, err := kbc.Kubectl.Get(
+		true,
+		"serviceaccount", saName,
+		"-o", "jsonpath={.metadata.name}",
+	)
+	Expect(err).NotTo(HaveOccurred(), "Failed to fetch the service account")
+	Expect(currentSAOutput).To(Equal(saName), "The ServiceAccount in use does not match the expected one")
+
 	By("validating that the metrics endpoint is not working as expected")
 	getCurlLogs := func(g Gomega) {
 		metricsOutput, err := kbc.Kubectl.Logs("curl")
@@ -607,7 +617,7 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {
 						}
 					}
 				}],
-				"serviceAccount": "%s"
+				"serviceAccountName": "%s"
 			}
     }`, token, kbc.TestSuffix, kbc.Kubectl.Namespace, kbc.Kubectl.ServiceAccount),
 	}

testdata/project-v4-multigroup/test/e2e/e2e_test.go

@@ -233,7 +233,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)

testdata/project-v4-with-plugins/test/e2e/e2e_test.go

@@ -233,7 +233,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)

testdata/project-v4/test/e2e/e2e_test.go

@@ -233,7 +233,7 @@ var _ = Describe("Manager", Ordered, func() {
 								}
 							}
 						}],
-						"serviceAccount": "%s"
+						"serviceAccountName": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)