Skip to content

Commit 31d9963

Browse files
committed
Use permissive egress for ownnamespace
1 parent b461bad commit 31d9963

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
}
@@ -952,34 +955,14 @@ func (r *ReconcileWebSphereLiberty) getDNSEgressRule(reqLogger logr.Logger, endp
952955
}
953956
dnsRule.To = append(dnsRule.To, peer)
954957
reqLogger.Info("Found endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace")
955-
} else if endpointsNamespace == "kube-system" { // For non-OCP, assume CoreDNS as the default
956-
peer := networkingv1.NetworkPolicyPeer{}
957-
peer.NamespaceSelector = &metav1.LabelSelector{
958-
MatchLabels: map[string]string{
959-
"kubernetes.io/metadata.name": endpointsNamespace,
960-
},
961-
}
962-
dnsRule.To = append(dnsRule.To, peer)
963-
964-
portUDP := networkingv1.NetworkPolicyPort{}
965-
udp := corev1.ProtocolUDP
966-
portUDP.Protocol = &udp
967-
var portNumberUDP intstr.IntOrString = intstr.FromInt((int)(53))
968-
portUDP.Port = &portNumberUDP
969-
dnsRule.Ports = append(dnsRule.Ports, portUDP)
970-
971-
portTCP := networkingv1.NetworkPolicyPort{}
972-
tcp := corev1.ProtocolTCP
973-
portTCP.Protocol = &tcp
974-
var portNumberTCP intstr.IntOrString = intstr.FromInt((int)(53))
975-
portTCP.Port = &portNumberTCP
976-
dnsRule.Ports = append(dnsRule.Ports, portTCP)
977-
reqLogger.Info("Failed to retrieve endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace. Defaulting to using " + endpointsName + " on port 53 for DNS access.")
978958
} else {
979959
peer := networkingv1.NetworkPolicyPeer{}
980960
peer.NamespaceSelector = &metav1.LabelSelector{
981961
MatchLabels: map[string]string{},
982962
}
963+
peer.PodSelector = &metav1.LabelSelector{
964+
MatchLabels: map[string]string{},
965+
}
983966
dnsRule.To = append(dnsRule.To, peer)
984967
reqLogger.Info("Failed to retrieve endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace. Using more permissive rule.")
985968
}

0 commit comments

Comments
 (0)