Skip to content

Commit e50038f

Browse files
committed
fix vpc egress gateway not applied to new pods
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 14471f4 commit e50038f

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

pkg/controller/vpc_egress_gateway.go

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -986,19 +986,25 @@ func (c *Controller) handlePodEventForVpcEgressGateway(pod *corev1.Pod) error {
986986
}
987987

988988
for _, selector := range veg.Spec.Selectors {
989-
sel, err := metav1.LabelSelectorAsSelector(selector.NamespaceSelector)
990-
if err != nil {
991-
klog.Errorf("failed to create label selector for namespace selector %#v: %v", selector.NamespaceSelector, err)
992-
utilruntime.HandleError(err)
993-
continue
989+
sel := labels.Everything()
990+
if selector.NamespaceSelector != nil {
991+
if sel, err = metav1.LabelSelectorAsSelector(selector.NamespaceSelector); err != nil {
992+
err = fmt.Errorf("failed to create label selector for namespace selector %#v: %w", selector.NamespaceSelector, err)
993+
klog.Error(err)
994+
utilruntime.HandleError(err)
995+
return err
996+
}
994997
}
995998
if !sel.Matches(labels.Set(ns.Labels)) {
996999
continue
9971000
}
998-
if sel, err = metav1.LabelSelectorAsSelector(selector.PodSelector); err != nil {
999-
klog.Errorf("failed to create label selector for pod selector %#v: %v", selector.PodSelector, err)
1000-
utilruntime.HandleError(err)
1001-
continue
1001+
if selector.PodSelector != nil {
1002+
if sel, err = metav1.LabelSelectorAsSelector(selector.PodSelector); err != nil {
1003+
err = fmt.Errorf("failed to create label selector for pod selector %#v: %w", selector.PodSelector, err)
1004+
klog.Error(err)
1005+
utilruntime.HandleError(err)
1006+
return err
1007+
}
10021008
}
10031009
if sel.Matches(labels.Set(pod.Labels)) {
10041010
c.addOrUpdateVpcEgressGatewayQueue.Add(cache.MetaObjectToName(veg).String())

0 commit comments

Comments
 (0)