Merge pull request #5437 from camilamacedo86/fix-race

🐛 fix(go/v4): Add retry to flaky metrics E2E test

Author: k8s-ci-robot

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

@@ -241,7 +241,9 @@ var _ = Describe("Manager", Ordered, func() {
 							"name": "curl",
 							"image": "curlimages/curl:latest",
 							"command": ["/bin/sh", "-c"],
-							"args": ["curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics"],
+							"args": [
+								"for i in $(seq 1 30); do curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics && exit 0 || sleep 2; done; exit 1"
+							],
 							"securityContext": {
 								"readOnlyRootFilesystem": true,
 								"allowPrivilegeEscalation": false,

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

@@ -225,7 +225,9 @@ var _ = Describe("Manager", Ordered, func() {
 							"name": "curl",
 							"image": "curlimages/curl:latest",
 							"command": ["/bin/sh", "-c"],
-							"args": ["curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics"],
+							"args": [
+								"for i in $(seq 1 30); do curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics && exit 0 || sleep 2; done; exit 1"
+							],
 							"securityContext": {
 								"readOnlyRootFilesystem": true,
 								"allowPrivilegeEscalation": false,

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

@@ -248,7 +248,9 @@ var _ = Describe("Manager", Ordered, func() {
 							"name": "curl",
 							"image": "curlimages/curl:latest",
 							"command": ["/bin/sh", "-c"],
-							"args": ["curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics"],
+							"args": [
+								"for i in $(seq 1 30); do curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics && exit 0 || sleep 2; done; exit 1"
+							],
 							"securityContext": {
 								"readOnlyRootFilesystem": true,
 								"allowPrivilegeEscalation": false,

go.sum

@@ -443,7 +443,12 @@ var _ = Describe("Manager", Ordered, func() {
 							"name": "curl",
 							"image": "curlimages/curl:latest",
 							"command": ["/bin/sh", "-c"],
-							"args": ["curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics"],
+							"args": [
+								"for i in $(seq 1 30); do ` +
+	`curl -v -k -H 'Authorization: Bearer %s' ` +
+	`https://%s.%s.svc.cluster.local:8443/metrics ` +
+	`&& exit 0 || sleep 2; done; exit 1"
+							],
 							"securityContext": {
 								"readOnlyRootFilesystem": true,
 								"allowPrivilegeEscalation": false,

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

@@ -241,7 +241,6 @@ func ValidateMetricsUnavailable(namePrefix string, kbc *utils.TestContext) {
 }
 
 func cmdOptsToCreateCurlPod(namePrefix string, kbc *utils.TestContext, token string) []string {
-	//nolint:lll
 	cmdOpts := []string{
 		"run", "curl",
 		"--restart=Never",
@@ -254,7 +253,12 @@ func cmdOptsToCreateCurlPod(namePrefix string, kbc *utils.TestContext, token str
 					"name": "curl",
 					"image": "curlimages/curl:latest",
 					"command": ["/bin/sh", "-c"],
-					"args": ["curl -v -k -H 'Authorization: Bearer %s' https://%s-controller-manager-metrics-service.%s.svc.cluster.local:8443/metrics"],
+					"args": [
+						"for i in $(seq 1 30); do `+
+			`curl -v -k -H 'Authorization: Bearer %s' `+
+			`https://%s-controller-manager-metrics-service.%s.svc.cluster.local:8443/metrics `+
+			`&& exit 0 || sleep 2; done; exit 1"
+					],
 					"securityContext": {
 						"readOnlyRootFilesystem": true,
 						"allowPrivilegeEscalation": false,

test/e2e/helpers/plugin_test_metrics.go

@@ -236,7 +236,9 @@ var _ = Describe("Manager", Ordered, func() {
 							"name": "curl",
 							"image": "curlimages/curl:latest",
 							"command": ["/bin/sh", "-c"],
-							"args": ["curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics"],
+							"args": [
+								"for i in $(seq 1 30); do curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics && exit 0 || sleep 2; done; exit 1"
+							],
 							"securityContext": {
 								"readOnlyRootFilesystem": true,
 								"allowPrivilegeEscalation": false,

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

@@ -236,7 +236,9 @@ var _ = Describe("Manager", Ordered, func() {
 							"name": "curl",
 							"image": "curlimages/curl:latest",
 							"command": ["/bin/sh", "-c"],
-							"args": ["curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics"],
+							"args": [
+								"for i in $(seq 1 30); do curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics && exit 0 || sleep 2; done; exit 1"
+							],
 							"securityContext": {
 								"readOnlyRootFilesystem": true,
 								"allowPrivilegeEscalation": false,

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

@@ -236,7 +236,9 @@ var _ = Describe("Manager", Ordered, func() {
 							"name": "curl",
 							"image": "curlimages/curl:latest",
 							"command": ["/bin/sh", "-c"],
-							"args": ["curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics"],
+							"args": [
+								"for i in $(seq 1 30); do curl -v -k -H 'Authorization: Bearer %s' https://%s.%s.svc.cluster.local:8443/metrics && exit 0 || sleep 2; done; exit 1"
+							],
 							"securityContext": {
 								"readOnlyRootFilesystem": true,
 								"allowPrivilegeEscalation": false,