diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-08-03 20:25:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-03 20:25:59 +0800 |
| commit | ab1b7054175d625e688123af579160cb708122c2 (patch) | |
| tree | a9a351079b920e4732e3ce26c634dd9910607d53 | |
| parent | Merge pull request #4898 from Shelley-BaoYue/automated-cherry-pick-of-#4882-u... (diff) | |
| parent | Fixed the cloudcore panic caused by the ClusterObjectSyncList item error (diff) | |
| download | kubeedge-ab1b7054175d625e688123af579160cb708122c2.tar.gz | |
Merge pull request #4918 from ZhengXinwei-F/automated-cherry-pick-of-#4915-upstream-release-1.14
Automated cherry pick of #4915: Fixed the cloudcore panic caused by the ClusterObjectSyncList
| -rw-r--r-- | pkg/apis/reliablesyncs/v1alpha1/type.go | 2 | ||||
| -rw-r--r-- | pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/apis/reliablesyncs/v1alpha1/type.go b/pkg/apis/reliablesyncs/v1alpha1/type.go index 01fac7b27..d894a4212 100644 --- a/pkg/apis/reliablesyncs/v1alpha1/type.go +++ b/pkg/apis/reliablesyncs/v1alpha1/type.go @@ -48,7 +48,7 @@ type ClusterObjectSyncList struct { metav1.ListMeta `json:"metadata,omitempty"` // List of ClusterObjectSync. - Items []ObjectSync `json:"items"` + Items []ClusterObjectSync `json:"items"` } // +genclient diff --git a/pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go index b1b8845c6..6da2e1fa0 100644 --- a/pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/reliablesyncs/v1alpha1/zz_generated.deepcopy.go @@ -60,7 +60,7 @@ func (in *ClusterObjectSyncList) DeepCopyInto(out *ClusterObjectSyncList) { in.ListMeta.DeepCopyInto(&out.ListMeta) if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]ObjectSync, len(*in)) + *out = make([]ClusterObjectSync, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } |