admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use istio client-go library instead of knative (#1661)

Browse Source 
use istio client-go library instead of knative
bump kubernetes dependency version
change code coverage to codecov
This commit is contained in:
zryfish
2019-12-13 11:26:18 +08:00
committed by GitHub
parent f249a6e081
commit ea88c8803d
2071 changed files with 354531 additions and 108336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vendor/github.com/projectcalico/libcalico-go/lib/clientv3/node.go generated vendored
View File

@@ -115,6 +115,32 @@ func (r nodes) Delete(ctx context.Context, name string, opts options.DeleteOptio
}
}
}
// Add in tunnel addresses if they exist for the node.
if n, err := r.client.Nodes().Get(ctx, name, options.GetOptions{}); err != nil {
if _, ok := err.(errors.ErrorResourceDoesNotExist); !ok {
return nil, err
}
// Resource does not exist, carry on and clean up as much as we can.
} else {
if n.Spec.BGP != nil && n.Spec.BGP.IPv4IPIPTunnelAddr != "" {
ipAddr, _, err := cnet.ParseCIDROrIP(n.Spec.BGP.IPv4IPIPTunnelAddr)
if err == nil {
ips = append(ips, *ipAddr)
} else {
log.WithError(err).Warnf("Failed to parse IPIP tunnel address CIDR: %s", n.Spec.BGP.IPv4IPIPTunnelAddr)
}
}
if n.Spec.IPv4VXLANTunnelAddr != "" {
ipAddr, _, err := cnet.ParseCIDROrIP(n.Spec.IPv4VXLANTunnelAddr)
if err == nil {
ips = append(ips, *ipAddr)
} else {
log.WithError(err).Warnf("Failed to parse VXLAN tunnel address CIDR: %s", n.Spec.IPv4VXLANTunnelAddr)
}
}
}
_, err = r.client.IPAM().ReleaseIPs(context.Background(), ips)
switch err.(type) {
case nil, errors.ErrorResourceDoesNotExist, errors.ErrorOperationNotSupported: