kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Subnet Update Consistency 

Executing gofmt
This commit is contained in:
Derek Lemon (delemon) 2019-05-10 14:24:13 -06:00
parent 1703962472
commit 59fb88775d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/model/openstackmodel/network.go
View File

@ -57,10 +57,11 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
for _, sp := range b.Cluster.Spec.Subnets {
subnetName := sp.Name + "." + b.ClusterName()
t := &openstacktasks.Subnet{
Name: s(subnetName),
Network: b.LinkToNetwork(),
CIDR: s(sp.CIDR),
Lifecycle: b.Lifecycle,
Name: s(subnetName),
Network: b.LinkToNetwork(),
CIDR: s(sp.CIDR),
DNSServers: make([]*string, 0),
Lifecycle: b.Lifecycle,
}
if b.Cluster.Spec.CloudConfig.Openstack.Router.DNSServers != nil {
dnsSplitted := strings.Split(fi.StringValue(b.Cluster.Spec.CloudConfig.Openstack.Router.DNSServers), ",")

6
upup/pkg/fi/cloudup/openstacktasks/subnet.go
View File

@ -120,13 +120,13 @@ func (_ *Subnet) CheckChanges(a, e, changes *Subnet) error {
if changes.Name != nil {
return fi.CannotChangeField("Name")
}
if e.DNSServers != nil {
if changes.DNSServers != nil {
return fi.CannotChangeField("DNSServers")
}
if e.Network != nil {
if changes.Network != nil {
return fi.CannotChangeField("Network")
}
if e.CIDR != nil {
if changes.CIDR != nil {
return fi.CannotChangeField("CIDR")
}
}