Skip to content

WIP: OCPBUGS-71206: Conformance suite fixes for OIDC clusters #30669

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

Draft
liouk wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: OCPBUGS-71206: Conformance suite fixes for OIDC clusters #30669

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
26 changes: 17 additions & 9 deletions test/extended/apiserver/security_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,18 @@ import (
e2e "k8s.io/kubernetes/test/e2e/framework"
admissionapi "k8s.io/pod-security-admission/api"

configv1 "github.com/openshift/api/config/v1"
exutil "github.com/openshift/origin/test/extended/util"
)

type itemUnderTest struct {
namespace string
containerName string
expectedHostPath string
expectHostNetwork bool
requireHostPathMount bool
}

var _ = g.Describe("[sig-auth][Feature:ControlPlaneSecurity]", func() {
defer g.GinkgoRecover()
ctx := context.Background()
Expand All @@ -40,13 +49,7 @@ var _ = g.Describe("[sig-auth][Feature:ControlPlaneSecurity]", func() {
g.Skip("Hypershift control plane pods are not accessible from hosted cluster")
}

checkItems := []struct {
namespace string
containerName string
expectedHostPath string
expectHostNetwork bool
requireHostPathMount bool
}{
checkItems := []itemUnderTest{
{
namespace: "openshift-kube-apiserver",
containerName: "kube-apiserver",
Expand All @@ -61,13 +64,18 @@ var _ = g.Describe("[sig-auth][Feature:ControlPlaneSecurity]", func() {
expectHostNetwork: false,
requireHostPathMount: false,
},
{
}

authn, err := oc.AdminConfigClient().ConfigV1().Authentications().Get(ctx, "cluster", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
if len(authn.Spec.Type) == 0 || authn.Spec.Type == configv1.AuthenticationTypeIntegratedOAuth {
checkItems = append(checkItems, itemUnderTest{
namespace: "openshift-oauth-apiserver",
containerName: "oauth-apiserver",
expectedHostPath: "",
expectHostNetwork: false,
requireHostPathMount: false,
},
})
}

for _, checkItem := range checkItems {
Expand Down