From 0e1710e910da4dff1ef108fb9aeeb7ab804054f4 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 22 Jun 2016 12:59:51 -0700 Subject: [PATCH] Autoscaler: Super hacky workaround for GCE provider crashloop Fix to https://github.com/kubernetes/kubernetes/issues/27821. Borrows the necessary piece of https://github.com/kubernetes/kubernetes/pull/27741 to parse the gce.conf. Also opened https://github.com/kubernetes/contrib/issues/1251 to fix Godeps correctly --- cluster-autoscaler/Godeps/Godeps.json | 4 ++-- .../pkg/cloudprovider/providers/gce/gce.go | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cluster-autoscaler/Godeps/Godeps.json b/cluster-autoscaler/Godeps/Godeps.json index 8f435b13cccc..5bdeb7b3ddd0 100644 --- a/cluster-autoscaler/Godeps/Godeps.json +++ b/cluster-autoscaler/Godeps/Godeps.json @@ -910,8 +910,8 @@ }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/gce", - "Comment": "v1.3.0-alpha.4-830-g8a29f67", - "Rev": "8a29f67fc1a3c6e107ce0d70a8e643b99b765e0a" + "Comment": "v1.3.0-alpha.4-830-g8a29f67 (MANUALLY MODIFIED)", + "Rev": "8a29f67fc1a3c6e107ce0d70a8e643b99b765e0a-dirty" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller", diff --git a/cluster-autoscaler/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go b/cluster-autoscaler/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go index 9acd412732f8..629ff6b614c0 100644 --- a/cluster-autoscaler/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go +++ b/cluster-autoscaler/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go @@ -91,12 +91,13 @@ type GCECloud struct { type Config struct { Global struct { - TokenURL string `gcfg:"token-url"` - TokenBody string `gcfg:"token-body"` - ProjectID string `gcfg:"project-id"` - NetworkName string `gcfg:"network-name"` - NodeTags []string `gcfg:"node-tags"` - Multizone bool `gcfg:"multizone"` + TokenURL string `gcfg:"token-url"` + TokenBody string `gcfg:"token-body"` + ProjectID string `gcfg:"project-id"` + NetworkName string `gcfg:"network-name"` + NodeTags []string `gcfg:"node-tags"` + NodeInstancePrefix string `gcfg:"node-instance-prefix"` // Ignored. (Manual vendor/ patch.) + Multizone bool `gcfg:"multizone"` } }