Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1473,14 +1473,15 @@
"originalName": "[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift.",
"labels": {
"Extended": {},
"Lifecycle:informing": {},
"NonHyperShiftHOST": {},
"original-name:[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift.": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "blocking",
"lifecycle": "informing",
"environmentSelector": {
"exclude": "topology==\"External\""
}
Expand Down
25 changes: 16 additions & 9 deletions tests-extension/test/qe/specs/olmv0_microshift.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

g "github.com/onsi/ginkgo/v2"
o "github.com/onsi/gomega"
ote "github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo"
exutil "github.com/openshift/operator-framework-olm/tests-extension/test/qe/util"
"github.com/openshift/operator-framework-olm/tests-extension/test/qe/util/olmv0util"

Expand Down Expand Up @@ -219,7 +220,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 on microshift", g.Label("NonH

})

g.It("PolarionID:83581-[OTP][Skipped:Disconnected]olmv0 networkpolicy on microshift.", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift."), func() {
g.It("PolarionID:83581-[OTP][Skipped:Disconnected]olmv0 networkpolicy on microshift.", ote.Informing(), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift."), func() {

policies := []olmv0util.NpExpecter{
{
Expand All @@ -233,14 +234,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 on microshift", g.Label("NonH
},
ExpectEgress: []olmv0util.EgressRule{
{
Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}},
Ports: []olmv0util.Port{{}},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}},
Expand Down Expand Up @@ -269,14 +273,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 on microshift", g.Label("NonH
},
ExpectEgress: []olmv0util.EgressRule{
{
Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}},
Ports: []olmv0util.Port{{}},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
},
ExpectSelector: map[string]string{"app": "olm-operator"},
Expand Down
121 changes: 80 additions & 41 deletions tests-extension/test/qe/specs/olmv0_networkpolicy.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
},
ExpectEgress: []olmv0util.EgressRule{
{
Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}},
Ports: []olmv0util.Port{{}},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}},
Expand Down Expand Up @@ -88,14 +91,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
},
ExpectEgress: []olmv0util.EgressRule{
{
Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}},
Ports: []olmv0util.Port{{}},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
},
ExpectSelector: map[string]string{"app": "olm-operator"},
Expand All @@ -112,14 +118,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
},
ExpectEgress: []olmv0util.EgressRule{
{
Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}},
Ports: []olmv0util.Port{{}},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
},
ExpectSelector: map[string]string{"app": "package-server-manager"},
Expand All @@ -136,14 +145,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
},
ExpectEgress: []olmv0util.EgressRule{
{
Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}},
Ports: []olmv0util.Port{{}},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}},
Expand Down Expand Up @@ -174,14 +186,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
},
},
{
Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}},
Ports: []olmv0util.Port{{}},
Selectors: nil,
},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
},
ExpectSelector: map[string]string{"app": "olm-collect-profiles"},
Expand Down Expand Up @@ -219,7 +234,16 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
ExpectIngress: nil,
ExpectEgress: []olmv0util.EgressRule{
{
Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}},
Ports: []olmv0util.Port{{}},
Selectors: nil,
},
{
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
},
Expand Down Expand Up @@ -291,12 +315,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
{Ports: []olmv0util.Port{{Port: "metrics", Protocol: "TCP"}}, Selectors: nil},
},
ExpectEgress: []olmv0util.EgressRule{
{Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil},
{Ports: []olmv0util.Port{{}}, Selectors: nil},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
{Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}}, Selectors: nil},
},
Expand All @@ -318,12 +345,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
{Ports: []olmv0util.Port{{Port: "metrics", Protocol: "TCP"}}, Selectors: nil},
},
ExpectEgress: []olmv0util.EgressRule{
{Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil},
{Ports: []olmv0util.Port{{}}, Selectors: nil},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
},
ExpectSelector: map[string]string{"app": "olm-operator"},
Expand All @@ -336,12 +366,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
{Ports: []olmv0util.Port{{Port: 8443, Protocol: "TCP"}}, Selectors: nil},
},
ExpectEgress: []olmv0util.EgressRule{
{Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil},
{Ports: []olmv0util.Port{{}}, Selectors: nil},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
},
ExpectSelector: map[string]string{"app": "package-server-manager"},
Expand All @@ -354,12 +387,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
{Ports: []olmv0util.Port{{Port: 5443, Protocol: "TCP"}}, Selectors: nil},
},
ExpectEgress: []olmv0util.EgressRule{
{Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil},
{Ports: []olmv0util.Port{{}}, Selectors: nil},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
{Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}}, Selectors: nil},
},
Expand All @@ -386,12 +422,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() {
{PodLabels: map[string]string{"app": "catalog-operator"}},
},
},
{Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil},
{Ports: []olmv0util.Port{{}}, Selectors: nil},
{
Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}},
Selectors: []olmv0util.Selector{
{NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}},
Ports: []olmv0util.Port{
{Port: 53, Protocol: "TCP"},
{Port: 53, Protocol: "UDP"},
{Port: 5353, Protocol: "TCP"},
{Port: 5353, Protocol: "UDP"},
},
Selectors: nil,
},
},
ExpectSelector: map[string]string{"app": "olm-collect-profiles"},
Expand Down