From 3185a3fe5c9d9e9a83be8a9a273389d03d8ae8fc Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 23 Jun 2016 10:17:17 -0400 Subject: [PATCH 1/2] Fix upgrade --- upup/pkg/kutil/upgrade_cluster.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upup/pkg/kutil/upgrade_cluster.go b/upup/pkg/kutil/upgrade_cluster.go index 08a95f494c..cd16a2e8a6 100644 --- a/upup/pkg/kutil/upgrade_cluster.go +++ b/upup/pkg/kutil/upgrade_cluster.go @@ -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) From 1737f7dadb3b7787479538cf6b018337d4874357 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 23 Jun 2016 10:18:17 -0400 Subject: [PATCH 2/2] upup: temporarily mark GCE as not-necessarily working It's lagging a bit, so fail early --- upup/cmd/cloudup/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/upup/cmd/cloudup/main.go b/upup/cmd/cloudup/main.go index 25daf7793f..3a547fe280 100644 --- a/upup/cmd/cloudup/main.go +++ b/upup/cmd/cloudup/main.go @@ -446,6 +446,7 @@ func (c *CreateClusterCmd) Run() error { switch c.Config.CloudProvider { case "gce": { + glog.Fatalf("GCE is (probably) not working currently - please ping @justinsb for cleanup") tags["_gce"] = struct{}{} c.Config.NodeUpTags = append(c.Config.NodeUpTags, "_gce")