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

Fix upgrade

This commit is contained in:
Justin Santa Barbara 2016-06-23 10:17:17 -04:00
parent 506d0d555a
commit 3185a3fe5c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/pkg/kutil/upgrade_cluster.go
View File

@ -51,7 +51,7 @@ func (x *UpgradeCluster) Upgrade() error {
dhcpOptions, err := DescribeDhcpOptions(x.Cloud)
if err != nil {
return nil, err
return err
}
// Find masters
@ -124,7 +124,7 @@ func (x *UpgradeCluster) Upgrade() error {
// Retag DHCP options
// We have to be careful because DHCP options can be shared
for _, dhcpOption := range dhcpOptions {
clusterTag := dhcpOption.Tags[awsup.TagClusterName]
clusterTag, _ := awsup.FindEC2Tag(dhcpOption.Tags, awsup.TagClusterName)
if clusterTag != "" {
if clusterTag != oldClusterName {
return fmt.Errorf("DHCP options are tagged with a different cluster: %v", clusterTag)