Merge branch 'master' into update-azure-image

rancher · Oct 29, 2024 · 30d56e5 · 30d56e5
2 parents 2cd4202 + 397c56a
commit 30d56e5
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 2,243 deletions.
diff --git a/docs/data-sources/global_dns_provider.md b/docs/data-sources/global_dns_provider.md
diff --git a/docs/resources/global_dns.md b/docs/resources/global_dns.md
diff --git a/docs/resources/global_dns_provider.md b/docs/resources/global_dns_provider.md
diff --git a/rancher2/0_provider_upgrade_test.go b/rancher2/0_provider_upgrade_test.go
@@ -113,10 +113,6 @@ provider "rancher2" {
 ` + testAccRancher2ClusterRoleTemplateBinding + `
 ` + testAccRancher2ClusterTemplateConfig + `
 ` + testAccRancher2EtcdBackup + `
-` + testAccRancher2GlobalDNS + `
-` + testAccRancher2GlobalDNSProviderAlidnsConfig + `
-` + testAccRancher2GlobalDNSProviderCloudflareConfig + `
-` + testAccRancher2GlobalDNSProviderRoute53Config + `
 ` + testAccRancher2GlobalRoleBinding + `
 ` + testAccRancher2MultiClusterApp + `
 ` + testAccRancher2Namespace + `
@@ -154,10 +150,6 @@ provider "rancher2" {
 ` + testAccRancher2ClusterRoleTemplateBinding + `
 ` + testAccRancher2ClusterTemplateConfig + `
 ` + testAccRancher2EtcdBackup + `
-` + testAccRancher2GlobalDNS + `
-` + testAccRancher2GlobalDNSProviderAlidnsConfig + `
-` + testAccRancher2GlobalDNSProviderCloudflareConfig + `
-` + testAccRancher2GlobalDNSProviderRoute53Config + `
 ` + testAccRancher2GlobalRoleBinding + `
 ` + testAccRancher2MultiClusterApp + `
 ` + testAccRancher2Namespace + `
@@ -199,10 +191,6 @@ provider "rancher2" {
 ` + testAccRancher2ClusterTemplateConfig + `
 ` + testAccRancher2EtcdBackup + `
 ` + testAccRancher2FeatureConfig + `
-` + testAccRancher2GlobalDNS + `
-` + testAccRancher2GlobalDNSProviderAlidnsConfig + `
-` + testAccRancher2GlobalDNSProviderCloudflareConfig + `
-` + testAccRancher2GlobalDNSProviderRoute53Config + `
 ` + testAccRancher2GlobalRoleBinding + `
 ` + testAccRancher2MultiClusterApp + `
 ` + testAccRancher2Namespace + `
@@ -248,10 +236,6 @@ provider "rancher2" {
 ` + testAccRancher2ClusterTemplateConfig + `
 ` + testAccRancher2EtcdBackup + `
 ` + testAccRancher2FeatureConfig + `
-` + testAccRancher2GlobalDNS + `
-` + testAccRancher2GlobalDNSProviderAlidnsConfig + `
-` + testAccRancher2GlobalDNSProviderCloudflareConfig + `
-` + testAccRancher2GlobalDNSProviderRoute53Config + `
 ` + testAccRancher2GlobalRoleBinding + `
 ` + testAccRancher2MultiClusterApp + `
 ` + testAccRancher2Namespace + `

diff --git a/rancher2/data_source_rancher2_global_dns_provider.go b/rancher2/data_source_rancher2_global_dns_provider.go