Merge pull request crossplane-contrib#2207 from rayshoo/master

fix(crd/ec2/instance): Remove unnecessary required fields to enable use of launchTemplate

Author: MisterMX

apis/ec2/manualv1alpha1/common.go

@@ -640,10 +640,12 @@ type LicenseConfigurationRequest struct {
 // name in the request, but not both.
 type LaunchTemplateSpecification struct {
 	// The ID of the launch template.
-	LaunchTemplateID *string `json:"launchTemplateId"`
+	// +optional
+	LaunchTemplateID *string `json:"launchTemplateId,omitempty"`
 
 	// The name of the launch template.
-	LaunchTemplateName *string `json:"launchTemplateName"`
+	// +optional
+	LaunchTemplateName *string `json:"launchTemplateName,omitempty"`
 
 	// The version number of the launch template.
 	//

apis/ec2/manualv1alpha1/instances_types.go

@@ -107,7 +107,8 @@ type InstanceParameters struct {
 
 	// The ID of the AMI. An AMI ID is required to launch an instance and must be
 	// specified here or in a launch template.
-	ImageID *string `json:"imageId"`
+	// +optional
+	ImageID *string `json:"imageId,omitempty"`
 
 	// Indicates whether an instance stops or terminates when you initiate shutdown
 	// from the instance (using the operating system command for system shutdown).

package/crds/ec2.aws.crossplane.io_instances.yaml

@@ -604,9 +604,6 @@ spec:
 
                           Default: The default version for the launch template.
                         type: string
-                    required:
-                    - launchTemplateId
-                    - launchTemplateName
                     type: object
                   licenseSpecifications:
                     description: The Amazon Resource Name (ARN) of the license configuration
@@ -1221,7 +1218,6 @@ spec:
                     pattern: ^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$
                     type: string
                 required:
-                - imageId
                 - region
                 type: object
               managementPolicies: