diff --git a/staging/src/k8s.io/pod-security-admission/test/fixtures.go b/staging/src/k8s.io/pod-security-admission/test/fixtures.go index 8ba2062fcb5..b8ca07294fb 100644 --- a/staging/src/k8s.io/pod-security-admission/test/fixtures.go +++ b/staging/src/k8s.io/pod-security-admission/test/fixtures.go @@ -170,8 +170,8 @@ func getFixtures(key fixtureKey) (fixtureData, error) { if len(data.expectErrorSubstring) == 0 { data.expectErrorSubstring = key.check } - if len(data.pass) == 0 || len(data.fail) == 0 { - return fixtureData{}, fmt.Errorf("generatePass/generateFail for %#v must return at least one pod each", key) + if len(data.fail) == 0 { + return fixtureData{}, fmt.Errorf("generateFail for %#v must return at least one pod", key) } return data, nil } diff --git a/staging/src/k8s.io/pod-security-admission/test/fixtures_allowPrivilegeEscalation.go b/staging/src/k8s.io/pod-security-admission/test/fixtures_allowPrivilegeEscalation.go index 7d2a0670b54..3cc691dfcdb 100644 --- a/staging/src/k8s.io/pod-security-admission/test/fixtures_allowPrivilegeEscalation.go +++ b/staging/src/k8s.io/pod-security-admission/test/fixtures_allowPrivilegeEscalation.go @@ -34,10 +34,8 @@ containerFields: []string{ func init() { fixtureData_1_8 := fixtureGenerator{ generatePass: func(p *corev1.Pod) []*corev1.Pod { - return []*corev1.Pod{ - // only valid pod is to explicitly set allowPrivilegeEscalation to false in all containers - p, - } + // minimal valid pod already captures all valid combinations + return nil }, generateFail: func(p *corev1.Pod) []*corev1.Pod { return []*corev1.Pod{ diff --git a/staging/src/k8s.io/pod-security-admission/test/fixtures_hostNamespaces.go b/staging/src/k8s.io/pod-security-admission/test/fixtures_hostNamespaces.go index a11fdffd11e..0ceb27a2ea8 100644 --- a/staging/src/k8s.io/pod-security-admission/test/fixtures_hostNamespaces.go +++ b/staging/src/k8s.io/pod-security-admission/test/fixtures_hostNamespaces.go @@ -30,7 +30,8 @@ func init() { fixtureData_1_0 := fixtureGenerator{ expectErrorSubstring: "host namespaces", generatePass: func(p *corev1.Pod) []*corev1.Pod { - return []*corev1.Pod{p} // minimal valid pod + // minimal valid pod already captures all valid combinations + return nil }, generateFail: func(p *corev1.Pod) []*corev1.Pod { return []*corev1.Pod{ diff --git a/staging/src/k8s.io/pod-security-admission/test/fixtures_hostPath.go b/staging/src/k8s.io/pod-security-admission/test/fixtures_hostPath.go index 90db528ac45..ef8d0e6fe03 100644 --- a/staging/src/k8s.io/pod-security-admission/test/fixtures_hostPath.go +++ b/staging/src/k8s.io/pod-security-admission/test/fixtures_hostPath.go @@ -30,7 +30,8 @@ func init() { fixtureData_1_0 := fixtureGenerator{ expectErrorSubstring: "hostPath volumes", generatePass: func(p *corev1.Pod) []*corev1.Pod { - return []*corev1.Pod{p} // minimal valid pod + // minimal valid pod already captures all valid combinations + return nil }, generateFail: func(p *corev1.Pod) []*corev1.Pod { return []*corev1.Pod{ diff --git a/staging/src/k8s.io/pod-security-admission/test/fixtures_hostProcess.go b/staging/src/k8s.io/pod-security-admission/test/fixtures_hostProcess.go index 6f004a33c7c..95066537d7b 100644 --- a/staging/src/k8s.io/pod-security-admission/test/fixtures_hostProcess.go +++ b/staging/src/k8s.io/pod-security-admission/test/fixtures_hostProcess.go @@ -39,7 +39,8 @@ func init() { fixtureData_1_0 := fixtureGenerator{ generatePass: func(p *corev1.Pod) []*corev1.Pod { - return []*corev1.Pod{p} + // minimal valid pod already captures all valid combinations + return nil }, failRequiresFeatures: []featuregate.Feature{"WindowsHostProcessContainers"}, generateFail: func(p *corev1.Pod) []*corev1.Pod {