Skip to content

Commit 5410585

Browse files
kabicinKirby Chin
authored andcommitted
Use permissive egress for ownnamespace
1 parent db8891b commit 5410585

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
@@ -450,6 +450,9 @@ func (r *ReconcileWebSphereLiberty) Reconcile(ctx context.Context, request ctrl.
450450
peer.NamespaceSelector = &metav1.LabelSelector{
451451
MatchLabels: map[string]string{},
452452
}
453+
peer.PodSelector = &metav1.LabelSelector{
454+
MatchLabels: map[string]string{},
455+
}
453456
rule.To = append(rule.To, peer)
454457
reqLogger.Info("Failed to retrieve endpoints for kubernetes service in the default namespace. Using more permissive rule.")
455458
}
@@ -982,34 +985,14 @@ func (r *ReconcileWebSphereLiberty) getDNSEgressRule(reqLogger logr.Logger, endp
982985
}
983986
dnsRule.To = append(dnsRule.To, peer)
984987
reqLogger.Info("Found endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace")
985-
} else if endpointsNamespace == "kube-system" { // For non-OCP, assume CoreDNS as the default
986-
peer := networkingv1.NetworkPolicyPeer{}
987-
peer.NamespaceSelector = &metav1.LabelSelector{
988-
MatchLabels: map[string]string{
989-
"kubernetes.io/metadata.name": endpointsNamespace,
990-
},
991-
}
992-
dnsRule.To = append(dnsRule.To, peer)
993-
994-
portUDP := networkingv1.NetworkPolicyPort{}
995-
udp := corev1.ProtocolUDP
996-
portUDP.Protocol = &udp
997-
var portNumberUDP intstr.IntOrString = intstr.FromInt((int)(53))
998-
portUDP.Port = &portNumberUDP
999-
dnsRule.Ports = append(dnsRule.Ports, portUDP)
1000-
1001-
portTCP := networkingv1.NetworkPolicyPort{}
1002-
tcp := corev1.ProtocolTCP
1003-
portTCP.Protocol = &tcp
1004-
var portNumberTCP intstr.IntOrString = intstr.FromInt((int)(53))
1005-
portTCP.Port = &portNumberTCP
1006-
dnsRule.Ports = append(dnsRule.Ports, portTCP)
1007-
reqLogger.Info("Failed to retrieve endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace. Defaulting to using " + endpointsName + " on port 53 for DNS access.")
1008988
} else {
1009989
peer := networkingv1.NetworkPolicyPeer{}
1010990
peer.NamespaceSelector = &metav1.LabelSelector{
1011991
MatchLabels: map[string]string{},
1012992
}
993+
peer.PodSelector = &metav1.LabelSelector{
994+
MatchLabels: map[string]string{},
995+
}
1013996
dnsRule.To = append(dnsRule.To, peer)
1014997
reqLogger.Info("Failed to retrieve endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace. Using more permissive rule.")
1015998
}

0 commit comments

Comments
 (0)