Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2a82c8e

Browse files
authored
Fix NFR tests (#3722)
NFR tests were having some issues regarding applying the NginxProxy CRD and timing out when deleting the test namespace while cleaning up resources. Fixed the CRD issues by applying with additional flag and increased deletion namespace timeout.
1 parent 1354b1d commit 2a82c8e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎tests/framework/ngf.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func UpgradeNGF(cfg InstallationConfig, extraArgs ...string) ([]byte, error) {
134134
crdPath := filepath.Join(cfg.ChartPath, "crds") + "/"
135135
cmd := exec.CommandContext(
136136
context.Background(),
137-
"kubectl", "apply", "--server-side", "-f", crdPath,
137+
"kubectl", "apply", "--server-side", "--force-conflicts", "-f", crdPath,
138138
)
139139
output, err := cmd.CombinedOutput()
140140
if err != nil {

‎tests/framework/timeout.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func DefaultTimeoutConfig() TimeoutConfig {
4646
CreateTimeout: 60 * time.Second,
4747
UpdateTimeout: 60 * time.Second,
4848
DeleteTimeout: 10 * time.Second,
49-
DeleteNamespaceTimeout: 90 * time.Second,
49+
DeleteNamespaceTimeout: 150 * time.Second,
5050
GetTimeout: 10 * time.Second,
5151
ManifestFetchTimeout: 10 * time.Second,
5252
RequestTimeout: 10 * time.Second,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /