Merge pull request #1270 from thejasn/fixes/dnsmanagementpolicy-defaulting

Add omitempty to dnsmanagementpolicy

Author: openshift-merge-robot

openapi/generated_openapi/zz_generated.openapi.go

@@ -23871,7 +23871,7 @@
         "dnsManagementPolicy": {
           "description": "dnsManagementPolicy indicates if the lifecycle of the wildcard DNS record associated with the load balancer service will be managed by the ingress operator. It defaults to Managed. Valid values are: Managed and Unmanaged.",
           "type": "string",
-          "default": ""
+          "default": "Managed"
         },
         "providerParameters": {
           "description": "providerParameters holds desired load balancer information specific to the underlying infrastructure provider.\n\nIf empty, defaults will be applied. See specific providerParameters fields for details about their defaults.",
@@ -26556,7 +26556,7 @@
         "dnsManagementPolicy": {
           "description": "dnsManagementPolicy denotes the current policy applied on the DNS record. Records that have policy set as \"Unmanaged\" are ignored by the ingress operator.  This means that the DNS record on the cloud provider is not managed by the operator, and the \"Published\" status condition will be updated to \"Unknown\" status, since it is externally managed. Any existing record on the cloud provider can be deleted at the discretion of the cluster admin.\n\nThis field defaults to Managed. Valid values are \"Managed\" and \"Unmanaged\".",
           "type": "string",
-          "default": ""
+          "default": "Managed"
         },
         "dnsName": {
           "description": "dnsName is the hostname of the DNS record",

openapi/openapi.json

@@ -327,6 +327,7 @@ spec:
                         - External
                         type: string
                     required:
+                    - dnsManagementPolicy
                     - scope
                     type: object
                   nodePort:
@@ -1612,6 +1613,7 @@ spec:
                         - External
                         type: string
                     required:
+                    - dnsManagementPolicy
                     - scope
                     type: object
                   nodePort:

operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml

@@ -391,9 +391,9 @@ type LoadBalancerStrategy struct {
 	// Valid values are: Managed and Unmanaged.
 	//
 	// +kubebuilder:default:="Managed"
-	// +kubebuilder:validation:Optional
-	// +optional
-	DNSManagementPolicy LoadBalancerDNSManagementPolicy `json:"dnsManagementPolicy"`
+	// +kubebuilder:validation:Required
+	// +default="Managed"
+	DNSManagementPolicy LoadBalancerDNSManagementPolicy `json:"dnsManagementPolicy,omitempty"`
 }
 
 // LoadBalancerDNSManagementPolicy is a policy for configuring how

operator/v1/types_ingress.go

@@ -38,6 +38,7 @@ spec:
               description: spec is the specification of the desired behavior of the dnsRecord.
               type: object
               required:
+                - dnsManagementPolicy
                 - dnsName
                 - recordTTL
                 - recordType

operatoringress/v1/0000_50_dns-record.yaml

@@ -70,9 +70,9 @@ type DNSRecordSpec struct {
 	// "Unmanaged".
 	//
 	// +kubebuilder:default:="Managed"
-	// +kubebuilder:validation:Optional
-	// +optional
-	DNSManagementPolicy DNSManagementPolicy `json:"dnsManagementPolicy"`
+	// +kubebuilder:validation:Required
+	// +default="Managed"
+	DNSManagementPolicy DNSManagementPolicy `json:"dnsManagementPolicy,omitempty"`
 }
 
 // DNSRecordStatus is the most recently observed status of each record.