Skip to content

[release-4.9] Bug 2014711: Fix for Azure dns privateZone degrade e2e test #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openshift-cherrypick-robot wants to merge 1 commit into from
Closed

[release-4.9] Bug 2014711: Fix for Azure dns privateZone degrade e2e test #664

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions test/e2e/dns_ingressdegrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:]
Copy link

@stleerh stleerh Oct 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to use len(injectError) instead of 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:]
Copy link

@stleerh stleerh Oct 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to use len(injectError) instead of 6.

}
}
Expand Down