Merge pull request #1031 from perdasilva/fix-networkpolicy-filter-microshift

OCPBUGS-58275: Fix networkpolicy filter for microshift manifests

Author: openshift-merge-bot[bot]

Makefile

@@ -159,7 +159,7 @@ vendor:
 	go mod verify
 
 .PHONY: manifests
-manifests: ## Generate manifests
+manifests: $(HELM) ## Generate manifests
 	OLM_VERSION=$(OLM_VERSION) ./scripts/generate_crds_manifests.sh
 
 .PHONY: generate-manifests

microshift-manifests/0000_50_olm_01-networkpolicies.yaml

@@ -87,3 +87,23 @@ spec:
   policyTypes:
     - Ingress
     - Egress
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: default-allow-all
+  namespace: openshift-operators
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
+    include.release.openshift.io/hypershift: "true"
+spec:
+  podSelector: {}
+  policyTypes:
+    - Ingress
+    - Egress
+  ingress:
+    - {}
+  egress:
+    - {}

scripts/generate_crds_manifests.sh

@@ -663,7 +663,8 @@ filtered_yaml="${ROOT_DIR}/microshift-manifests/0000_50_olm_01-networkpolicies.y
 
 # loop through each NetworkPolicy definition in the input multi-document yaml
 rm -f "${filtered_yaml}"
-doc_count=$(${YQ} r -l "$yaml_file")
+
+doc_count=$(${YQ} r -d'*' -l "$yaml_file" | wc -l)
 for (( i=0; i<doc_count; i++ )); do
     current_doc=$(${YQ} r -d "$i" "$yaml_file")
     resource_name="$(echo "$current_doc" | ${YQ} r - metadata.name)"