From a09ae42c0ec2af8ad13268cbeb86faf6383118a5 Mon Sep 17 00:00:00 2001 From: Huanle Han Date: Sat, 22 Aug 2020 16:47:30 +0800 Subject: [PATCH] chore(vendor): update clientset (#193) --- Gopkg.lock | 4 ++-- .../pkg/apis/loadbalance/v1alpha2/types.go | 22 +++++++++++++----- .../v1alpha2/zz_generated.deepcopy.go | 23 ++++++++++++++++++- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index d4eb5d787..b2538508c 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -11,7 +11,7 @@ [[projects]] branch = "release-1.14-oem-infinitus" - digest = "1:cd41fe867efaa7da0b35d9324259c0fa81105cd91ff326e4bc5639f410737eca" + digest = "1:97727802fac64ef11f2c5cdd1a575f881d8a5bc35152ce2cf802356807466dd5" name = "github.com/caicloud/clientset" packages = [ "informers", @@ -152,7 +152,7 @@ "util/syncqueue", ] pruneopts = "NUT" - revision = "d287992bac5e7a4dbaac26d360de6d267a34c846" + revision = "1cafed682cc3d6a47825758cba5b28d602bbbf5b" [[projects]] digest = "1:c0eec4f5d71d69aace7ac33d0b787f03825baa0ac9528a14c066e356121070a0" diff --git a/vendor/github.com/caicloud/clientset/pkg/apis/loadbalance/v1alpha2/types.go b/vendor/github.com/caicloud/clientset/pkg/apis/loadbalance/v1alpha2/types.go index 602a8ea0e..ed5616194 100644 --- a/vendor/github.com/caicloud/clientset/pkg/apis/loadbalance/v1alpha2/types.go +++ b/vendor/github.com/caicloud/clientset/pkg/apis/loadbalance/v1alpha2/types.go @@ -128,14 +128,24 @@ type ExternalProvider struct { // F5Provider is a f5 provider type F5Provider struct { - // VIP - VIP string `json:"vip"` // Name in cluster - Name string `json:"name,omitemtpy"` + Name string `json:"name,omitempty"` // Alias name of f5 - Alias string `json:"alias,omitemtpy"` - // VirtualServerName - VirtualServerName string `json:"virtualServerName,omitempty"` + Alias string `json:"alias,omitempty"` + // LTM virtual server list + ServerList []LTMServer `json:"serverList,omitempty"` +} + +// LTMServer represent a server in F5-LTM +type LTMServer struct { + // ip of server + IP string `json:"ip,omitempty"` + // virtual server name + VirtualServer string `json:"virtualServer,omitempty"` + // irule name + IRule string `json:"irule,omitempty"` + // Type + Type string `json:"type,omitempty"` } // IpvsdrProvider is a ipvs dr provider diff --git a/vendor/github.com/caicloud/clientset/pkg/apis/loadbalance/v1alpha2/zz_generated.deepcopy.go b/vendor/github.com/caicloud/clientset/pkg/apis/loadbalance/v1alpha2/zz_generated.deepcopy.go index 35859cba9..de5b6ff85 100644 --- a/vendor/github.com/caicloud/clientset/pkg/apis/loadbalance/v1alpha2/zz_generated.deepcopy.go +++ b/vendor/github.com/caicloud/clientset/pkg/apis/loadbalance/v1alpha2/zz_generated.deepcopy.go @@ -191,6 +191,11 @@ func (in *ExternalProvider) DeepCopy() *ExternalProvider { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *F5Provider) DeepCopyInto(out *F5Provider) { *out = *in + if in.ServerList != nil { + in, out := &in.ServerList, &out.ServerList + *out = make([]LTMServer, len(*in)) + copy(*out, *in) + } return } @@ -266,6 +271,22 @@ func (in *IpvsdrProviderStatus) DeepCopy() *IpvsdrProviderStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *LTMServer) DeepCopyInto(out *LTMServer) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LTMServer. +func (in *LTMServer) DeepCopy() *LTMServer { + if in == nil { + return nil + } + out := new(LTMServer) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LoadBalancer) DeepCopyInto(out *LoadBalancer) { *out = *in @@ -484,7 +505,7 @@ func (in *ProvidersSpec) DeepCopyInto(out *ProvidersSpec) { if in.F5 != nil { in, out := &in.F5, &out.F5 *out = new(F5Provider) - **out = **in + (*in).DeepCopyInto(*out) } return }