Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

fix ICP list unmarshal issue. #728

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix ICP list unmarshal issue. #728

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/apis/istio/v1alpha2/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ func FromString(val string) IntOrStringForPB {
// IstioControlPlaneList contains a list of IstioControlPlane
type IstioControlPlaneList struct {
v1.TypeMeta `json:",inline"`
v1.ListMeta `json:"metadata,omitempty"`
Items []IstioControlPlane `json:"items"`
v1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata,proto3"`
Items []IstioControlPlane `json:"items" protobuf:"bytes,2,rep,name=items,proto3"`
}

// define new type from protobuf.BoolValue to marshal/unmarshal jsonpb
Expand Down