Fix dataplane defaults and typos

Author: ciarams87

apis/v1alpha2/nginxproxy_types.go

@@ -374,11 +374,11 @@ type DNSResolver struct {
 	// +optional
 	CacheTTL *v1alpha1.Duration `json:"cacheTTL,omitempty"`
 
-	// DisableIPv6 disables DisableIPv6 lookups.
+	// DisableIPv6 disables IPv6 lookups.
 	// If not specified, or set to false, IPv6 lookups will be enabled.
 	//
 	// +optional
-	DisableIPv6 *bool `json:"ipv6,omitempty"`
+	DisableIPv6 *bool `json:"disableIPv6,omitempty"`
 
 	// Addresses specifies the list of DNS server addresses.
 	// Each address can be an IP address or hostname.

config/crd/bases/gateway.nginx.org_nginxproxies.yaml

@@ -104,9 +104,9 @@ spec:
                     description: CacheTTL specifies how long to cache DNS responses.
                     pattern: ^[0-9]{1,4}(ms|s|m|h)?$
                     type: string
-                  ipv6:
+                  disableIPv6:
                     description: |-
-                      DisableIPv6 disables DisableIPv6 lookups.
+                      DisableIPv6 disables IPv6 lookups.
                       If not specified, or set to false, IPv6 lookups will be enabled.
                     type: boolean
                   timeout:

deploy/crds.yaml

@@ -689,9 +689,9 @@ spec:
                     description: CacheTTL specifies how long to cache DNS responses.
                     pattern: ^[0-9]{1,4}(ms|s|m|h)?$
                     type: string
-                  ipv6:
+                  disableIPv6:
                     description: |-
-                      DisableIPv6 disables DisableIPv6 lookups.
+                      DisableIPv6 disables IPv6 lookups.
                       If not specified, or set to false, IPv6 lookups will be enabled.
                     type: boolean
                   timeout:

examples/externalname-service/gateway.yaml

@@ -39,4 +39,4 @@ spec:
       value: "1.1.1.1"
     timeout: "30s"
     cacheTTL: "60s"
-    ipv6: true
+    disableIPv6: false

internal/controller/state/dataplane/configuration.go

@@ -1258,20 +1258,14 @@ func buildDNSResolverConfig(dnsResolver *ngfAPIv1alpha2.DNSResolver) *DNSResolve
 
 	if dnsResolver.Timeout != nil {
 		config.Timeout = string(*dnsResolver.Timeout)
-	} else {
-		config.Timeout = "30s"
 	}
 
 	if dnsResolver.CacheTTL != nil {
 		config.Valid = string(*dnsResolver.CacheTTL)
-	} else {
-		config.Valid = "30s"
 	}
 
 	if dnsResolver.DisableIPv6 != nil {
 		config.DisableIPv6 = *dnsResolver.DisableIPv6
-	} else {
-		config.DisableIPv6 = true
 	}
 
 	return config

internal/controller/state/dataplane/configuration_test.go

@@ -5173,13 +5173,13 @@ func TestBuildDNSResolverConfig(t *testing.T) {
 				Addresses:   addr,
 				Timeout:     helpers.GetPointer(ngfAPIv1alpha1.Duration("10s")),
 				CacheTTL:    helpers.GetPointer(ngfAPIv1alpha1.Duration("60s")),
-				DisableIPv6: helpers.GetPointer(false),
+				DisableIPv6: helpers.GetPointer(true),
 			},
 			expected: &DNSResolverConfig{
 				Addresses:   []string{"8.8.8.8", "dns.google"},
 				Timeout:     "10s",
 				Valid:       "60s",
-				DisableIPv6: false,
+				DisableIPv6: true,
 			},
 		},
 		{
@@ -5189,9 +5189,7 @@ func TestBuildDNSResolverConfig(t *testing.T) {
 			},
 			expected: &DNSResolverConfig{
 				Addresses:   []string{"8.8.8.8", "dns.google"},
-				Timeout:     "30s",
-				Valid:       "30s",
-				DisableIPv6: true,
+				DisableIPv6: false,
 			},
 		},
 	}