From 6daa65a49ef7fa61d4047ab6bffac1ee066eb1da Mon Sep 17 00:00:00 2001 From: Luigi Mario Zuccarelli Date: Fri, 15 Oct 2021 14:07:01 +0100 Subject: [PATCH] Fix for Azure dns privateZone degrade e2e test --- test/e2e/dns_ingressdegrade_test.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/e2e/dns_ingressdegrade_test.go b/test/e2e/dns_ingressdegrade_test.go index 29f855a36c..5a9f9db3b6 100644 --- a/test/e2e/dns_ingressdegrade_test.go +++ b/test/e2e/dns_ingressdegrade_test.go @@ -80,19 +80,22 @@ func TestIngressStatus(t *testing.T) { // updateDNSConfig - utility to set/unset PrivateZone Tags/ID func updateDNSConfig(set bool, dnsConfig *configv1.DNS) { + // Azure privateZone uses "/" notation the original error- prefix did not cause the privateZone to fail + // Tested on AWS and GCP + injectError := "/error" if dnsConfig.Spec.PrivateZone.ID != "" { if set { - dnsConfig.Spec.PrivateZone.ID = "error-" + dnsConfig.Spec.PrivateZone.ID + dnsConfig.Spec.PrivateZone.ID = injectError + dnsConfig.Spec.PrivateZone.ID } else { - // remove 'error-' from prefix + // remove injectError from prefix dnsConfig.Spec.PrivateZone.ID = dnsConfig.Spec.PrivateZone.ID[6:] } } if dnsConfig.Spec.PrivateZone.Tags["Name"] != "" { if set { - dnsConfig.Spec.PrivateZone.Tags["Name"] = "error-" + dnsConfig.Spec.PrivateZone.Tags["Name"] + dnsConfig.Spec.PrivateZone.Tags["Name"] = injectError + dnsConfig.Spec.PrivateZone.Tags["Name"] } else { - // remove 'error-' from prefix + // remove injectError from prefix dnsConfig.Spec.PrivateZone.Tags["Name"] = dnsConfig.Spec.PrivateZone.Tags["Name"][6:] } }