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

Remove KOPS_URL fallback 

Not needed after kubernetes/test-infra#1482
This commit is contained in:
Zach Loafman 2017-01-04 09:38:42 -08:00
parent 7079729f26
commit 28ccf9cdf4
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
upup/pkg/fi/cloudup/urls.go
View File

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