dd

camilamacedo86 · camilamacedo86 · commit d59d921aee15 · 2025-06-12T19:24:01.000+01:00
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/manager/manager.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/manager/manager.yaml
@@ -67,7 +67,6 @@ spec:
         name: manager
         ports: []
         securityContext:
-          readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
           capabilities:
             drop:
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml b/docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml
@@ -4197,7 +4197,6 @@ spec:
           capabilities:
             drop:
             - ALL
-          readOnlyRootFilesystem: true
         volumeMounts:
         - mountPath: /tmp/k8s-metrics-server/metrics-certs
           name: metrics-certs
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
@@ -233,13 +233,12 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
-								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/docs/book/src/getting-started/testdata/project/config/manager/manager.yaml b/docs/book/src/getting-started/testdata/project/config/manager/manager.yaml
@@ -67,7 +67,6 @@ spec:
         name: manager
         ports: []
         securityContext:
-          readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
           capabilities:
             drop:
diff --git a/docs/book/src/getting-started/testdata/project/dist/install.yaml b/docs/book/src/getting-started/testdata/project/dist/install.yaml
@@ -453,7 +453,6 @@ spec:
           capabilities:
             drop:
             - ALL
-          readOnlyRootFilesystem: true
         volumeMounts: []
       securityContext:
         runAsNonRoot: true
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
@@ -228,13 +228,12 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
-								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/config/manager/manager.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/manager/manager.yaml
@@ -67,7 +67,6 @@ spec:
         name: manager
         ports: []
         securityContext:
-          readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
           capabilities:
             drop:
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml b/docs/book/src/multiversion-tutorial/testdata/project/dist/install.yaml
@@ -8049,7 +8049,6 @@ spec:
           capabilities:
             drop:
             - ALL
-          readOnlyRootFilesystem: true
         volumeMounts:
         - mountPath: /tmp/k8s-metrics-server/metrics-certs
           name: metrics-certs
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
@@ -233,13 +233,12 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
-								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go
@@ -113,7 +113,6 @@ spec:
         name: manager
         ports: []
         securityContext:
