Skip to content

OCPBUGS-86763: Wait for namespace initialization before creating pod #31235

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
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
+15 −1
Open

OCPBUGS-86763: Wait for namespace initialization before creating pod #31235

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

g "github.com/onsi/ginkgo/v2"
o "github.com/onsi/gomega"
Expand All @@ -12,6 +13,7 @@ import (
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 @@ -196,7 +198,7 @@ func (h *IRITestHelper) DeleteTestPod(namespace, name string) {
}
}

// CreateSimpleNamespace creates a basic namespace without waiting for service account secrets
// CreateSimpleNamespace creates a basic namespace and waits for SCC annotations
func (h *IRITestHelper) CreateSimpleNamespace() string {
ns := &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -208,6 +210,18 @@ func (h *IRITestHelper) CreateSimpleNamespace() string {
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, 30*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
}

Expand Down