github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13879 from krousey/etcd_prefix_default

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-15 16:19:31 -07:00
commit 02c0e091d2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/tools/etcdtest/etcdtest.go
View File

@ -23,7 +23,11 @@ import (
// Returns the prefix set via the ETCD_PREFIX environment variable (if any). // Returns the prefix set via the ETCD_PREFIX environment variable (if any).
func PathPrefix() string { func PathPrefix() string {
return path.Join("/", os.Getenv("ETCD_PREFIX")) pref := os.Getenv("ETCD_PREFIX")
if pref == "" {
pref = "registry"
}
return path.Join("/", pref)
} }
// Adds the ETCD_PREFIX to the provided key // Adds the ETCD_PREFIX to the provided key