From 8c25fbd0ac8d43b16470a1910d29dd55b833ec08 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 6 May 2025 12:40:29 -0400 Subject: [PATCH] Move NetworkPolicies into a subdirectory Follow up to #1942 This moves the NetworkPolicies into a subdirectory from the manager config. It allows downstream to pick-and-choose what to pull in. Signed-off-by: Todd Short --- config/base/catalogd/kustomization.yaml | 1 + config/base/catalogd/manager/kustomization.yaml | 1 - config/base/catalogd/net/kustomization.yaml | 6 ++++++ config/base/catalogd/{manager => net}/network_policy.yaml | 0 config/base/operator-controller/kustomization.yaml | 2 +- config/base/operator-controller/manager/kustomization.yaml | 1 - config/base/operator-controller/net/kustomization.yaml | 6 ++++++ .../{manager => net}/network_policy.yaml | 0 8 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 config/base/catalogd/net/kustomization.yaml rename config/base/catalogd/{manager => net}/network_policy.yaml (100%) create mode 100644 config/base/operator-controller/net/kustomization.yaml rename config/base/operator-controller/{manager => net}/network_policy.yaml (100%) diff --git a/config/base/catalogd/kustomization.yaml b/config/base/catalogd/kustomization.yaml index 9a6bc2512..eaa98b225 100644 --- a/config/base/catalogd/kustomization.yaml +++ b/config/base/catalogd/kustomization.yaml @@ -6,3 +6,4 @@ resources: - crd - rbac - manager +- net diff --git a/config/base/catalogd/manager/kustomization.yaml b/config/base/catalogd/manager/kustomization.yaml index 2c10750df..16d32ea03 100644 --- a/config/base/catalogd/manager/kustomization.yaml +++ b/config/base/catalogd/manager/kustomization.yaml @@ -1,7 +1,6 @@ resources: - manager.yaml - service.yaml -- network_policy.yaml - webhook/manifests.yaml apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/config/base/catalogd/net/kustomization.yaml b/config/base/catalogd/net/kustomization.yaml new file mode 100644 index 000000000..473118f48 --- /dev/null +++ b/config/base/catalogd/net/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: olmv1-system +# adding namePrefix will double the prefix +resources: +- network_policy.yaml diff --git a/config/base/catalogd/manager/network_policy.yaml b/config/base/catalogd/net/network_policy.yaml similarity index 100% rename from config/base/catalogd/manager/network_policy.yaml rename to config/base/catalogd/net/network_policy.yaml diff --git a/config/base/operator-controller/kustomization.yaml b/config/base/operator-controller/kustomization.yaml index 1d63fb17f..40c2afa53 100644 --- a/config/base/operator-controller/kustomization.yaml +++ b/config/base/operator-controller/kustomization.yaml @@ -6,4 +6,4 @@ resources: - crd - rbac - manager - +- net diff --git a/config/base/operator-controller/manager/kustomization.yaml b/config/base/operator-controller/manager/kustomization.yaml index 259f17c9e..c4dc2112c 100644 --- a/config/base/operator-controller/manager/kustomization.yaml +++ b/config/base/operator-controller/manager/kustomization.yaml @@ -4,7 +4,6 @@ kind: Kustomization resources: - manager.yaml - service.yaml -- network_policy.yaml images: - name: controller diff --git a/config/base/operator-controller/net/kustomization.yaml b/config/base/operator-controller/net/kustomization.yaml new file mode 100644 index 000000000..473118f48 --- /dev/null +++ b/config/base/operator-controller/net/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: olmv1-system +# adding namePrefix will double the prefix +resources: +- network_policy.yaml diff --git a/config/base/operator-controller/manager/network_policy.yaml b/config/base/operator-controller/net/network_policy.yaml similarity index 100% rename from config/base/operator-controller/manager/network_policy.yaml rename to config/base/operator-controller/net/network_policy.yaml