Merge pull request #4258 from k8s-infra-cherrypick-robot/cherry-pick-4256-to-release-2.1

[release-2.1] 🐛 Allow the defaulting of InstanceMetadataOptions to go through for AWSMachineTemplates

Author: k8s-ci-robot

api/v1beta2/awsmachinetemplate_webhook.go

@@ -227,7 +227,15 @@ func (r *AWSMachineTemplateWebhook) ValidateUpdate(ctx context.Context, oldRaw r
 	var allErrs field.ErrorList
 
 	if !topology.ShouldSkipImmutabilityChecks(req, newAWSMachineTemplate) && !cmp.Equal(newAWSMachineTemplate.Spec, oldAWSMachineTemplate.Spec) {
-		allErrs = append(allErrs, field.Invalid(field.NewPath("spec"), newAWSMachineTemplate, "AWSMachineTemplate.Spec is immutable"))
+		if oldAWSMachineTemplate.Spec.Template.Spec.InstanceMetadataOptions == nil {
+			oldAWSMachineTemplate.Spec.Template.Spec.InstanceMetadataOptions = newAWSMachineTemplate.Spec.Template.Spec.InstanceMetadataOptions
+		}
+
+		if !cmp.Equal(newAWSMachineTemplate.Spec.Template.Spec, oldAWSMachineTemplate.Spec.Template.Spec) {
+			allErrs = append(allErrs,
+				field.Invalid(field.NewPath("spec", "template", "spec"), newAWSMachineTemplate, "AWSMachineTemplate.Spec is immutable"),
+			)
+		}
 	}
 
 	return aggregateObjErrors(newAWSMachineTemplate.GroupVersionKind().GroupKind(), newAWSMachineTemplate.Name, allErrs)

api/v1beta2/awsmachinetemplate_webhook_test.go

@@ -116,6 +116,27 @@ func TestAWSMachineTemplateValidateUpdate(t *testing.T) {
 			},
 			wantError: true,
 		},
+		{
+			name: "allow defaulted values to update",
+			modifiedTemplate: &AWSMachineTemplate{
+				ObjectMeta: metav1.ObjectMeta{},
+				Spec: AWSMachineTemplateSpec{
+					Template: AWSMachineTemplateResource{
+						Spec: AWSMachineSpec{
+							CloudInit:    CloudInit{},
+							InstanceType: "test",
+							InstanceMetadataOptions: &InstanceMetadataOptions{
+								HTTPEndpoint:            InstanceMetadataEndpointStateEnabled,
+								HTTPPutResponseHopLimit: 1,
+								HTTPTokens:              HTTPTokensStateRequired,
+								InstanceMetadataTags:    InstanceMetadataEndpointStateDisabled,
+							},
+						},
+					},
+				},
+			},
+			wantError: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {