sync ingress status on ingress class updates (istio#44926)

Author: dddddai

pilot/pkg/config/kube/ingress/status.go

@@ -77,7 +77,7 @@ func NewStatusSyncer(meshHolder mesh.Watcher, kc kubelib.Client, options kubecon
 	// For any ingress change, enqueue it - we may need to update the status.
 	c.ingresses.AddEventHandler(controllers.ObjectHandler(c.queue.AddObject))
 	// For any class change, sync all ingress; the handler will filter non-matching ones already
-	c.ingresses.AddEventHandler(controllers.ObjectHandler(func(o controllers.Object) {
+	c.ingressClasses.AddEventHandler(controllers.ObjectHandler(func(o controllers.Object) {
 		// Just sync them all
 		c.enqueueAll()
 	}))
@@ -102,7 +102,7 @@ func NewStatusSyncer(meshHolder mesh.Watcher, kc kubelib.Client, options kubecon
 			c.enqueueAll()
 		}
 	}))
-	// Mesh may have changed ingress fields, enqueu everything
+	// Mesh may have changed ingress fields, enqueue everything
 	c.meshConfig.AddMeshHandler(c.enqueueAll)
 	return c
 }

pilot/pkg/config/kube/ingress/status_test.go

@@ -135,6 +135,7 @@ func TestStatusController(t *testing.T) {
 	c := makeStatusSyncer(t, "istio-ingress")
 	ing := clienttest.Wrap(t, c.ingresses)
 	svc := clienttest.Wrap(t, c.services)
+	ingc := clienttest.Wrap(t, c.ingressClasses)
 	ing.Create(&knetworking.Ingress{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        "ingress",
@@ -168,6 +169,30 @@ func TestStatusController(t *testing.T) {
 		},
 	})
 	assert.EventuallyEqual(t, getIPs(ing, "ingress", "default"), []string{})
+
+	ingressClassName := "istio"
+	// Set IngressClassName
+	ing.Update(&knetworking.Ingress{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "ingress",
+			Namespace: "default",
+		},
+		Spec: knetworking.IngressSpec{
+			IngressClassName: &ingressClassName,
+		},
+	})
+	assert.EventuallyEqual(t, getIPs(ing, "ingress", "default"), []string{})
+
+	// Create IngressClass
+	ingc.Create(&knetworking.IngressClass{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: ingressClassName,
+		},
+		Spec: knetworking.IngressClassSpec{
+			Controller: IstioIngressController,
+		},
+	})
+	assert.EventuallyEqual(t, getIPs(ing, "ingress", "default"), []string{"5.6.7.8"})
 }
 
 func TestRunningAddresses(t *testing.T) {