Skip to content

Commit 134e169

Browse files
committed
Adjust reconfig results template and delete namespaces
1 parent 77cc3da commit 134e169

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

tests/framework/resourcemanager.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,14 @@ func (rm *ResourceManager) DeleteNamespaces(names []string) error {
227227
defer cancel()
228228

229229
var combinedErrors error
230-
ns := &core.Namespace{}
231230
for _, name := range names {
232-
if err := rm.K8sClient.Get(ctx, types.NamespacedName{Name: name}, ns); err != nil {
231+
ns := &core.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
232+
233+
if err := rm.K8sClient.Delete(ctx, ns); err != nil {
233234
if apierrors.IsNotFound(err) {
234235
continue
235236
}
236-
combinedErrors = errors.Join(combinedErrors, fmt.Errorf("error getting namespace: %w", err))
237-
}
238237

239-
if err := rm.K8sClient.Delete(ctx, ns); err != nil {
240238
combinedErrors = errors.Join(combinedErrors, fmt.Errorf("error deleting namespace: %w", err))
241239
}
242240
}

tests/suite/reconfig_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ Time To Ready Description: {{ .TimeToReadyDescription }}
486486
{{- end }}
487487
488488
### NGINX Error Logs
489-
{{ .NGINXErrorLogs }}
489+
{{ .NGINXErrorLogs -}}
490490
`
491491

492492
func writeReconfigResults(dest io.Writer, results reconfigTestResults) error {

0 commit comments

Comments
 (0)