Skip to content

Commit 1481ecb

Browse files
committed
Move NetworkPolicies into a config component
Follow up to operator-framework#1942 This moves the NetworkPolicies into a component that can be applied as part of an existing overlay, removing them from the base config. This is to fix an issue with downstream that does not understand v1.NetworkPolicies.
1 parent 061da6a commit 1481ecb

File tree

7 files changed

+10
-4
lines changed

7 files changed

+10
-4
lines changed

config/base/catalogd/manager/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
resources:
22
- manager.yaml
33
- service.yaml
4-
- network_policy.yaml
54
- webhook/manifests.yaml
65
apiVersion: kustomize.config.k8s.io/v1beta1
76
kind: Kustomization

config/base/operator-controller/manager/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ kind: Kustomization
44
resources:
55
- manager.yaml
66
- service.yaml
7-
- network_policy.yaml
87

98
images:
109
- name: controller
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1alpha1
2+
kind: Component
3+
namespace: olmv1-system
4+
resources:
5+
- network-policy-catalogd.yaml
6+
- network-policy-operator-controller.yaml

config/base/catalogd/manager/network_policy.yaml renamed to config/components/network-policies/network-policy-catalogd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: networking.k8s.io/v1
22
kind: NetworkPolicy
33
metadata:
4-
name: controller-manager
4+
name: catalogd
55
namespace: system
66
spec:
77
podSelector:

config/base/operator-controller/manager/network_policy.yaml renamed to config/components/network-policies/network-policy-operator-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: networking.k8s.io/v1
22
kind: NetworkPolicy
33
metadata:
4-
name: controller-manager
4+
name: operator-controller
55
namespace: system
66
spec:
77
podSelector:

config/overlays/cert-manager/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ resources:
77
- ../../base/operator-controller
88
- ../../base/common
99
components:
10+
- ../../components/network-policies
1011
- ../../components/tls/catalogd
1112
- ../../components/tls/operator-controller
1213
# ca must be last other components will overwrite the namespaces

config/overlays/e2e/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ resources:
77
- ../../base/operator-controller
88
- ../../base/common
99
components:
10+
- ../../components/network-policies
1011
- ../../components/tls/catalogd
1112
- ../../components/tls/operator-controller
1213
- ../../components/coverage

0 commit comments

Comments
 (0)