Skip to content

Commit

Permalink
fix: properly propagate nameservers to provisioned docker clusters
Browse files Browse the repository at this point in the history
This was failed refactoring to the new config options.

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
  • Loading branch information
smira authored and talos-bot committed Mar 5, 2021
1 parent f4ca6e9 commit e8e91d6
Showing 1 changed file with 9 additions and 22 deletions.
31 changes: 9 additions & 22 deletions pkg/provision/providers/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,31 +45,18 @@ func (p *provisioner) Close() error {

// GenOptions provides a list of additional config generate options.
func (p *provisioner) GenOptions(networkReq provision.NetworkRequest) []generate.GenOption {
ret := []generate.GenOption{
generate.WithPersist(false),
}

networkConfig := &v1alpha1.NetworkConfig{
NetworkInterfaces: []*v1alpha1.Device{
{
DeviceInterface: "eth0",
DeviceIgnore: true,
},
},
nameservers := make([]string, len(networkReq.Nameservers))
for i := range nameservers {
nameservers[i] = networkReq.Nameservers[i].String()
}

if len(networkReq.Nameservers) > 0 {
nameservers := make([]string, len(networkReq.Nameservers))
for i := range nameservers {
nameservers[i] = networkReq.Nameservers[i].String()
}

networkConfig.NameServers = nameservers
return []generate.GenOption{
generate.WithPersist(false),
generate.WithNetworkOptions(
v1alpha1.WithNetworkInterfaceIgnore("eth0"),
v1alpha1.WithNetworkNameservers(nameservers...),
),
}

ret = append(ret, generate.WithNetworkOptions(v1alpha1.WithNetworkInterfaceIgnore("eth0")))

return ret
}

// GetLoadBalancers returns internal/external loadbalancer endpoints.
Expand Down

0 comments on commit e8e91d6

Please sign in to comment.