diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_01-marketplace-networkpolicy.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_01-marketplace-networkpolicy.yaml new file mode 100644 index 0000000000..5f6299d63a --- /dev/null +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_01-marketplace-networkpolicy.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: default-deny-all + namespace: openshift-marketplace +spec: + podSelector: {} + policyTypes: + - Ingress + - Egress diff --git a/assets/optional/operator-lifecycle-manager/kustomization.yaml b/assets/optional/operator-lifecycle-manager/kustomization.yaml index 6738615fc6..2f049b8da6 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.yaml @@ -12,6 +12,7 @@ resources: - 0000_50_olm_00-packageserver.pdb.yaml - 0000_50_olm_00-subscriptions.crd.yaml - 0000_50_olm_01-networkpolicies.yaml + - 0000_50_olm_01-marketplace-networkpolicy.yaml - 0000_50_olm_02-olm-operator.serviceaccount.yaml - 0000_50_olm_03-olmconfig.yaml - 0000_50_olm_03-services.yaml diff --git a/scripts/auto-rebase/assets.yaml b/scripts/auto-rebase/assets.yaml index 99b9e56772..bc5a6ffb87 100644 --- a/scripts/auto-rebase/assets.yaml +++ b/scripts/auto-rebase/assets.yaml @@ -251,6 +251,8 @@ assets: - file: 0000_50_olm_00-packageserver.pdb.yaml - file: 0000_50_olm_00-subscriptions.crd.yaml - file: 0000_50_olm_01-networkpolicies.yaml + - file: 0000_50_olm_01-marketplace-networkpolicy.yaml + git_restore: True - file: 0000_50_olm_02-olm-operator.serviceaccount.yaml - file: 0000_50_olm_03-olmconfig.yaml - file: 0000_50_olm_03-services.yaml diff --git a/test/suites/optional/olm.robot b/test/suites/optional/olm.robot index 034a230342..46f52b7d45 100644 --- a/test/suites/optional/olm.robot +++ b/test/suites/optional/olm.robot @@ -128,6 +128,12 @@ OLM Network Policies Are Correctly Configured Verify NetworkPolicy Spec Field olm-operator ${OLM_NAMESPACE} ingress metrics Verify NetworkPolicy Spec Field olm-operator ${OLM_NAMESPACE} egress 53 + # default-deny-all: no ingress/egress rules, applies to all pods in marketplace namespace + Verify NetworkPolicy Has Empty Pod Selector default-deny-all ${MARKETPLACE_NAMESPACE} + Verify NetworkPolicy Policy Types default-deny-all ${MARKETPLACE_NAMESPACE} + Verify NetworkPolicy Spec Field default-deny-all ${MARKETPLACE_NAMESPACE} ingress ${EMPTY} + Verify NetworkPolicy Spec Field default-deny-all ${MARKETPLACE_NAMESPACE} egress ${EMPTY} + # default-allow-all: both Ingress and Egress defined with no port restrictions in openshift-operators Verify NetworkPolicy Has Empty Pod Selector default-allow-all ${OPERATORS_NAMESPACE} Verify NetworkPolicy Policy Types default-allow-all ${OPERATORS_NAMESPACE}