diff --git a/test/extended/operators/images.go b/test/extended/operators/images.go index f1ab992951fb..06cd76412c8a 100644 --- a/test/extended/operators/images.go +++ b/test/extended/operators/images.go @@ -17,6 +17,11 @@ import ( e2e "k8s.io/kubernetes/test/e2e/framework" ) +const ( + // From https://github.com/eparis/ssh-bastion/blob/master/deploy/namespace.yaml + sshBastionNamespace = "openshift-ssh-bastion" +) + var _ = Describe("[Feature:Platform][Smoke] Managed cluster", func() { oc := exutil.NewCLIWithoutNamespace("operators") @@ -81,12 +86,19 @@ var _ = Describe("[Feature:Platform][Smoke] Managed cluster", func() { // a pod in a namespace that begins with kube-* or openshift-* must come from our release payload // TODO components in openshift-operators may not come from our payload, may want to weaken restriction namespacePrefixes := sets.NewString("kube-", "openshift-") + ignoredNamespaces := sets.NewString() + if bastion := os.Getenv("KUBE_SSH_BASTION"); bastion != "" { + ignoredNamespaces.Insert(sshBastionNamespace) + } for i := range pods.Items { pod := pods.Items[i] for _, prefix := range namespacePrefixes.List() { if !strings.HasPrefix(pod.Namespace, prefix) { continue } + if ignoredNamespaces.Has(pod.Namespace) { + continue + } containersToInspect := []v1.Container{} for j := range pod.Spec.InitContainers { containersToInspect = append(containersToInspect, pod.Spec.InitContainers[j]) diff --git a/test/extended/operators/qos.go b/test/extended/operators/qos.go index e59c0e2e9b10..71ce97ef0a80 100644 --- a/test/extended/operators/qos.go +++ b/test/extended/operators/qos.go @@ -28,7 +28,7 @@ var _ = Describe("[Feature:Platform][Smoke] Managed cluster should", func() { // a pod in a namespace that begins with kube-* or openshift-* must come from our release payload // TODO components in openshift-operators may not come from our payload, may want to weaken restriction namespacePrefixes := sets.NewString("kube-", "openshift-") - excludeNamespaces := sets.NewString("openshift-marketplace", "openshift-operator-lifecycle-manager") + excludeNamespaces := sets.NewString("openshift-marketplace", "openshift-operator-lifecycle-manager", sshBastionNamespace) excludePodPrefix := sets.NewString("revision-pruner-", "installer-") for _, pod := range pods.Items { // exclude non-control plane namespaces diff --git a/test/extended/util/test.go b/test/extended/util/test.go index fe1d22a7afaa..34391b7f134d 100644 --- a/test/extended/util/test.go +++ b/test/extended/util/test.go @@ -382,7 +382,6 @@ var ( `\[Driver: rbd\]`, // https://bugzilla.redhat.com/show_bug.cgi?id=1711599, RBD drivers are not available in controllers? `\[Driver: csi-hostpath`, // https://bugzilla.redhat.com/show_bug.cgi?id=1711607 `should answer endpoint and wildcard queries for the cluster`, // currently not supported by dns operator https://github.com/openshift/cluster-dns-operator/issues/43 - `should propagate mounts to the host`, // requires SSH, https://bugzilla.redhat.com/show_bug.cgi?id=1711600 `should allow ingress access on one named port`, // https://bugzilla.redhat.com/show_bug.cgi?id=1711602 `ClusterDns \[Feature:Example\] should create pod that uses dns`, // https://bugzilla.redhat.com/show_bug.cgi?id=1711601 `should be rejected when no endpoints exist`, // https://bugzilla.redhat.com/show_bug.cgi?id=1711605