-          readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
           capabilities:
             drop:
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
@@ -391,13 +391,12 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
-								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}` + "`" + `, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/test/e2e/utils/test_context.go b/test/e2e/utils/test_context.go
@@ -368,9 +368,6 @@ func (t *TestContext) UninstallHelmRelease() error {
 
 	if _, err := t.Kubectl.Wait(false, "namespace", ns, "--for=delete", "--timeout=2m"); err != nil {
 		log.Printf("failed to wait for namespace deletion: %s", err)
-		if _, forceErr := t.Kubectl.Wait(false, "namespace", ns, "--grace-period=0", "--force"); forceErr != nil {
-			log.Printf("forced deletion also failed: %s", forceErr)
-		}
 	}
 
 	return nil
diff --git a/test/e2e/v4/plugin_cluster_test.go b/test/e2e/v4/plugin_cluster_test.go
@@ -542,9 +542,9 @@ func getMetricsOutput(kbc *utils.TestContext) string {
 	defer func() {
 		if curlCheckFailed {
 			By("dumping logs from failed curl pod for diagnostics")
-			logs, err := kbc.Kubectl.Logs("curl")
+			logs, errCurl := kbc.Kubectl.Logs("curl")
 			if err != nil {
-				logs = fmt.Sprintf("unable to fetch logs: %v", err)
+				logs = fmt.Sprintf("unable to fetch logs: %v", errCurl)
 			}
 			_, _ = fmt.Fprintf(GinkgoWriter, "\n[DEBUG] curl pod failure logs:\n%s\n", logs)
 		}
@@ -603,7 +603,7 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {
 	//nolint:lll
 	cmdOpts := []string{
 		"run", "curl",
-		"--restart=OnFailure",
+		"--restart=Never",
 		"--namespace", kbc.Kubectl.Namespace,
 		"--image=curlimages/curl:latest",
 		"--overrides",
@@ -622,13 +622,12 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {
 						},
 						"runAsNonRoot": true,
 						"runAsUser": 1000,
-						"readOnlyRootFilesystem": true,
 						"seccompProfile": {
 							"type": "RuntimeDefault"
 						}
 					}
 				}],
-				"serviceAccountName": "%s"
+				"serviceAccount": "%s"
 			}
     }`, token, kbc.TestSuffix, kbc.Kubectl.Namespace, kbc.Kubectl.ServiceAccount),
 	}
diff --git a/testdata/project-v4-multigroup/config/manager/manager.yaml b/testdata/project-v4-multigroup/config/manager/manager.yaml
@@ -72,7 +72,6 @@ spec:
           value: memcached:1.6.26-alpine3.19
         ports: []
         securityContext:
-          readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
           capabilities:
             drop:
diff --git a/testdata/project-v4-multigroup/dist/install.yaml b/testdata/project-v4-multigroup/dist/install.yaml
@@ -2157,7 +2157,6 @@ spec:
           capabilities:
             drop:
             - ALL
-          readOnlyRootFilesystem: true
         volumeMounts:
         - mountPath: /tmp/k8s-webhook-server/serving-certs
           name: webhook-certs
diff --git a/testdata/project-v4-multigroup/test/e2e/e2e_test.go b/testdata/project-v4-multigroup/test/e2e/e2e_test.go
@@ -228,13 +228,12 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
-								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/testdata/project-v4-with-plugins/config/manager/manager.yaml b/testdata/project-v4-with-plugins/config/manager/manager.yaml
@@ -72,7 +72,6 @@ spec:
           value: memcached:1.6.26-alpine3.19
         ports: []
         securityContext:
-          readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
           capabilities:
             drop:
diff --git a/testdata/project-v4-with-plugins/dist/install.yaml b/testdata/project-v4-with-plugins/dist/install.yaml
@@ -850,7 +850,6 @@ spec:
           capabilities:
             drop:
             - ALL
-          readOnlyRootFilesystem: true
         volumeMounts:
         - mountPath: /tmp/k8s-webhook-server/serving-certs
           name: webhook-certs
diff --git a/testdata/project-v4-with-plugins/test/e2e/e2e_test.go b/testdata/project-v4-with-plugins/test/e2e/e2e_test.go
@@ -228,13 +228,12 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
-								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)
diff --git a/testdata/project-v4/config/manager/manager.yaml b/testdata/project-v4/config/manager/manager.yaml
@@ -67,7 +67,6 @@ spec:
         name: manager
         ports: []
         securityContext:
-          readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
           capabilities:
             drop:
diff --git a/testdata/project-v4/dist/install.yaml b/testdata/project-v4/dist/install.yaml
@@ -715,7 +715,6 @@ spec:
           capabilities:
             drop:
             - ALL
-          readOnlyRootFilesystem: true
         volumeMounts:
         - mountPath: /tmp/k8s-webhook-server/serving-certs
           name: webhook-certs
diff --git a/testdata/project-v4/test/e2e/e2e_test.go b/testdata/project-v4/test/e2e/e2e_test.go
@@ -228,13 +228,12 @@ var _ = Describe("Manager", Ordered, func() {
 								},
 								"runAsNonRoot": true,
 								"runAsUser": 1000,
-								"readOnlyRootFilesystem": true,	
 								"seccompProfile": {
 									"type": "RuntimeDefault"
 								}
 							}
 						}],
-						"serviceAccountName": "%s"
+						"serviceAccount": "%s"
 					}
 				}`, token, metricsServiceName, namespace, serviceAccountName))
 			_, err = utils.Run(cmd)

Original file line number	Diff line number	Diff line change
`@@ -233,13 +233,12 @@ var _ = Describe("Manager", Ordered, func() {`
`233`	`233`	`},`
`234`	`234`	`"runAsNonRoot": true,`
`235`	`235`	`"runAsUser": 1000,`
`236`		`- "readOnlyRootFilesystem": true,`
`237`	`236`	`"seccompProfile": {`
`238`	`237`	`"type": "RuntimeDefault"`
`239`	`238`	`}`
`240`	`239`	`}`
`241`	`240`	`}],`
`242`		`- "serviceAccountName": "%s"`
	`241`	`+ "serviceAccount": "%s"`
