Don't throw annotation deprication warning when ingressClassName is…

… not used in an Ingress resource (#4564) Signed-off-by: Shaun <[email protected]>
nginx · Nov 2, 2023 · 8a93be8 · 8a93be8
1 parent 7a1e600
commit 8a93be8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go
@@ -3980,7 +3980,7 @@ func (lbc *LoadBalancerController) HasCorrectIngressClass(obj interface{}) bool
 		class = obj.Annotations[ingressClassKey]
 		if class == "" && obj.Spec.IngressClassName != nil {
 			class = *obj.Spec.IngressClassName
-		} else {
+		} else if class != "" {
 			// the annotation takes precedence over the field
 			glog.Warningln("Using the DEPRECATED annotation 'kubernetes.io/ingress.class'. The 'ingressClassName' field will be ignored.")
 		}

diff --git a/internal/k8s/controller_test.go b/internal/k8s/controller_test.go
@@ -139,6 +139,16 @@ func TestHasCorrectIngressClass(t *testing.T) {
 			},
 			true,
 		},
+		{
+			&LoadBalancerController{
+				ingressClass:     ingressClass,
+				metricsCollector: collectors.NewControllerFakeCollector(),
+			},
+			&networking.Ingress{
+				Spec: networking.IngressSpec{},
+			},
+			false,
+		},
 	}
 
 	for _, test := range tests {