Move network init into db not dops

bcgov · Sep 28, 2023 · 169320a · 169320a
1 parent c2dd6af
commit 169320a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 30 deletions.
diff --git 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
@@ -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: