Merge pull request #3795 from RolandMa1986/fix-crd

add RawExtension type annotation

config/crds/iam.kubesphere.io_rolebases.yaml

@@ -32,6 +32,8 @@ spec:
             type: object
           role:
             type: object
+            x-kubernetes-embedded-resource: true
+            x-kubernetes-preserve-unknown-fields: true
         required:
         - role
         type: object

config/crds/tenant.kubesphere.io_workspacetemplates.yaml

@@ -47,6 +47,7 @@ spec:
                             type: string
                           value:
                             type: object
+                            x-kubernetes-preserve-unknown-fields: true
                         required:
                         - path
                         type: object

staging/src/kubesphere.io/api/iam/v1alpha2/types.go

@@ -283,7 +283,8 @@ type WorkspaceRoleBindingList struct {
 type RoleBase struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:EmbeddedResource
 	Role runtime.RawExtension `json:"role"`
 }
 

staging/src/kubesphere.io/api/types/v1beta1/types.go

@@ -44,8 +44,9 @@ type GenericPlacement struct {
 }
 
 type ClusterOverride struct {
-	Op    string               `json:"op,omitempty"`
-	Path  string               `json:"path"`
+	Op   string `json:"op,omitempty"`
+	Path string `json:"path"`
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Value runtime.RawExtension `json:"value,omitempty"`
 }