From 28ccf9cdf4eec23f8cb7e0a7cf514f2a39b4af3c Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 4 Jan 2017 09:38:42 -0800 Subject: [PATCH] Remove KOPS_URL fallback Not needed after kubernetes/test-infra#1482 --- upup/pkg/fi/cloudup/urls.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/upup/pkg/fi/cloudup/urls.go b/upup/pkg/fi/cloudup/urls.go index 05b206d1b7..336d529ed1 100644 --- a/upup/pkg/fi/cloudup/urls.go +++ b/upup/pkg/fi/cloudup/urls.go @@ -17,10 +17,11 @@ limitations under the License. package cloudup import ( - "github.com/golang/glog" - "k8s.io/kops" "os" "strings" + + "github.com/golang/glog" + "k8s.io/kops" ) // baseUrl caches the BaseUrl value @@ -33,15 +34,7 @@ func BaseUrl() string { return baseUrl } - // We prefer KOPS_BASE_URL, but we will accept KOPS_URL (for now!) baseUrl = os.Getenv("KOPS_BASE_URL") - if baseUrl == "" { - baseUrl = os.Getenv("KOPS_URL") - if baseUrl != "" { - glog.Warningf("Using deprecated KOPS_URL envrionment variable - please use KOPS_BASE_URL instead") - } - } - if baseUrl == "" { baseUrl = "https://kubeupv2.s3.amazonaws.com/kops/" + kops.Version + "/" glog.V(4).Infof("Using default base url: %q", baseUrl)