Skip to content

UPSTREAM: 106454: test/e2e: fix e2e tests for restricted policy #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 21, 2022
Merged

UPSTREAM: 106454: test/e2e: fix e2e tests for restricted policy #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/e2e/apimachinery/resource_quota.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,7 @@ var _ = SIGDescribe("ResourceQuota", func() {

var _ = SIGDescribe("ResourceQuota [Feature:ScopeSelectors]", func() {
f := framework.NewDefaultFramework("scope-selectors")
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline
ginkgo.It("should verify ResourceQuota with best effort scope using scope-selectors.", func() {
ginkgo.By("Creating a ResourceQuota with best effort scope")
resourceQuotaBestEffort, err := createResourceQuota(f.ClientSet, f.Namespace.Name, newTestResourceQuotaWithScopeSelector("quota-besteffort", v1.ResourceQuotaScopeBestEffort))
Expand Down Expand Up @@ -1097,6 +1098,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:ScopeSelectors]", func() {

var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
f := framework.NewDefaultFramework("resourcequota-priorityclass")
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline

ginkgo.It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with same priority class.", func() {

Expand Down
2 changes: 2 additions & 0 deletions test/e2e/auth/node_authn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/cluster/ports"
"k8s.io/kubernetes/test/e2e/framework"
admissionapi "k8s.io/pod-security-admission/api"

"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
Expand All @@ -36,6 +37,7 @@ import (
var _ = SIGDescribe("[Feature:NodeAuthenticator]", func() {

f := framework.NewDefaultFramework("node-authn")
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline
var ns string
var nodeIPs []string
ginkgo.BeforeEach(func() {
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/auth/node_authz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/test/e2e/framework"
imageutils "k8s.io/kubernetes/test/utils/image"
admissionapi "k8s.io/pod-security-admission/api"

"github.com/onsi/ginkgo"
)
Expand All @@ -41,6 +42,7 @@ const (
var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() {

f := framework.NewDefaultFramework("node-authz")
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline
Copy link

@deads2k deads2k Mar 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can't be right. upstream would have hit this.

Copy link
Author

@s-urbaniak s-urbaniak Mar 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, as discussed OOB let me recheck why this passes on upstream

Copy link
Author

@s-urbaniak s-urbaniak Mar 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rechecked, indeed the node authorizer check is skipped upstream, at least in kubernetes#106454.

// client that will impersonate a node
var c clientset.Interface
var ns string
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/autoscaling/horizontal_pod_autoscaling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package autoscaling

import (
"k8s.io/pod-security-admission/api"
"time"

"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -30,6 +31,7 @@ import (
//
var _ = SIGDescribe("[Feature:HPA] Horizontal pod autoscaling (scale resource: CPU)", func() {
f := framework.NewDefaultFramework("horizontal-pod-autoscaling")
f.NamespacePodSecurityEnforceLevel = api.LevelBaseline

titleUp := "Should scale from 1 pod to 3 pods and from 3 to 5"
titleDown := "Should scale from 5 pods to 3 pods and from 3 to 1"
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/node/examples.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
e2eauth "k8s.io/kubernetes/test/e2e/framework/auth"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles"
admissionapi "k8s.io/pod-security-admission/api"

"github.com/onsi/ginkgo"
)
Expand All @@ -44,6 +45,7 @@ const (

var _ = SIGDescribe("[Feature:Example]", func() {
f := framework.NewDefaultFramework("examples")
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline

var c clientset.Interface
var ns string
Expand Down