(Cherry-pick) Fix NFR tests (#3722) (#3723)

Cherry-pick #3722

Author: bjee19

tests/framework/ngf.go

@@ -134,7 +134,7 @@ func UpgradeNGF(cfg InstallationConfig, extraArgs ...string) ([]byte, error) {
 	crdPath := filepath.Join(cfg.ChartPath, "crds") + "/"
 	cmd := exec.CommandContext(
 		context.Background(),
-		"kubectl", "apply", "--server-side", "-f", crdPath,
+		"kubectl", "apply", "--server-side", "--force-conflicts", "-f", crdPath,
 	)
 	output, err := cmd.CombinedOutput()
 	if err != nil {

tests/framework/timeout.go

@@ -46,7 +46,7 @@ func DefaultTimeoutConfig() TimeoutConfig {
 		CreateTimeout:           60 * time.Second,
 		UpdateTimeout:           60 * time.Second,
 		DeleteTimeout:           10 * time.Second,
-		DeleteNamespaceTimeout:  90 * time.Second,
+		DeleteNamespaceTimeout:  150 * time.Second,
 		GetTimeout:              10 * time.Second,
 		ManifestFetchTimeout:    10 * time.Second,
 		RequestTimeout:          10 * time.Second,