From 31a5333548543142dfc547c2cc0b292b21cc36c5 Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Tue, 6 Dec 2016 11:45:41 +0100
Subject: [PATCH] Update client generator

---
 .../client-gen/generators/fake/generator_fake_for_type.go   | 3 ++-
 cmd/libs/go2idl/client-gen/generators/generator_for_type.go | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go
index 72cfc42713a..66fd31cef97 100644
--- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go
+++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go
@@ -150,6 +150,7 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io.
 		m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "DeleteOptions"})
 		m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "ListOptions"})
 	}
+	m["GetOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/apis/meta/v1", Name: "GetOptions"})
 
 	noMethods := extractBoolTagOrDie("noMethods", t.SecondClosestCommentLines) == true
 
@@ -239,7 +240,7 @@ func (c *Fake$.type|publicPlural$) List(opts $.ListOptions|raw$) (result *$.type
 `
 
 var getTemplate = `
-func (c *Fake$.type|publicPlural$) Get(name string) (result *$.type|raw$, err error) {
+func (c *Fake$.type|publicPlural$) Get(name string, options $.GetOptions|raw$) (result *$.type|raw$, err error) {
 	obj, err := c.Fake.
 		$if .namespaced$Invokes($.NewGetAction|raw$($.type|allLowercasePlural$Resource, c.ns, name), &$.type|raw${})
 		$else$Invokes($.NewRootGetAction|raw$($.type|allLowercasePlural$Resource, name), &$.type|raw${})$end$
diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go
index 1b07b5c5221..bfcc63d820d 100644
--- a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go
+++ b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go
@@ -97,6 +97,7 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i
 		m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "DeleteOptions"})
 		m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "ListOptions"})
 	}
+	m["GetOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/apis/meta/v1", Name: "GetOptions"})
 
 	sw.Do(getterComment, m)
 	if namespaced {
@@ -176,7 +177,7 @@ var interfaceUpdateStatusTemplate = `
 var interfaceTemplate3 = `
 	Delete(name string, options *$.DeleteOptions|raw$) error
 	DeleteCollection(options *$.DeleteOptions|raw$, listOptions $.ListOptions|raw$) error
-	Get(name string) (*$.type|raw$, error)
+	Get(name string, options $.GetOptions|raw$) (*$.type|raw$, error)
 	List(opts $.ListOptions|raw$) (*$.type|raw$List, error)
 	Watch(opts $.ListOptions|raw$) ($.watchInterface|raw$, error)
 	Patch(name string, pt $.PatchType|raw$, data []byte, subresources ...string) (result *$.type|raw$, err error)`
@@ -237,12 +238,13 @@ func (c *$.type|privatePlural$) List(opts $.ListOptions|raw$) (result *$.type|ra
 `
 var getTemplate = `
 // Get takes name of the $.type|private$, and returns the corresponding $.type|private$ object, and an error if there is any.
-func (c *$.type|privatePlural$) Get(name string) (result *$.type|raw$, err error) {
+func (c *$.type|privatePlural$) Get(name string, options $.GetOptions|raw$) (result *$.type|raw$, err error) {
 	result = &$.type|raw${}
 	err = c.client.Get().
 		$if .namespaced$Namespace(c.ns).$end$
 		Resource("$.type|allLowercasePlural$").
 		Name(name).
+		VersionedParams(&options, $.apiParameterCodec|raw$).
 		Do().
 		Into(result)
 	return