rename PrivateDNSNameOptions -> PrivateDNSName

MaxFedotov · MaxFedotov · commit d6b1fc238319 · 2024-01-29T13:46:57.000+02:00
diff --git a/api/v1beta1/awscluster_conversion.go b/api/v1beta1/awscluster_conversion.go
@@ -48,7 +48,7 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 	if restored.Status.Bastion != nil {
 		dst.Status.Bastion.InstanceMetadataOptions = restored.Status.Bastion.InstanceMetadataOptions
 		dst.Status.Bastion.PlacementGroupName = restored.Status.Bastion.PlacementGroupName
-		dst.Status.Bastion.PrivateDNSNameOptions = restored.Status.Bastion.PrivateDNSNameOptions
+		dst.Status.Bastion.PrivateDNSName = restored.Status.Bastion.PrivateDNSName
 	}
 	dst.Spec.Partition = restored.Spec.Partition
 
diff --git a/api/v1beta1/awsmachine_conversion.go b/api/v1beta1/awsmachine_conversion.go
@@ -38,7 +38,7 @@ func (src *AWSMachine) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Ignition = restored.Spec.Ignition
 	dst.Spec.InstanceMetadataOptions = restored.Spec.InstanceMetadataOptions
 	dst.Spec.PlacementGroupName = restored.Spec.PlacementGroupName
-	dst.Spec.PrivateDNSNameOptions = restored.Spec.PrivateDNSNameOptions
+	dst.Spec.PrivateDNSName = restored.Spec.PrivateDNSName
 
 	return nil
 }
@@ -86,7 +86,7 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Template.Spec.Ignition = restored.Spec.Template.Spec.Ignition
 	dst.Spec.Template.Spec.InstanceMetadataOptions = restored.Spec.Template.Spec.InstanceMetadataOptions
 	dst.Spec.Template.Spec.PlacementGroupName = restored.Spec.Template.Spec.PlacementGroupName
-	dst.Spec.Template.Spec.PrivateDNSNameOptions = restored.Spec.Template.Spec.PrivateDNSNameOptions
+	dst.Spec.Template.Spec.PrivateDNSName = restored.Spec.Template.Spec.PrivateDNSName
 
 	return nil
 }
diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go
diff --git a/api/v1beta2/awsmachine_types.go b/api/v1beta2/awsmachine_types.go
@@ -161,9 +161,9 @@ type AWSMachineSpec struct {
 	// +kubebuilder:validation:Enum:=default;dedicated;host
 	Tenancy string `json:"tenancy,omitempty"`
 
-	// PrivateDNSNameOptions is the options for the instance hostname.
+	// PrivateDNSName is the options for the instance hostname.
 	// +optional
-	PrivateDNSNameOptions *PrivateDNSNameOptions `json:"privateDnsNameOptions,omitempty"`
+	PrivateDNSName *PrivateDNSName `json:"privateDnsName,omitempty"`
 }
 
 // CloudInit defines options related to the bootstrapping systems where
diff --git a/api/v1beta2/awsmachine_webhook.go b/api/v1beta2/awsmachine_webhook.go
@@ -115,14 +115,14 @@ func (r *AWSMachine) ValidateUpdate(old runtime.Object) (admission.Warnings, err
 	}
 
 	// allow changes to enableResourceNameDNSAAAARecord and enableResourceNameDNSARecord
