Commit 31cf91c

authored

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

Cherry-pick #3722

1 parent 00112a4 commit 31cf91cCopy full SHA for 31cf91c

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func UpgradeNGF(cfg InstallationConfig, extraArgs ...string) ([]byte, error) {`
`134`	`134`	`crdPath := filepath.Join(cfg.ChartPath, "crds") + "/"`
`135`	`135`	`cmd := exec.CommandContext(`
`136`	`136`	`context.Background(),`
`137`		`- "kubectl", "apply", "--server-side", "-f", crdPath,`
	`137`	`+ "kubectl", "apply", "--server-side", "--force-conflicts", "-f", crdPath,`
`138`	`138`	`)`
`139`	`139`	`output, err := cmd.CombinedOutput()`
`140`	`140`	`if err != nil {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func DefaultTimeoutConfig() TimeoutConfig {`
`46`	`46`	`CreateTimeout: 60 * time.Second,`
`47`	`47`	`UpdateTimeout: 60 * time.Second,`
`48`	`48`	`DeleteTimeout: 10 * time.Second,`
`49`		`- DeleteNamespaceTimeout: 90 * time.Second,`
	`49`	`+ DeleteNamespaceTimeout: 150 * time.Second,`
`50`	`50`	`GetTimeout: 10 * time.Second,`
`51`	`51`	`ManifestFetchTimeout: 10 * time.Second,`
`52`	`52`	`RequestTimeout: 10 * time.Second,`

Comments

(0)