`243`	`242`	`}`
`244`	`243`	}`, token, metricsServiceName, namespace, serviceAccountName))
`245`	`244`	`_, err = utils.Run(cmd)`
Original file line number	Diff line number	Diff line change
`@@ -228,13 +228,12 @@ var _ = Describe("Manager", Ordered, func() {`
`228`	`228`	`},`
`229`	`229`	`"runAsNonRoot": true,`
`230`	`230`	`"runAsUser": 1000,`
`231`		`- "readOnlyRootFilesystem": true,`
`232`	`231`	`"seccompProfile": {`
`233`	`232`	`"type": "RuntimeDefault"`
`234`	`233`	`}`
`235`	`234`	`}`
`236`	`235`	`}],`
`237`		`- "serviceAccountName": "%s"`
	`236`	`+ "serviceAccount": "%s"`
`238`	`237`	`}`
`239`	`238`	}`, token, metricsServiceName, namespace, serviceAccountName))
`240`	`239`	`_, err = utils.Run(cmd)`
Original file line number	Diff line number	Diff line change
`@@ -391,13 +391,12 @@ var _ = Describe("Manager", Ordered, func() {`
`391`	`391`	`},`
`392`	`392`	`"runAsNonRoot": true,`
`393`	`393`	`"runAsUser": 1000,`
`394`		`- "readOnlyRootFilesystem": true,`
`395`	`394`	`"seccompProfile": {`
`396`	`395`	`"type": "RuntimeDefault"`
`397`	`396`	`}`
`398`	`397`	`}`
`399`	`398`	`}],`
`400`		`- "serviceAccountName": "%s"`
	`399`	`+ "serviceAccount": "%s"`
`401`	`400`	`}`
`402`	`401`	}` + "`" + `, token, metricsServiceName, namespace, serviceAccountName))
`403`	`402`	`_, err = utils.Run(cmd)`
Original file line number	Diff line number	Diff line change
`@@ -368,9 +368,6 @@ func (t *TestContext) UninstallHelmRelease() error {`
`368`	`368`
`369`	`369`	`if _, err := t.Kubectl.Wait(false, "namespace", ns, "--for=delete", "--timeout=2m"); err != nil {`
`370`	`370`	`log.Printf("failed to wait for namespace deletion: %s", err)`
`371`		`- if _, forceErr := t.Kubectl.Wait(false, "namespace", ns, "--grace-period=0", "--force"); forceErr != nil {`
`372`		`- log.Printf("forced deletion also failed: %s", forceErr)`
`373`		`- }`
`374`	`371`	`}`
`375`	`372`
`376`	`373`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -542,9 +542,9 @@ func getMetricsOutput(kbc *utils.TestContext) string {`
`542`	`542`	`defer func() {`
`543`	`543`	`if curlCheckFailed {`
`544`	`544`	`By("dumping logs from failed curl pod for diagnostics")`
`545`		`- logs, err := kbc.Kubectl.Logs("curl")`
	`545`	`+ logs, errCurl := kbc.Kubectl.Logs("curl")`
`546`	`546`	`if err != nil {`
`547`		`- logs = fmt.Sprintf("unable to fetch logs: %v", err)`
	`547`	`+ logs = fmt.Sprintf("unable to fetch logs: %v", errCurl)`
`548`	`548`	`}`
`549`	`549`	`_, _ = fmt.Fprintf(GinkgoWriter, "\n[DEBUG] curl pod failure logs:\n%s\n", logs)`
`550`	`550`	`}`
`@@ -603,7 +603,7 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {`
`603`	`603`	`//nolint:lll`
`604`	`604`	`cmdOpts := []string{`
`605`	`605`	`"run", "curl",`
`606`		`- "--restart=OnFailure",`
	`606`	`+ "--restart=Never",`
`607`	`607`	`"--namespace", kbc.Kubectl.Namespace,`
`608`	`608`	`"--image=curlimages/curl:latest",`
`609`	`609`	`"--overrides",`
`@@ -622,13 +622,12 @@ func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string {`
`622`	`622`	`},`
`623`	`623`	`"runAsNonRoot": true,`
`624`	`624`	`"runAsUser": 1000,`
`625`		`- "readOnlyRootFilesystem": true,`
`626`	`625`	`"seccompProfile": {`
`627`	`626`	`"type": "RuntimeDefault"`
`628`	`627`	`}`
`629`	`628`	`}`
`630`	`629`	`}],`
`631`		`- "serviceAccountName": "%s"`
	`630`	`+ "serviceAccount": "%s"`
`632`	`631`	`}`
`633`	`632`	}`, token, kbc.TestSuffix, kbc.Kubectl.Namespace, kbc.Kubectl.ServiceAccount),
`634`	`633`	`}`