github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10892 from nikhiljindal/beta1

Browse Source 
Removing references to pre v1beta3 apis in code
This commit is contained in:
Vish Kannan
2015-07-23 17:05:43 -07:00
parent 2a10eabfdf fc4da6844e
commit 136d53466a
20 changed files with 60 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/config/common.go
View File

@@ -69,14 +69,10 @@ func applyDefaults(pod *api.Pod, source string, isFile bool, nodeName string) er
func getSelfLink(name, namespace string) string {
var selfLink string
if api.PreV1Beta3(latest.Version) {
selfLink = fmt.Sprintf("/api/"+latest.Version+"/pods/%s?namespace=%s", name, namespace)
} else {
if len(namespace) == 0 {
namespace = api.NamespaceDefault
}
selfLink = fmt.Sprintf("/api/"+latest.Version+"/pods/namespaces/%s/%s", name, namespace)
if len(namespace) == 0 {
namespace = api.NamespaceDefault
}
selfLink = fmt.Sprintf("/api/"+latest.Version+"/pods/namespaces/%s/%s", name, namespace)
return selfLink
}