Skip to content

Commit 85ac215

Browse files
committed
Use permissive egress for ownnamespace
1 parent 183995a commit 85ac215

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed

controllers/webspherelibertyapplication_controller.go

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,9 @@ func (r *ReconcileWebSphereLiberty) Reconcile(ctx context.Context, request ctrl.
446446
peer.NamespaceSelector = &metav1.LabelSelector{
447447
MatchLabels: map[string]string{},
448448
}
449+
peer.PodSelector = &metav1.LabelSelector{
450+
MatchLabels: map[string]string{},
451+
}
449452
rule.To = append(rule.To, peer)
450453
reqLogger.Info("Failed to retrieve endpoints for kubernetes service in the default namespace. Using more permissive rule.")
451454
}
@@ -961,34 +964,14 @@ func (r *ReconcileWebSphereLiberty) getDNSEgressRule(reqLogger logr.Logger, endp
961964
}
962965
dnsRule.To = append(dnsRule.To, peer)
963966
reqLogger.Info("Found endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace")
964-
} else if endpointsNamespace == "kube-system" { // For non-OCP, assume CoreDNS as the default
965-
peer := networkingv1.NetworkPolicyPeer{}
966-
peer.NamespaceSelector = &metav1.LabelSelector{
967-
MatchLabels: map[string]string{
968-
"kubernetes.io/metadata.name": endpointsNamespace,
969-
},
970-
}
971-
dnsRule.To = append(dnsRule.To, peer)
972-
973-
portUDP := networkingv1.NetworkPolicyPort{}
974-
udp := corev1.ProtocolUDP
975-
portUDP.Protocol = &udp
976-
var portNumberUDP intstr.IntOrString = intstr.FromInt((int)(53))
977-
portUDP.Port = &portNumberUDP
978-
dnsRule.Ports = append(dnsRule.Ports, portUDP)
979-
980-
portTCP := networkingv1.NetworkPolicyPort{}
981-
tcp := corev1.ProtocolTCP
982-
portTCP.Protocol = &tcp
983-
var portNumberTCP intstr.IntOrString = intstr.FromInt((int)(53))
984-
portTCP.Port = &portNumberTCP
985-
dnsRule.Ports = append(dnsRule.Ports, portTCP)
986-
reqLogger.Info("Failed to retrieve endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace. Defaulting to using " + endpointsName + " on port 53 for DNS access.")
987967
} else {
988968
peer := networkingv1.NetworkPolicyPeer{}
989969
peer.NamespaceSelector = &metav1.LabelSelector{
990970
MatchLabels: map[string]string{},
991971
}
972+
peer.PodSelector = &metav1.LabelSelector{
973+
MatchLabels: map[string]string{},
974+
}
992975
dnsRule.To = append(dnsRule.To, peer)
993976
reqLogger.Info("Failed to retrieve endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace. Using more permissive rule.")
994977
}

0 commit comments

Comments
 (0)