Skip to content

Commit

Permalink
Fix tests for kubernetes 1.27.x (#794)
Browse files Browse the repository at this point in the history
Signed-off-by: Praveen Rewar <[email protected]>
  • Loading branch information
praveenrewar authored and sethiyash committed Aug 14, 2023
1 parent 7c9d899 commit 7bcd4bb
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
26 changes: 25 additions & 1 deletion test/e2e/formatted_error_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,25 @@ kapp: Error: create job/successful-job (batch/v1) namespace: default:
(reason: Invalid)
`)

_, err := kapp.RunWithOpts([]string{"deploy", "-f", "-", "-a", name},
minorVersion, err := getServerMinorVersion()
require.NoErrorf(t, err, "Error getting k8s server minor version")
// batch.kubernetes.io/controller-uid and batch.kubernetes.io/job-name annotaions are added
if minorVersion >= 27 {
expectedErr = strings.TrimSpace(`
kapp: Error: create job/successful-job (batch/v1) namespace: default:
Creating resource job/successful-job (batch/v1) namespace: default:
API server says:
Job.batch "successful-job" is invalid:
- spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{-replaced-, "blah":"balh", -replaced-}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: 'selector' not auto-generated
- spec.template.metadata.labels: Invalid value: map[string]string{-replaced-, -replaced-, -replaced-, "foo":"foo", "job-name":"successful-job", -replaced-, -replaced-}: 'selector' does not match template 'labels'
(reason: Invalid)
`)
}

_, err = kapp.RunWithOpts([]string{"deploy", "-f", "-", "-a", name},
RunOpts{StdinReader: strings.NewReader(yaml1), AllowError: true})

out := strings.ReplaceAll(err.Error(), "`", "'")
Expand All @@ -73,6 +91,12 @@ kapp: Error: create job/successful-job (batch/v1) namespace: default:
replaceUIDs := regexp.MustCompile(`"controller-uid":"[^"]+"`)
out = replaceUIDs.ReplaceAllString(out, "-replaced-")

replaceUIDs = regexp.MustCompile(`"batch\.kubernetes\.io\/controller-uid":"[^"]+"`)
out = replaceUIDs.ReplaceAllString(out, "-replaced-")

replaceUIDs = regexp.MustCompile(`"batch\.kubernetes\.io\/job-name":"[^"]+"`)
out = replaceUIDs.ReplaceAllString(out, "-replaced-")

require.Containsf(t, out, expectedErr, "Expected to see expected err in output, but did not")
})
}
2 changes: 1 addition & 1 deletion test/e2e/ignore_failing_api_services_flag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ metadata:
AllowError: true, IntoNs: true, StdinReader: strings.NewReader(yaml3)})
require.Errorf(t, err, "Expected error when deploying with failing api service")

require.Contains(t, err.Error(), "unable to retrieve the complete list of server APIs: dummykapptest.com/v1: the server is currently unable to handle the request",
require.Contains(t, err.Error(), "unable to retrieve the complete list of server APIs: samplekapptest.com/v1",
"Expected api retrieval error")
})

Expand Down

0 comments on commit 7bcd4bb

Please sign in to comment.