From 169320a826a99e3b49ce7387d715908ca6199ee6 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Fri, 22 Sep 2023 18:32:47 -0700 Subject: [PATCH] Move network init into db not dops --- backend/dops/openshift.deploy.yml | 29 ----------------------------- database/openshift.deploy.yml | 29 ++++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/backend/dops/openshift.deploy.yml b/backend/dops/openshift.deploy.yml index ac9937604..221558b64 100644 --- a/backend/dops/openshift.deploy.yml +++ b/backend/dops/openshift.deploy.yml @@ -122,35 +122,6 @@ parameters: description: Base URL for MOTI Pay required: true objects: - - apiVersion: networking.k8s.io/v1 - kind: NetworkPolicy - metadata: - name: allow-from-openshift-ingress - labels: - template: openshift-test - spec: - podSelector: {} - ingress: - - from: - - namespaceSelector: - matchLabels: - network.openshift.io/policy-group: ingress - policyTypes: - - Ingress - - apiVersion: networking.k8s.io/v1 - kind: NetworkPolicy - metadata: - name: allow-same-namespace - labels: - template: quickstart-network-security-policy - spec: - podSelector: {} - ingress: - - from: - - podSelector: {} - policyTypes: - - Ingress - - apiVersion: v1 kind: ConfigMap metadata: diff --git a/database/openshift.deploy.yml b/database/openshift.deploy.yml index 4fd41e070..6be1f5c11 100644 --- a/database/openshift.deploy.yml +++ b/database/openshift.deploy.yml @@ -93,7 +93,34 @@ parameters: - name: DATABASE_HOST description: Host url/service of database connection required: true -objects: +objects: - apiVersion: networking.k8s.io/v1 + kind: NetworkPolicy + metadata: + name: allow-from-openshift-ingress + labels: + template: openshift-test + spec: + podSelector: {} + ingress: + - from: + - namespaceSelector: + matchLabels: + network.openshift.io/policy-group: ingress + policyTypes: + - Ingress + - apiVersion: networking.k8s.io/v1 + kind: NetworkPolicy + metadata: + name: allow-same-namespace + labels: + template: quickstart-network-security-policy + spec: + podSelector: {} + ingress: + - from: + - podSelector: {} + policyTypes: + - Ingress - kind: PersistentVolumeClaim apiVersion: v1 metadata: