Skip to content

Commit 42f447d

Browse files
committed
Use permissive egress for ownnamespace
1 parent fc29299 commit 42f447d

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
}
@@ -977,34 +980,14 @@ func (r *ReconcileWebSphereLiberty) getDNSEgressRule(reqLogger logr.Logger, endp
977980
}
978981
dnsRule.To = append(dnsRule.To, peer)
979982
reqLogger.Info("Found endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace")
980-
} else if endpointsNamespace == "kube-system" { // For non-OCP, assume CoreDNS as the default
981-
peer := networkingv1.NetworkPolicyPeer{}
982-
peer.NamespaceSelector = &metav1.LabelSelector{
983-
MatchLabels: map[string]string{
984-
"kubernetes.io/metadata.name": endpointsNamespace,
985-
},
986-
}
987-
dnsRule.To = append(dnsRule.To, peer)
988-
989-
portUDP := networkingv1.NetworkPolicyPort{}
990-
udp := corev1.ProtocolUDP
991-
portUDP.Protocol = &udp
992-
var portNumberUDP intstr.IntOrString = intstr.FromInt((int)(53))
993-
portUDP.Port = &portNumberUDP
994-
dnsRule.Ports = append(dnsRule.Ports, portUDP)
995-
996-
portTCP := networkingv1.NetworkPolicyPort{}
997-
tcp := corev1.ProtocolTCP
998-
portTCP.Protocol = &tcp
999-
var portNumberTCP intstr.IntOrString = intstr.FromInt((int)(53))
1000-
portTCP.Port = &portNumberTCP
1001-
dnsRule.Ports = append(dnsRule.Ports, portTCP)
1002-
reqLogger.Info("Failed to retrieve endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace. Defaulting to using " + endpointsName + " on port 53 for DNS access.")
1003983
} else {
1004984
peer := networkingv1.NetworkPolicyPeer{}
1005985
peer.NamespaceSelector = &metav1.LabelSelector{
1006986
MatchLabels: map[string]string{},
1007987
}
988+
peer.PodSelector = &metav1.LabelSelector{
989+
MatchLabels: map[string]string{},
990+
}
1008991
dnsRule.To = append(dnsRule.To, peer)
1009992
reqLogger.Info("Failed to retrieve endpoints for " + endpointsName + " service in the " + endpointsNamespace + " namespace. Using more permissive rule.")
1010993
}

0 commit comments

Comments
 (0)