-	if privateDNSNameOptions, ok := oldAWSMachineSpec["privateDnsNameOptions"].(map[string]interface{}); ok {
-		delete(privateDNSNameOptions, "enableResourceNameDnsAAAARecord")
-		delete(privateDNSNameOptions, "enableResourceNameDnsARecord")
+	if privateDNSName, ok := oldAWSMachineSpec["privateDnsName"].(map[string]interface{}); ok {
+		delete(privateDNSName, "enableResourceNameDnsAAAARecord")
+		delete(privateDNSName, "enableResourceNameDnsARecord")
 	}
 
-	if privateDNSNameOptions, ok := newAWSMachineSpec["privateDnsNameOptions"].(map[string]interface{}); ok {
-		delete(privateDNSNameOptions, "enableResourceNameDnsAAAARecord")
-		delete(privateDNSNameOptions, "enableResourceNameDnsARecord")
+	if privateDNSName, ok := newAWSMachineSpec["privateDnsName"].(map[string]interface{}); ok {
+		delete(privateDNSName, "enableResourceNameDnsAAAARecord")
+		delete(privateDNSName, "enableResourceNameDnsARecord")
 	}
 
 	if !cmp.Equal(oldAWSMachineSpec, newAWSMachineSpec) {
diff --git a/api/v1beta2/awsmachine_webhook_test.go b/api/v1beta2/awsmachine_webhook_test.go
@@ -325,7 +325,7 @@ func TestAWSMachineUpdate(t *testing.T) {
 							ID: pointer.String("ID"),
 						},
 					},
-					PrivateDNSNameOptions: &PrivateDNSNameOptions{
+					PrivateDNSName: &PrivateDNSName{
 						EnableResourceNameDNSAAAARecord: aws.Bool(true),
 						EnableResourceNameDNSARecord:    aws.Bool(true),
 					},
diff --git a/api/v1beta2/types.go b/api/v1beta2/types.go
@@ -233,9 +233,9 @@ type Instance struct {
 	// +optional
 	InstanceMetadataOptions *InstanceMetadataOptions `json:"instanceMetadataOptions,omitempty"`
 
-	// PrivateDNSNameOptions is the options for the instance hostname.
+	// PrivateDNSName is the options for the instance hostname.
 	// +optional
-	PrivateDNSNameOptions *PrivateDNSNameOptions `json:"privateDnsNameOptions,omitempty"`
+	PrivateDNSName *PrivateDNSName `json:"privateDnsName,omitempty"`
 }
 
 // InstanceMetadataState describes the state of InstanceMetadataOptions.HttpEndpoint and InstanceMetadataOptions.InstanceMetadataTags
@@ -412,8 +412,8 @@ const (
 	AmazonLinuxGPU EKSAMILookupType = "AmazonLinuxGPU"
 )
 
-// PrivateDNSNameOptions is the options for the instance hostname.
-type PrivateDNSNameOptions struct {
+// PrivateDNSName is the options for the instance hostname.
+type PrivateDNSName struct {
 	// EnableResourceNameDNSAAAARecord indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records.
 	// +optional
 	EnableResourceNameDNSAAAARecord *bool `json:"enableResourceNameDnsAAAARecord,omitempty"`
diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
@@ -1108,9 +1108,8 @@ spec:
                     description: PlacementGroupName specifies the name of the placement
                       group in which to launch the instance.
                     type: string
-                  privateDnsNameOptions:
-                    description: PrivateDNSNameOptions is the options for the instance
-                      hostname.
+                  privateDnsName:
+                    description: PrivateDNSName is the options for the instance hostname.
                     properties:
                       enableResourceNameDnsAAAARecord:
                         description: EnableResourceNameDNSAAAARecord indicates whether
@@ -2751,9 +2750,8 @@ spec:
                     description: PlacementGroupName specifies the name of the placement
                       group in which to launch the instance.
                     type: string
-                  privateDnsNameOptions:
-                    description: PrivateDNSNameOptions is the options for the instance
-                      hostname.
+                  privateDnsName:
+                    description: PrivateDNSName is the options for the instance hostname.
                     properties:
                       enableResourceNameDnsAAAARecord:
                         description: EnableResourceNameDNSAAAARecord indicates whether
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml
@@ -1699,9 +1699,8 @@ spec:
                     description: PlacementGroupName specifies the name of the placement
                       group in which to launch the instance.
                     type: string
-                  privateDnsNameOptions:
-                    description: PrivateDNSNameOptions is the options for the instance
-                      hostname.
+                  privateDnsName:
+                    description: PrivateDNSName is the options for the instance hostname.
                     properties:
                       enableResourceNameDnsAAAARecord:
                         description: EnableResourceNameDNSAAAARecord indicates whether
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml
@@ -690,9 +690,8 @@ spec:
                   name:
                     description: The name of the launch template.
                     type: string
-                  privateDnsNameOptions:
-                    description: PrivateDNSNameOptions is the options for the instance
-                      hostname.
+                  privateDnsName:
+                    description: PrivateDNSName is the options for the instance hostname.
                     properties:
                       enableResourceNameDnsAAAARecord:
                         description: EnableResourceNameDNSAAAARecord indicates whether
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml
@@ -780,9 +780,8 @@ spec:
                 description: PlacementGroupName specifies the name of the placement
                   group in which to launch the instance.
                 type: string
-              privateDnsNameOptions:
-                description: PrivateDNSNameOptions is the options for the instance
-                  hostname.
+              privateDnsName:
+                description: PrivateDNSName is the options for the instance hostname.
                 properties:
                   enableResourceNameDnsAAAARecord:
                     description: EnableResourceNameDNSAAAARecord indicates whether
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
@@ -734,9 +734,9 @@ spec:
                         description: PlacementGroupName specifies the name of the
                           placement group in which to launch the instance.
                         type: string
-                      privateDnsNameOptions:
-                        description: PrivateDNSNameOptions is the options for the
-                          instance hostname.
+                      privateDnsName:
+                        description: PrivateDNSName is the options for the instance
+                          hostname.
                         properties:
                           enableResourceNameDnsAAAARecord:
                             description: EnableResourceNameDNSAAAARecord indicates
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml
@@ -678,9 +678,8 @@ spec:
                   name:
                     description: The name of the launch template.
                     type: string
-                  privateDnsNameOptions:
-                    description: PrivateDNSNameOptions is the options for the instance
-                      hostname.
+                  privateDnsName:
+                    description: PrivateDNSName is the options for the instance hostname.
                     properties:
                       enableResourceNameDnsAAAARecord:
                         description: EnableResourceNameDNSAAAARecord indicates whether
diff --git a/exp/api/v1beta1/conversion.go b/exp/api/v1beta1/conversion.go
@@ -51,8 +51,8 @@ func (src *AWSMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 		dst.Spec.AvailabilityZoneSubnetType = restored.Spec.AvailabilityZoneSubnetType
 	}
 
-	if restored.Spec.AWSLaunchTemplate.PrivateDNSNameOptions != nil {
-		dst.Spec.AWSLaunchTemplate.PrivateDNSNameOptions = restored.Spec.AWSLaunchTemplate.PrivateDNSNameOptions
+	if restored.Spec.AWSLaunchTemplate.PrivateDNSName != nil {
+		dst.Spec.AWSLaunchTemplate.PrivateDNSName = restored.Spec.AWSLaunchTemplate.PrivateDNSName
 	}
 
 	return nil
@@ -100,8 +100,8 @@ func (src *AWSManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 		}
 		dst.Spec.AWSLaunchTemplate.InstanceMetadataOptions = restored.Spec.AWSLaunchTemplate.InstanceMetadataOptions
 
-		if restored.Spec.AWSLaunchTemplate.PrivateDNSNameOptions != nil {
-			dst.Spec.AWSLaunchTemplate.PrivateDNSNameOptions = restored.Spec.AWSLaunchTemplate.PrivateDNSNameOptions
+		if restored.Spec.AWSLaunchTemplate.PrivateDNSName != nil {
+			dst.Spec.AWSLaunchTemplate.PrivateDNSName = restored.Spec.AWSLaunchTemplate.PrivateDNSName
 		}
 	}
 	if restored.Spec.AvailabilityZoneSubnetType != nil {
diff --git a/exp/api/v1beta1/zz_generated.conversion.go b/exp/api/v1beta1/zz_generated.conversion.go
diff --git a/exp/api/v1beta2/types.go b/exp/api/v1beta2/types.go
@@ -121,9 +121,9 @@ type AWSLaunchTemplate struct {
 	// +optional
 	InstanceMetadataOptions *infrav1.InstanceMetadataOptions `json:"instanceMetadataOptions,omitempty"`
 
-	// PrivateDNSNameOptions is the options for the instance hostname.
+	// PrivateDNSName is the options for the instance hostname.
 	// +optional
-	PrivateDNSNameOptions *infrav1.PrivateDNSNameOptions `json:"privateDnsNameOptions,omitempty"`
+	PrivateDNSName *infrav1.PrivateDNSName `json:"privateDnsName,omitempty"`
 }
 
 // Overrides are used to override the instance type specified by the launch template with multiple
diff --git a/exp/api/v1beta2/zz_generated.deepcopy.go b/exp/api/v1beta2/zz_generated.deepcopy.go
diff --git a/pkg/cloud/services/ec2/instances.go b/pkg/cloud/services/ec2/instances.go
@@ -238,7 +238,7 @@ func (s *Service) CreateInstance(scope *scope.MachineScope, userData []byte, use
 
 	input.PlacementGroupName = scope.AWSMachine.Spec.PlacementGroupName
 
-	input.PrivateDNSNameOptions = scope.AWSMachine.Spec.PrivateDNSNameOptions
+	input.PrivateDNSName = scope.AWSMachine.Spec.PrivateDNSName
 
 	s.scope.Debug("Running instance", "machine-role", scope.Role())
 	s.scope.Debug("Running instance with instance metadata options", "metadata options", input.InstanceMetadataOptions)
@@ -597,7 +597,7 @@ func (s *Service) runInstance(role string, i *infrav1.Instance) (*infrav1.Instan
 
 	input.InstanceMarketOptions = getInstanceMarketOptionsRequest(i.SpotMarketOptions)
 	input.MetadataOptions = getInstanceMetadataOptionsRequest(i.InstanceMetadataOptions)
-	input.PrivateDnsNameOptions = getPrivateDNSNameOptionsRequest(i.PrivateDNSNameOptions)
+	input.PrivateDnsNameOptions = getPrivateDNSNameOptionsRequest(i.PrivateDNSName)
 
 	if i.Tenancy != "" {
 		input.Placement = &ec2.Placement{
@@ -869,7 +869,7 @@ func (s *Service) SDKToInstance(v *ec2.Instance) (*infrav1.Instance, error) {
 	}
 
 	if v.PrivateDnsNameOptions != nil {
-		i.PrivateDNSNameOptions = &infrav1.PrivateDNSNameOptions{
+		i.PrivateDNSName = &infrav1.PrivateDNSName{
 			EnableResourceNameDNSAAAARecord: v.PrivateDnsNameOptions.EnableResourceNameDnsAAAARecord,
 			EnableResourceNameDNSARecord:    v.PrivateDnsNameOptions.EnableResourceNameDnsARecord,
 			HostnameType:                    v.PrivateDnsNameOptions.HostnameType,
@@ -1065,14 +1065,14 @@ func getInstanceMetadataOptionsRequest(metadataOptions *infrav1.InstanceMetadata
 	return request
 }
 
-func getPrivateDNSNameOptionsRequest(privateDNSNameOptions *infrav1.PrivateDNSNameOptions) *ec2.PrivateDnsNameOptionsRequest {
-	if privateDNSNameOptions == nil {
+func getPrivateDNSNameOptionsRequest(privateDNSName *infrav1.PrivateDNSName) *ec2.PrivateDnsNameOptionsRequest {
+	if privateDNSName == nil {
 		return nil
 	}
 
 	return &ec2.PrivateDnsNameOptionsRequest{
-		EnableResourceNameDnsAAAARecord: privateDNSNameOptions.EnableResourceNameDNSAAAARecord,
-		EnableResourceNameDnsARecord:    privateDNSNameOptions.EnableResourceNameDNSARecord,
-		HostnameType:                    privateDNSNameOptions.HostnameType,
+		EnableResourceNameDnsAAAARecord: privateDNSName.EnableResourceNameDNSAAAARecord,
+		EnableResourceNameDnsARecord:    privateDNSName.EnableResourceNameDNSARecord,
+		HostnameType:                    privateDNSName.HostnameType,
 	}
 }
diff --git a/pkg/cloud/services/ec2/launchtemplate.go b/pkg/cloud/services/ec2/launchtemplate.go
@@ -498,7 +498,7 @@ func (s *Service) createLaunchTemplateData(scope scope.LaunchTemplateScope, imag
 	data.ImageId = imageID
 
 	data.InstanceMarketOptions = getLaunchTemplateInstanceMarketOptionsRequest(scope.GetLaunchTemplate().SpotMarketOptions)
-	data.PrivateDnsNameOptions = getLaunchTemplatePrivateDNSNameOptionsRequest(scope.GetLaunchTemplate().PrivateDNSNameOptions)
+	data.PrivateDnsNameOptions = getLaunchTemplatePrivateDNSNameOptionsRequest(scope.GetLaunchTemplate().PrivateDNSName)
 
 	// Set up root volume
 	if lt.RootVolume != nil {
@@ -671,7 +671,7 @@ func (s *Service) SDKToLaunchTemplate(d *ec2.LaunchTemplateVersion) (*expinfrav1
 	}
 
 	if v.PrivateDnsNameOptions != nil {
-		i.PrivateDNSNameOptions = &infrav1.PrivateDNSNameOptions{
+		i.PrivateDNSName = &infrav1.PrivateDNSName{
 			EnableResourceNameDNSAAAARecord: v.PrivateDnsNameOptions.EnableResourceNameDnsAAAARecord,
 			EnableResourceNameDNSARecord:    v.PrivateDnsNameOptions.EnableResourceNameDnsARecord,
 			HostnameType:                    v.PrivateDnsNameOptions.HostnameType,
@@ -924,14 +924,14 @@ func getLaunchTemplateInstanceMarketOptionsRequest(spotMarketOptions *infrav1.Sp
 	return launchTemplateInstanceMarketOptionsRequest
 }
 
-func getLaunchTemplatePrivateDNSNameOptionsRequest(privateDNSNameOptions *infrav1.PrivateDNSNameOptions) *ec2.LaunchTemplatePrivateDnsNameOptionsRequest {
-	if privateDNSNameOptions == nil {
+func getLaunchTemplatePrivateDNSNameOptionsRequest(privateDNSName *infrav1.PrivateDNSName) *ec2.LaunchTemplatePrivateDnsNameOptionsRequest {
+	if privateDNSName == nil {
 		return nil
 	}
 
 	return &ec2.LaunchTemplatePrivateDnsNameOptionsRequest{
-		EnableResourceNameDnsAAAARecord: privateDNSNameOptions.EnableResourceNameDNSAAAARecord,
-		EnableResourceNameDnsARecord:    privateDNSNameOptions.EnableResourceNameDNSARecord,
-		HostnameType:                    privateDNSNameOptions.HostnameType,
+		EnableResourceNameDnsAAAARecord: privateDNSName.EnableResourceNameDNSAAAARecord,
+		EnableResourceNameDnsARecord:    privateDNSName.EnableResourceNameDNSARecord,
+		HostnameType:                    privateDNSName.HostnameType,
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {`
`48`	`48`	`if restored.Status.Bastion != nil {`
`49`	`49`	`dst.Status.Bastion.InstanceMetadataOptions = restored.Status.Bastion.InstanceMetadataOptions`
`50`	`50`	`dst.Status.Bastion.PlacementGroupName = restored.Status.Bastion.PlacementGroupName`
`51`		`- dst.Status.Bastion.PrivateDNSNameOptions = restored.Status.Bastion.PrivateDNSNameOptions`
	`51`	`+ dst.Status.Bastion.PrivateDNSName = restored.Status.Bastion.PrivateDNSName`
`52`	`52`	`}`
`53`	`53`	`dst.Spec.Partition = restored.Spec.Partition`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -115,14 +115,14 @@ func (r *AWSMachine) ValidateUpdate(old runtime.Object) (admission.Warnings, err`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`// allow changes to enableResourceNameDNSAAAARecord and enableResourceNameDNSARecord`
`118`		`- if privateDNSNameOptions, ok := oldAWSMachineSpec["privateDnsNameOptions"].(map[string]interface{}); ok {`
`119`		`- delete(privateDNSNameOptions, "enableResourceNameDnsAAAARecord")`
`120`		`- delete(privateDNSNameOptions, "enableResourceNameDnsARecord")`
	`118`	`+ if privateDNSName, ok := oldAWSMachineSpec["privateDnsName"].(map[string]interface{}); ok {`
	`119`	`+ delete(privateDNSName, "enableResourceNameDnsAAAARecord")`
	`120`	`+ delete(privateDNSName, "enableResourceNameDnsARecord")`
`121`	`121`	`}`
`122`	`122`
`123`		`- if privateDNSNameOptions, ok := newAWSMachineSpec["privateDnsNameOptions"].(map[string]interface{}); ok {`
`124`		`- delete(privateDNSNameOptions, "enableResourceNameDnsAAAARecord")`
`125`		`- delete(privateDNSNameOptions, "enableResourceNameDnsARecord")`
	`123`	`+ if privateDNSName, ok := newAWSMachineSpec["privateDnsName"].(map[string]interface{}); ok {`
	`124`	`+ delete(privateDNSName, "enableResourceNameDnsAAAARecord")`
	`125`	`+ delete(privateDNSName, "enableResourceNameDnsARecord")`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`if !cmp.Equal(oldAWSMachineSpec, newAWSMachineSpec) {`