review fixes

kubernetes-sigs · Apr 13, 2021 · 716d5e5 · 716d5e5
1 parent 3fd677a
commit 716d5e5
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/test/framework/deployment_helpers.go b/test/framework/deployment_helpers.go
@@ -241,11 +241,10 @@ func WaitForDNSUpgrade(ctx context.Context, input WaitForDNSUpgradeInput, interv
 		if err := input.Getter.Get(ctx, client.ObjectKey{Name: "coredns", Namespace: metav1.NamespaceSystem}, d); err != nil {
 			return false, err
 		}
-		// coredns image name has changed. So for now we accept:
-		// k8s.gcr.io/coredns:1.7.0
-		// k8s.gcr.io/coredns/coredns:v1.7.0
-		// k8s.gcr.io/coredns/coredns:v1.8.0
-		if strings.HasSuffix(d.Spec.Template.Spec.Containers[0].Image, "coredns:"+input.DNSVersion) {
+
+		// NOTE: coredns image name has changed over time (k8s.gcr.io/coredns,
+		// k8s.gcr.io/coredns/coredns), so we are checking only if the version actually changed.
+		if strings.HasSuffix(d.Spec.Template.Spec.Containers[0].Image, fmt.Sprintf(":%s", input.DNSVersion)) {
 			return true, nil
 		}
 		return false, nil