Skip to content

If we're running in Openshift, only allow inbound from the ingress #1300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2025
+20 −4
Merged

If we're running in Openshift, only allow inbound from the ingress #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions manageiq-operator/api/v1alpha1/helpers/miq-components/network_policies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package miqtools

import (
"context"
miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
routev1 "github.com/openshift/api/route/v1"
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -29,9 +31,15 @@ func NetworkPolicyDefaultDeny(cr *miqv1alpha1.ManageIQ, scheme *runtime.Scheme)
return networkPolicy, f
}

func NetworkPolicyAllowInboundHttpd(cr *miqv1alpha1.ManageIQ, scheme *runtime.Scheme) (*networkingv1.NetworkPolicy, controllerutil.MutateFn) {
func NetworkPolicyAllowInboundHttpd(cr *miqv1alpha1.ManageIQ, scheme *runtime.Scheme, client client.Client) (*networkingv1.NetworkPolicy, controllerutil.MutateFn) {
networkPolicy := newNetworkPolicy(cr, "allow-inbound-httpd")

// Check if we're running in OpenShift
openshift := false
if err := client.List(context.TODO(), &routev1.RouteList{}); err == nil {
openshift = true
}

f := func() error {
if err := controllerutil.SetControllerReference(cr, networkPolicy, scheme); err != nil {
return err
Expand All @@ -48,8 +56,16 @@ func NetworkPolicyAllowInboundHttpd(cr *miqv1alpha1.ManageIQ, scheme *runtime.Sc
networkingv1.NetworkPolicyPeer{},
}
}
networkPolicy.Spec.Ingress[0].From[0].IPBlock = &networkingv1.IPBlock{}
networkPolicy.Spec.Ingress[0].From[0].IPBlock.CIDR = "0.0.0.0/0"
if openshift == true {
networkPolicy.Spec.Ingress[0].From[0].NamespaceSelector = &metav1.LabelSelector{
MatchLabels: map[string]string{
"network.openshift.io/policy-group": "ingress",
},
}
} else {
networkPolicy.Spec.Ingress[0].From[0].IPBlock = &networkingv1.IPBlock{}
networkPolicy.Spec.Ingress[0].From[0].IPBlock.CIDR = "0.0.0.0/0"
}

return nil
}
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/internal/controller/manageiq_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ func (r *ManageIQReconciler) generateNetworkPolicies(cr *miqv1alpha1.ManageIQ) e
logger.Info("NetworkPolicy default-deny has been reconciled", "component", "network_policy", "result", result)
}

networkPolicyAllowInboundHttpd, mutateFunc := miqtool.NetworkPolicyAllowInboundHttpd(cr, r.Scheme)
networkPolicyAllowInboundHttpd, mutateFunc := miqtool.NetworkPolicyAllowInboundHttpd(cr, r.Scheme, r.Client)
if result, err := controllerutil.CreateOrUpdate(context.TODO(), r.Client, networkPolicyAllowInboundHttpd, mutateFunc); err != nil {
return err
} else if result != controllerutil.OperationResultNone {
Expand Down