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

Merge pull request #129 from justinsb/upup_mark_gce_maybe_borked 

upup: Mark GCE as probably-not-working
This commit is contained in:
Justin Santa Barbara 2016-06-23 10:30:02 -04:00 committed by GitHub
parent 506d0d555a 1737f7dadb
commit 1bc19ca0ed
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
upup/cmd/cloudup/main.go
View File

@ -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")

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)