Merge pull request #5853 from cybozu-go/fix-parameter-fields-of-crds

ceph: fix the parameters fields of cephfilesystem crd and cephblockpool crd

cluster/charts/rook-ceph/templates/resources.yaml

@@ -287,8 +287,8 @@ spec:
                     - passive
                     - aggressive
                     - force
-                parameters:
-                  type: object
+                  parameters:
+                    type: object
             preservePoolsOnDelete:
               type: boolean
   subresources:
@@ -559,8 +559,6 @@ spec:
               - force
             parameters:
               type: object
-            parameters:
-              type: object
   subresources:
     status: {}
 ---

pkg/apis/ceph.rook.io/v1/zz_generated.deepcopy.go

@@ -562,7 +562,7 @@ func (in *CephObjectStoreUser) DeepCopyInto(out *CephObjectStoreUser) {
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
 		*out = new(ObjectStoreUserStatus)
-		**out = **in
+		(*in).DeepCopyInto(*out)
 	}
 	return
 }
@@ -946,7 +946,7 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 	in.Mon.DeepCopyInto(&out.Mon)
 	out.CrashCollector = in.CrashCollector
 	out.Dashboard = in.Dashboard
-	out.Monitoring = in.Monitoring
+	in.Monitoring.DeepCopyInto(&out.Monitoring)
 	out.External = in.External
 	in.Mgr.DeepCopyInto(&out.Mgr)
 	out.CleanupPolicy = in.CleanupPolicy
@@ -1379,6 +1379,13 @@ func (in *MonSpec) DeepCopy() *MonSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *MonitoringSpec) DeepCopyInto(out *MonitoringSpec) {
 	*out = *in
+	if in.ExternalMgrEndpoints != nil {
+		in, out := &in.ExternalMgrEndpoints, &out.ExternalMgrEndpoints
+		*out = make([]corev1.EndpointAddress, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 	return
 }
 
@@ -1508,6 +1515,29 @@ func (in *ObjectStoreUserSpec) DeepCopy() *ObjectStoreUserSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ObjectStoreUserStatus) DeepCopyInto(out *ObjectStoreUserStatus) {
+	*out = *in
+	if in.Info != nil {
+		in, out := &in.Info, &out.Info
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ObjectStoreUserStatus.
+func (in *ObjectStoreUserStatus) DeepCopy() *ObjectStoreUserStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ObjectStoreUserStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ObjectZoneGroupSpec) DeepCopyInto(out *ObjectZoneGroupSpec) {
 	*out = *in