Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -1873,24 +1873,22 @@ func (n *Network) TableEventRegister(tableName string, objType driverapi.ObjectT |
| 1873 | 1873 |
return fmt.Errorf("invalid object type %v in registering table, %s", objType, tableName)
|
| 1874 | 1874 |
} |
| 1875 | 1875 |
|
| 1876 |
- t := networkDBTable{
|
|
| 1877 |
- name: tableName, |
|
| 1878 |
- objType: objType, |
|
| 1879 |
- } |
|
| 1880 | 1876 |
n.mu.Lock() |
| 1881 | 1877 |
defer n.mu.Unlock() |
| 1882 |
- n.driverTables = append(n.driverTables, t) |
|
| 1878 |
+ n.driverTables = append(n.driverTables, networkDBTable{
|
|
| 1879 |
+ name: tableName, |
|
| 1880 |
+ objType: objType, |
|
| 1881 |
+ }) |
|
| 1883 | 1882 |
return nil |
| 1884 | 1883 |
} |
| 1885 | 1884 |
|
| 1886 | 1885 |
func (n *Network) UpdateIpamConfig(ipV4Data []driverapi.IPAMData) {
|
| 1887 | 1886 |
ipamV4Config := make([]*IpamConf, len(ipV4Data)) |
| 1888 |
- |
|
| 1889 | 1887 |
for i, data := range ipV4Data {
|
| 1890 |
- ic := &IpamConf{}
|
|
| 1891 |
- ic.PreferredPool = data.Pool.String() |
|
| 1892 |
- ic.Gateway = data.Gateway.IP.String() |
|
| 1893 |
- ipamV4Config[i] = ic |
|
| 1888 |
+ ipamV4Config[i] = &IpamConf{
|
|
| 1889 |
+ PreferredPool: data.Pool.String(), |
|
| 1890 |
+ Gateway: data.Gateway.IP.String(), |
|
| 1891 |
+ } |
|
| 1894 | 1892 |
} |
| 1895 | 1893 |
|
| 1896 | 1894 |
n.mu.Lock() |
| ... | ... |
@@ -2046,11 +2044,10 @@ func (n *Network) ResolveService(ctx context.Context, name string) ([]*net.SRV, |
| 2046 | 2046 |
continue |
| 2047 | 2047 |
} |
| 2048 | 2048 |
for _, t := range svc.target {
|
| 2049 |
- srv = append(srv, |
|
| 2050 |
- &net.SRV{
|
|
| 2051 |
- Target: t.name, |
|
| 2052 |
- Port: t.port, |
|
| 2053 |
- }) |
|
| 2049 |
+ srv = append(srv, &net.SRV{
|
|
| 2050 |
+ Target: t.name, |
|
| 2051 |
+ Port: t.port, |
|
| 2052 |
+ }) |
|
| 2054 | 2053 |
|
| 2055 | 2054 |
ip = append(ip, t.ip) |
| 2056 | 2055 |
} |