Merge pull request #1058 from openshift-cherrypick-robot/cherry-pick-1048-to-release-4.17

openshift-merge-bot[bot] · web-flow · commit 062eb821df5c · 2025-08-25T13:51:13.000Z
[release-4.17] OCPBUGS-60791: Add NetworkPolicy as a supported kind
diff --git a/manifests/0000_50_olm_01-networkpolicies.yaml b/manifests/0000_50_olm_01-networkpolicies.yaml
@@ -0,0 +1,19 @@
+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:
+    - {}
diff --git a/microshift-manifests/0000_50_olm_01-networkpolicies.yaml b/microshift-manifests/0000_50_olm_01-networkpolicies.yaml
@@ -0,0 +1,19 @@
+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:
+    - {}
diff --git a/microshift-manifests/kustomization.yaml b/microshift-manifests/kustomization.yaml
@@ -14,6 +14,7 @@ resources:
   - 0000_50_olm_00-pprof-rbac.yaml
   - 0000_50_olm_00-pprof-secret.yaml
   - 0000_50_olm_00-subscriptions.crd.yaml
+  - 0000_50_olm_01-networkpolicies.yaml
   - 0000_50_olm_01-olm-operator.serviceaccount.yaml
   - 0000_50_olm_02-olmconfig.yaml
   - 0000_50_olm_02-services.yaml
diff --git a/staging/operator-lifecycle-manager/deploy/chart/templates/0000_50_olm_01-networkpolicies.yaml b/staging/operator-lifecycle-manager/deploy/chart/templates/0000_50_olm_01-networkpolicies.yaml
@@ -0,0 +1,14 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: default-allow-all
+  namespace: {{ .Values.operator_namespace }}
+spec:
+  podSelector: {}
+  policyTypes:
+  - Ingress
+  - Egress
+  ingress:
+  - {}
+  egress:
+  - {}
diff --git a/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/supportedresources.go b/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/supportedresources.go
@@ -10,6 +10,7 @@ const (
 	ConsoleQuickStartKind     = "ConsoleQuickStart"
 	ConsoleCLIDownloadKind    = "ConsoleCLIDownload"
 	ConsoleLinkKind           = "ConsoleLink"
+	NetworkPolicyKind         = "NetworkPolicy"
 )
 
 var supportedKinds = map[string]struct{}{
@@ -22,6 +23,7 @@ var supportedKinds = map[string]struct{}{
 	ConsoleQuickStartKind:     {},
 	ConsoleCLIDownloadKind:    {},
 	ConsoleLinkKind:           {},
+	NetworkPolicyKind:         {},
 }
 
 // isSupported returns true if OLM supports this type of CustomResource.
diff --git a/staging/operator-registry/pkg/lib/bundle/supported_resources.go b/staging/operator-registry/pkg/lib/bundle/supported_resources.go
@@ -20,6 +20,7 @@ const (
 	ConsoleQuickStartKind     = "ConsoleQuickStart"
 	ConsoleCLIDownloadKind    = "ConsoleCLIDownload"
 	ConsoleLinkKind           = "ConsoleLink"
+	NetworkPolicyKind         = "NetworkPolicy"
 )
 
 // Namespaced indicates whether the resource is namespace scoped (true) or cluster-scoped (false).
@@ -47,6 +48,7 @@ var supportedResources = map[string]Namespaced{
 	ConsoleQuickStartKind:     false,
 	ConsoleCLIDownloadKind:    false,
 	ConsoleLinkKind:           false,
+	NetworkPolicyKind:         true,
 }
 
 // IsSupported checks if the object kind is OLM-supported and if it is namespaced
diff --git a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/supportedresources.go b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/supportedresources.go
diff --git a/vendor/github.com/operator-framework/operator-registry/pkg/lib/bundle/supported_resources.go b/vendor/github.com/operator-framework/operator-registry/pkg/lib/bundle/supported_resources.go

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ const (`
`10`	`10`	`ConsoleQuickStartKind = "ConsoleQuickStart"`
`11`	`11`	`ConsoleCLIDownloadKind = "ConsoleCLIDownload"`
`12`	`12`	`ConsoleLinkKind = "ConsoleLink"`
	`13`	`+ NetworkPolicyKind = "NetworkPolicy"`
`13`	`14`	`)`
`14`	`15`
`15`	`16`	`var supportedKinds = map[string]struct{}{`
`@@ -22,6 +23,7 @@ var supportedKinds = map[string]struct{}{`
`22`	`23`	`ConsoleQuickStartKind: {},`
`23`	`24`	`ConsoleCLIDownloadKind: {},`
`24`	`25`	`ConsoleLinkKind: {},`
	`26`	`+ NetworkPolicyKind: {},`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`// isSupported returns true if OLM supports this type of CustomResource.`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ const (`
`20`	`20`	`ConsoleQuickStartKind = "ConsoleQuickStart"`
`21`	`21`	`ConsoleCLIDownloadKind = "ConsoleCLIDownload"`
`22`	`22`	`ConsoleLinkKind = "ConsoleLink"`
	`23`	`+ NetworkPolicyKind = "NetworkPolicy"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`// Namespaced indicates whether the resource is namespace scoped (true) or cluster-scoped (false).`
`@@ -47,6 +48,7 @@ var supportedResources = map[string]Namespaced{`
`47`	`48`	`ConsoleQuickStartKind: false,`
`48`	`49`	`ConsoleCLIDownloadKind: false,`
`49`	`50`	`ConsoleLinkKind: false,`
	`51`	`+ NetworkPolicyKind: true,`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`// IsSupported checks if the object kind is OLM-supported and if it is namespaced`