Skip to content

OCPBUGS-97603: Use framework-managed namespace for workload test #31366

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

Open
andfasano wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −43
Open

OCPBUGS-97603: Use framework-managed namespace for workload test #31366

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
39 changes: 0 additions & 39 deletions test/extended/internalreleaseimage/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@ import (
"context"
"fmt"
"strings"
"time"

g "github.com/onsi/ginkgo/v2"
o "github.com/onsi/gomega"

corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/apimachinery/pkg/util/wait"
e2e "k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"

Expand Down Expand Up @@ -165,42 +162,6 @@ func (h *IRITestHelper) DeleteTestPod(namespace, name string) {
}
}

// CreateSimpleNamespace creates a basic namespace and waits for SCC annotations
func (h *IRITestHelper) CreateSimpleNamespace() string {
ns := &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: "e2e-test-" + string(uuid.NewUUID()),
},
}

createdNs, err := h.oc.AdminKubeClient().CoreV1().Namespaces().Create(context.Background(), ns, metav1.CreateOptions{})
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to create namespace")
e2e.Logf("Created namespace: %s", createdNs.Name)

// Wait for the namespace controller to set the SCC uid-range annotation,
// which is required by the admission controller before pods can be created.
err = wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, 60*time.Second, true, func(ctx context.Context) (bool, error) {
updatedNs, err := h.oc.AdminKubeClient().CoreV1().Namespaces().Get(ctx, createdNs.Name, metav1.GetOptions{})
if err != nil {
return false, err
}
_, exists := updatedNs.Annotations["openshift.io/sa.scc.uid-range"]
return exists, nil
})
o.Expect(err).NotTo(o.HaveOccurred(), "Timed out waiting for namespace %s to get SCC uid-range annotation", createdNs.Name)

return createdNs.Name
}

// DeleteNamespace deletes a namespace
func (h *IRITestHelper) DeleteNamespace(name string) {
err := h.oc.AdminKubeClient().CoreV1().Namespaces().Delete(context.Background(), name, metav1.DeleteOptions{})
if err != nil && !apierrors.IsNotFound(err) {
e2e.Logf("Warning: failed to delete namespace %s: %v", name, err)
} else {
e2e.Logf("Deleted namespace: %s", name)
}
}

// skipIfNoRegistryFeatureUnsupported skips the test if NoRegistryClusterInstall is not supported
// This checks: platform type (BareMetal/None) and feature gate enablement
Expand Down
7 changes: 3 additions & 4 deletions test/extended/internalreleaseimage/internalreleaseimage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ var _ = g.Describe("[sig-installer][Feature:NoRegistryClusterInstall] InternalRe
var _ = g.Describe("[sig-installer][Feature:NoRegistryClusterInstall] Cluster operates without external registry using managed OCP release bundle images", func() {
defer g.GinkgoRecover()

var oc = exutil.NewCLIWithoutNamespace("no-registry")
var oc = exutil.NewCLI("no-registry")
var helper *IRITestHelper

g.BeforeEach(func() {
Expand All @@ -168,9 +168,8 @@ var _ = g.Describe("[sig-installer][Feature:NoRegistryClusterInstall] Cluster op
// Verify the image repo is present in IDMS (proves it will be pulled from mirror)
g.By("Verifying image repo is present in ImageDigestMirrorSet")
helper.VerifyIDMSConfigured(releaseImage)
g.By("Creating test namespace and pod")
ns := helper.CreateSimpleNamespace()
defer helper.DeleteNamespace(ns)
g.By("Creating test pod in framework-managed namespace")
ns := oc.Namespace()

pod := helper.CreateTestPod(ns, releaseImage)
defer helper.DeleteTestPod(ns, pod.Name)
Expand Down