Merge pull request #420 from vmware/cluster-import-fix

Handle x-kubernetes-preserve-unknown-fields in import

Author: ankitsny

internal/helper/openapi_v3_schema_validator/openapi_v3_schema_validator.go

@@ -22,6 +22,7 @@ const (
 	PropertiesKey           OpenAPIV3Key = "properties"
 	TypeKey                 OpenAPIV3Key = "type"
 	AdditionalPropertiesKey OpenAPIV3Key = "additionalProperties"
+	PreserveUnknownFieldKey OpenAPIV3Key = "x-kubernetes-preserve-unknown-fields"
 	ItemsKey                OpenAPIV3Key = "items"
 	PatternKey              OpenAPIV3Key = "pattern"
 	MinLengthKey            OpenAPIV3Key = "minLength"

internal/resources/tanzukubernetescluster/helper.go

@@ -460,15 +460,20 @@ func removeModelVariable(clusterClassSchema interface{}, modelVariable interface
 				}
 			}
 		} else {
-			modelVarAdditionalProperties := clusterClassSchema.(map[string]interface{})[string(openapiv3.AdditionalPropertiesKey)]
-			_, propertiesExist := modelVarAdditionalProperties.(map[string]interface{})[string(openapiv3.PropertiesKey)]
+			modelVarAdditionalProperties, additionalPropertiesExist := clusterClassSchema.(map[string]interface{})[string(openapiv3.AdditionalPropertiesKey)]
+			preserve, preserveExists := clusterClassSchema.(map[string]interface{})[string(openapiv3.PreserveUnknownFieldKey)]
+			if additionalPropertiesExist {
+				_, propertiesExist := modelVarAdditionalProperties.(map[string]interface{})[string(openapiv3.PropertiesKey)]
 
-			if propertiesExist {
-				modelVariable = make(map[string]interface{})
+				if propertiesExist {
+					modelVariable = make(map[string]interface{})
 
-				for k, v := range modelVariableMap {
-					modelVariable.(map[string]interface{})[k] = removeModelVariable(modelVarAdditionalProperties, v)
+					for k, v := range modelVariableMap {
+						modelVariable.(map[string]interface{})[k] = removeModelVariable(modelVarAdditionalProperties, v)
+					}
 				}
+			} else if !preserveExists || !preserve.(bool) {
+				modelVariable = make(map[string]interface{})
 			}
 		}
 	}