restore Network policy to initial implementation and same with bash for applying it

Author: BraisVQ

create-projects/create-projects.sh

@@ -52,11 +52,9 @@ oc new-project "${PROJECT_ID}-dev"
 oc new-project "${PROJECT_ID}-test"
 
 echo "Applying NetworkPolicy to ${PROJECT_ID}-cd, ${PROJECT_ID}-dev and ${PROJECT_ID}-test"
-oc process -f "${ODS_CORE_DIR}/ocp-config/NetworkPolicy.yml" -p NAMESPACE="${PROJECT_ID}-cd" > "${SCRIPT_DIR}/NetworkPolicy-processed.yml"
-oc apply -f "${SCRIPT_DIR}/NetworkPolicy-processed.yml" -n "${PROJECT_ID}-cd"
-oc apply -f "${SCRIPT_DIR}/NetworkPolicy-processed.yml" -n "${PROJECT_ID}-dev"
-oc apply -f "${SCRIPT_DIR}/NetworkPolicy-processed.yml" -n "${PROJECT_ID}-test"
-rm -f "${SCRIPT_DIR}/NetworkPolicy-processed.yml"
+oc apply -f "${ODS_CORE_DIR}/ocp-config/NetworkPolicy.yml" -n "${PROJECT_ID}-cd"
+oc apply -f "${ODS_CORE_DIR}/ocp-config/NetworkPolicy.yml" -n "${PROJECT_ID}-dev"
+oc apply -f "${ODS_CORE_DIR}/ocp-config/NetworkPolicy.yml" -n "${PROJECT_ID}-test"
 
 echo "Allow serviceaccount 'jenkins' of ${PROJECT_ID}-cd to admin the environment projects"
 oc policy add-role-to-user "${JENKINS_ROLE}" "system:serviceaccount:${PROJECT_ID}-cd:jenkins" -n "${PROJECT_ID}-dev"

ocp-config/NetworkPolicy.yml

@@ -1,24 +1,14 @@
-apiVersion: template.openshift.io/v1
-kind: Template
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
 metadata:
-  name: networkpolicy-template
-parameters:
-  - name: NAMESPACE
-    description: The namespace to allow ingress from
-    required: true
-    value: "default" # Default value for the namespace
-objects:
-  - kind: NetworkPolicy
-    apiVersion: networking.k8s.io/v1
-    metadata:
-      name: only-allow-namespace-ingress
-    spec:
-      podSelector: {}
-      ingress:
-        - from:
-            - namespaceSelector:
-                matchLabels:
-                  name: "${NAMESPACE}" # Parameterized namespace
-            - podSelector: {}
-      policyTypes:
-        - Ingress
+  name: only-allow-namespace-ingress
+spec:
+  podSelector: {}
+  ingress:
+    - from:
+        - podSelector: {}
+        - namespaceSelector:
+            matchLabels:
+              policy-group.network.openshift.io/ingress: ''
+  policyTypes:
+    - Ingress