Skip to content

Commit 4814559

Browse files
committed
OCPBUGS-59570, OCPBUGS-59566: Move Network Policy manifests
The manifests are in the wrong place currently. This repository has static manifests that get copied to the container image during build time, from a static location (the `/manifests` folder). Moving over the NetworkPolicy manifests to the right location so that they're actually applied on cluster. Also include neccessary annotations that were missing previously, without which the CVO won't apply the manifests: ``` annotations: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" capability.openshift.io/name: "marketplace" ``` Signed-off-by: Anik Bhattacharjee <[email protected]>
1 parent 68194dd commit 4814559

File tree

5 files changed

+23
-16
lines changed

5 files changed

+23
-16
lines changed

config/networkpolicy/default-deny.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

config/networkpolicy/kustomization.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: networking.k8s.io/v1
2+
kind: NetworkPolicy
3+
metadata:
4+
name: default-deny-all
5+
namespace: openshift-marketplace
6+
annotations:
7+
include.release.openshift.io/self-managed-high-availability: "true"
8+
include.release.openshift.io/single-node-developer: "true"
9+
capability.openshift.io/name: "marketplace"
10+
spec:
11+
podSelector: {}
12+
policyTypes:
13+
- Ingress
14+
- Egress
15+

config/networkpolicy/marketplace-operator.yaml renamed to manifests/14_networkpolicy_marketplace-operator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ kind: NetworkPolicy
33
metadata:
44
name: marketplace-operator
55
namespace: openshift-marketplace
6+
annotations:
7+
include.release.openshift.io/self-managed-high-availability: "true"
8+
include.release.openshift.io/single-node-developer: "true"
9+
capability.openshift.io/name: "marketplace"
610
spec:
711
podSelector:
812
matchLabels:

config/networkpolicy/unpack-bundles.yaml renamed to manifests/15_networkpolicy_unpack-bundles.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ kind: NetworkPolicy
33
metadata:
44
name: unpack-bundles
55
namespace: openshift-marketplace
6+
annotations:
7+
include.release.openshift.io/self-managed-high-availability: "true"
8+
include.release.openshift.io/single-node-developer: "true"
9+
capability.openshift.io/name: "marketplace"
610
spec:
711
podSelector:
812
matchExpressions:

0 commit comments

Comments
 (0)