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

Merge pull request #17535 from mesosphere/jdef_abspath_breaks_proxies

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-20 21:46:47 -08:00
parent 4e04a289d8 75f487f7bf
commit 03ecde1277
17 changed files with 158 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/libs/go2idl/client-gen/generators/generator-for-group.go
View File

@@ -55,7 +55,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer
sw := generator.NewSnippetWriter(w, c, "$", "$")
const pkgUnversioned = "k8s.io/kubernetes/pkg/client/unversioned"
const pkgLatest = "k8s.io/kubernetes/pkg/api/latest"
prefix := func(group string) string {
apiPath := func(group string) string {
if group == "legacy" {
return `"/api"`
}
@@ -80,7 +80,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer
"RESTClientFor": c.Universe.Function(types.Name{Package: pkgUnversioned, Name: "RESTClientFor"}),
"latestGroup": c.Universe.Variable(types.Name{Package: pkgLatest, Name: "Group"}),
"GroupOrDie": c.Universe.Variable(types.Name{Package: pkgLatest, Name: "GroupOrDie"}),
"prefix": prefix(g.group),
"apiPath": apiPath(g.group),
}
sw.Do(groupInterfaceTemplate, m)
sw.Do(groupClientTemplate, m)
@@ -171,7 +171,7 @@ func setConfigDefaults(config *$.Config|raw$) error {
if err != nil {
return err
}
config.Prefix = $.prefix$
config.APIPath = $.apiPath$
if config.UserAgent == "" {
config.UserAgent = $.DefaultKubernetesUserAgent|raw$()
}

2
cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_client.go
View File

@@ -69,7 +69,7 @@ func setConfigDefaults(config *unversioned.Config) error {
if err != nil {
return err
}
config.Prefix = "/apis"
config.APIPath = "/apis"
if config.UserAgent == "" {
config.UserAgent = unversioned.DefaultKubernetesUserAgent()
}