diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 89d05ac049..ace22c9733 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -3042,43 +3042,43 @@ }, { "ImportPath": "k8s.io/gengo/args", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/import-boss/generators", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/generators", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/sets", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/generator", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/namer", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/parser", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/types", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/heapster/metrics/api/v1/types", diff --git a/federation/client/clientset_generated/federation_clientset/doc.go b/federation/client/clientset_generated/federation_clientset/doc.go index 3dd8ea7d7d..3ef671cc0d 100644 --- a/federation/client/clientset_generated/federation_clientset/doc.go +++ b/federation/client/clientset_generated/federation_clientset/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package federation_clientset diff --git a/federation/client/clientset_generated/federation_clientset/fake/doc.go b/federation/client/clientset_generated/federation_clientset/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/federation/client/clientset_generated/federation_clientset/scheme/doc.go b/federation/client/clientset_generated/federation_clientset/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/federation/client/clientset_generated/federation_clientset/scheme/doc.go +++ b/federation/client/clientset_generated/federation_clientset/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/doc.go b/pkg/client/clientset_generated/internalclientset/doc.go index 6d5a0d8cb4..b667dd5157 100644 --- a/pkg/client/clientset_generated/internalclientset/doc.go +++ b/pkg/client/clientset_generated/internalclientset/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/pkg/client/clientset_generated/internalclientset/fake/doc.go b/pkg/client/clientset_generated/internalclientset/fake/doc.go index 97d6fe8d4f..3fd8e1e2cd 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/pkg/client/clientset_generated/internalclientset/scheme/doc.go b/pkg/client/clientset_generated/internalclientset/scheme/doc.go index 99b0eae188..3ec2200d09 100644 --- a/pkg/client/clientset_generated/internalclientset/scheme/doc.go +++ b/pkg/client/clientset_generated/internalclientset/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/doc.go index 0a27970fbb..3adf06d893 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/doc.go index a0ecb96ba1..c58fac35e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with the default arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/doc.go index 7d72e7fb20..7f670fed47 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package clientset diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/doc.go index 309c091bfd..b667dd5157 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go index 57e5b70cf5..3adf06d893 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/typed/apiextensions/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/doc.go b/staging/src/k8s.io/client-go/kubernetes/doc.go index 2af84c6699..d8e920a5cd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package kubernetes diff --git a/staging/src/k8s.io/client-go/kubernetes/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/scheme/doc.go b/staging/src/k8s.io/client-go/kubernetes/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/client-go/kubernetes/scheme/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/doc.go index ba8d10d3b6..cdaaf62078 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1alpha1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/doc.go index 6ecc1bad01..e8d65fa241 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta2 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/doc.go index a357dc2558..de272bd126 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v2beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/doc.go index d29bd3f4e1..7f1ef91b16 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v2alpha1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/doc.go index ba8d10d3b6..cdaaf62078 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1alpha1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/doc.go index ba8d10d3b6..cdaaf62078 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1alpha1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/doc.go index ba8d10d3b6..cdaaf62078 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1alpha1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake/doc.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/code-generator/Godeps/Godeps.json b/staging/src/k8s.io/code-generator/Godeps/Godeps.json index 9acdfa677a..a7a4d2900e 100644 --- a/staging/src/k8s.io/code-generator/Godeps/Godeps.json +++ b/staging/src/k8s.io/code-generator/Godeps/Godeps.json @@ -208,43 +208,43 @@ }, { "ImportPath": "k8s.io/gengo/args", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/import-boss/generators", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/generators", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/sets", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/generator", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/namer", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/parser", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/gengo/types", - "Rev": "9e661e9308f078838e266cca1c673922088c0ea4" + "Rev": "70ad626ed2d7a483d89d2c4c56364d60b48ee8fc" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/doc.go index b8eadd1e11..5a63b0e724 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalversion diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/scheme/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/scheme/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/typed/example/internalversion/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/typed/example/internalversion/doc.go index 57e5b70cf5..3adf06d893 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/typed/example/internalversion/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/typed/example/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/typed/example/internalversion/fake/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/typed/example/internalversion/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/typed/example/internalversion/fake/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/typed/example/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/doc.go index 8fd89c6d52..7d2f4d80d3 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package versioned diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/scheme/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/scheme/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/typed/example/v1/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/typed/example/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/typed/example/v1/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/typed/example/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/typed/example/v1/fake/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/typed/example/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/typed/example/v1/fake/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/typed/example/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/doc.go b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/doc.go index 8fd89c6d52..7d2f4d80d3 100644 --- a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package versioned diff --git a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/doc.go b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/doc.go b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/doc.go b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/doc.go index 54673bfa73..b6a2a46728 100644 --- a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1 diff --git a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/fake/doc.go b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/fake/doc.go +++ b/staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/typed/example/v1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/BUILD b/staging/src/k8s.io/code-generator/cmd/client-gen/BUILD index cef09f76bb..da1410e5b5 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/BUILD @@ -19,7 +19,6 @@ go_library( "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/code-generator/cmd/client-gen/args:go_default_library", "//vendor/k8s.io/code-generator/cmd/client-gen/generators:go_default_library", - "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", ], ) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD b/staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD index 313e268d6f..ce15a1b22b 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/BUILD @@ -3,12 +3,20 @@ package(default_visibility = ["//visibility:public"]) load( "@io_bazel_rules_go//go:def.bzl", "go_library", + "go_test", ) go_library( name = "go_default_library", - srcs = ["args.go"], - deps = ["//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library"], + srcs = [ + "args.go", + "gvpackages.go", + "gvtype.go", + ], + deps = [ + "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", + ], ) filegroup( @@ -23,3 +31,13 @@ filegroup( srcs = [":package-srcs"], tags = ["automanaged"], ) + +go_test( + name = "go_default_test", + srcs = ["gvpackages_test.go"], + library = ":go_default_library", + deps = [ + "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/code-generator/cmd/client-gen/types:go_default_library", + ], +) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go index d454cc12c7..898a9adf3f 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go @@ -16,16 +16,23 @@ limitations under the License. package args -import "k8s.io/code-generator/cmd/client-gen/types" +import ( + "github.com/spf13/pflag" + + "k8s.io/code-generator/cmd/client-gen/types" +) // ClientGenArgs is a wrapper for arguments to client-gen. -type Args struct { +type CustomArgs struct { + // A sorted list of group versions to generate. For each of them the package path is found + // in GroupVersionToInputPath. Groups []types.GroupVersions - - // GroupVersionToInputPath is a map between GroupVersion and the path to - // the respective types.go. We still need GroupVersions in the struct because - // we need an order. + // GroupVersionToInputPath is a map between GroupVersion and the path to the respective + // types.go, relative to InputBasePath. We still need GroupVersions in the + // struct because we need an order. GroupVersionToInputPath map[types.GroupVersion]string + // The base for the path of GroupVersionToInputPath. + InputBasePath string // Overrides for which types should be included in the client. IncludedTypesOverrides map[types.GroupVersion][]string @@ -44,6 +51,33 @@ type Args struct { ClientsetOnly bool // FakeClient determines if client-gen generates the fake clients. FakeClient bool - // CmdArgs is the command line arguments supplied when the client-gen is called. - CmdArgs string +} + +var defaultInput = []string{ + "api/", + "admissionregistration/", + "authentication/", + "authorization/", + "autoscaling/", + "batch/", + "certificates/", + "extensions/", + "rbac/", + "storage/", + "apps/", + "policy/", + "scheduling/", + "settings/", + "networking/", +} + +func (ca *CustomArgs) AddFlags(fs *pflag.FlagSet) { + pflag.Var(NewGVPackagesValue(&ca.GroupVersionToInputPath, &ca.Groups, defaultInput), "input", "group/versions that client-gen will generate clients for. At most one version per group is allowed. Specified in the format \"group1/version1,group2/version2...\".") + pflag.Var(NewGVTypesValue(&ca.IncludedTypesOverrides, []string{}), "included-types-overrides", "list of group/version/type for which client should be generated. By default, client is generated for all types which have genclient in types.go. This overrides that. For each groupVersion in this list, only the types mentioned here will be included. The default check of genclient will be used for other group versions.") + pflag.StringVar(&ca.InputBasePath, "input-base", "k8s.io/kubernetes/pkg/apis", "base path to look for the api group.") + pflag.StringVarP(&ca.ClientsetName, "clientset-name", "n", "internalclientset", "the name of the generated clientset package.") + pflag.StringVarP(&ca.ClientsetAPIPath, "clientset-api-path", "", "", "the value of default API path.") + pflag.StringVar(&ca.ClientsetOutputPath, "clientset-path", "k8s.io/kubernetes/pkg/client/clientset_generated/", "the generated clientset will be output to /.") + pflag.BoolVar(&ca.ClientsetOnly, "clientset-only", false, "when set, client-gen only generates the clientset shell, without generating the individual typed clients") + pflag.BoolVar(&ca.FakeClient, "fake-clientset", true, "when set, client-gen will generate the fake clientset that can be used in tests") } diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvpackages.go b/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvpackages.go new file mode 100644 index 0000000000..b7ecb33704 --- /dev/null +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvpackages.go @@ -0,0 +1,159 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package args + +import ( + "bytes" + "encoding/csv" + "flag" + "path" + "strings" + + "path/filepath" + "sort" + + "k8s.io/code-generator/cmd/client-gen/types" +) + +type gvPackagesValue struct { + gvToPath *map[types.GroupVersion]string + groups *[]types.GroupVersions + changed bool +} + +func NewGVPackagesValue(gvToPath *map[types.GroupVersion]string, groups *[]types.GroupVersions, def []string) *gvPackagesValue { + gvp := new(gvPackagesValue) + gvp.gvToPath = gvToPath + gvp.groups = groups + if def != nil { + if err := gvp.set(def); err != nil { + panic(err) + } + } + return gvp +} + +var _ flag.Value = &gvPackagesValue{} + +func readAsCSV(val string) ([]string, error) { + if val == "" { + return []string{}, nil + } + stringReader := strings.NewReader(val) + csvReader := csv.NewReader(stringReader) + return csvReader.Read() +} + +func writeAsCSV(vals []string) (string, error) { + b := &bytes.Buffer{} + w := csv.NewWriter(b) + err := w.Write(vals) + if err != nil { + return "", err + } + w.Flush() + return strings.TrimSuffix(b.String(), "\n"), nil +} + +func (s *gvPackagesValue) set(vs []string) error { + if !s.changed { + *s.gvToPath = map[types.GroupVersion]string{} + *s.groups = []types.GroupVersions{} + } + + var seenGroups = make(map[types.Group]*types.GroupVersions) + for _, g := range *s.groups { + seenGroups[g.Group] = &g + } + + for _, v := range vs { + pth, gvString := parsePathGroupVersion(v) + gv, err := types.ToGroupVersion(gvString) + if err != nil { + return err + } + + if group, ok := seenGroups[gv.Group]; ok { + seenGroups[gv.Group].Versions = append(group.Versions, gv.Version) + } else { + seenGroups[gv.Group] = &types.GroupVersions{ + Group: gv.Group, + Versions: []types.Version{gv.Version}, + } + } + + (*s.gvToPath)[gv] = groupVersionPath(pth, gv.Group.String(), gv.Version.String()) + } + + var groupNames []string + for groupName := range seenGroups { + groupNames = append(groupNames, groupName.String()) + } + sort.Strings(groupNames) + *s.groups = []types.GroupVersions{} + for _, groupName := range groupNames { + *s.groups = append(*s.groups, *seenGroups[types.Group(groupName)]) + } + + return nil +} + +func (s *gvPackagesValue) Set(val string) error { + vs, err := readAsCSV(val) + if err != nil { + return err + } + if err := s.set(vs); err != nil { + return err + } + s.changed = true + return nil +} + +func (s *gvPackagesValue) Type() string { + return "stringSlice" +} + +func (s *gvPackagesValue) String() string { + strs := make([]string, 0, len(*s.gvToPath)) + for gv, pth := range *s.gvToPath { + strs = append(strs, path.Join(pth, gv.Group.String(), gv.Version.String())) + } + str, _ := writeAsCSV(strs) + return "[" + str + "]" +} + +func parsePathGroupVersion(pgvString string) (gvPath string, gvString string) { + subs := strings.Split(pgvString, "/") + length := len(subs) + switch length { + case 0, 1, 2: + return "", pgvString + default: + return strings.Join(subs[:length-2], "/"), strings.Join(subs[length-2:], "/") + } +} + +func groupVersionPath(gvPath string, group string, version string) (path string) { + // special case for the core group + if group == "api" { + path = filepath.Join("../api", version) + } else { + path = filepath.Join(gvPath, group, version) + } + return +} diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvpackages_test.go b/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvpackages_test.go new file mode 100644 index 0000000000..c86065cd83 --- /dev/null +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvpackages_test.go @@ -0,0 +1,109 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package args + +import ( + "fmt" + "reflect" + "strings" + "testing" + + "github.com/spf13/pflag" + + "k8s.io/code-generator/cmd/client-gen/types" +) + +func TestGVPackageFlag(t *testing.T) { + tests := []struct { + args []string + def []string + expected map[types.GroupVersion]string + expectedGroups []types.GroupVersions + parseError string + }{ + { + args: []string{}, + expected: map[types.GroupVersion]string{}, + expectedGroups: []types.GroupVersions{}, + }, + { + args: []string{"foo/bar/v1", "foo/bar/v2", "foo/bar/", "foo/v1"}, + expected: map[types.GroupVersion]string{ + {Group: "bar", Version: ""}: "foo/bar", + {Group: "bar", Version: "v1"}: "foo/bar/v1", + {Group: "bar", Version: "v2"}: "foo/bar/v2", + {Group: "foo", Version: "v1"}: "foo/v1", + }, + expectedGroups: []types.GroupVersions{ + {Group: types.Group("bar"), Versions: []types.Version{types.Version("v1"), types.Version("v2"), types.Version("")}}, + {Group: types.Group("foo"), Versions: []types.Version{types.Version("v1")}}, + }, + }, + { + args: []string{"foo/bar/v1", "foo/bar/v2", "foo/bar/", "foo/v1"}, + def: []string{"foo/bar/v1alpha1", "foo/v1"}, + expected: map[types.GroupVersion]string{ + {Group: "bar", Version: ""}: "foo/bar", + {Group: "bar", Version: "v1"}: "foo/bar/v1", + {Group: "bar", Version: "v2"}: "foo/bar/v2", + {Group: "foo", Version: "v1"}: "foo/v1", + }, + expectedGroups: []types.GroupVersions{ + {Group: types.Group("bar"), Versions: []types.Version{types.Version("v1"), types.Version("v2"), types.Version("")}}, + {Group: types.Group("foo"), Versions: []types.Version{types.Version("v1")}}, + }, + }, + { + args: []string{"api/v1", "api"}, + expected: map[types.GroupVersion]string{ + {Group: "api", Version: "v1"}: "../api/v1", + {Group: "api", Version: ""}: "../api", + }, + expectedGroups: []types.GroupVersions{ + {Group: types.Group("api"), Versions: []types.Version{types.Version("v1"), types.Version("")}}, + }, + }, + } + for i, test := range tests { + fs := pflag.NewFlagSet("testGVPackage", pflag.ContinueOnError) + gvp := map[types.GroupVersion]string{} + groups := []types.GroupVersions{} + fs.Var(NewGVPackagesValue(&gvp, &groups, test.def), "input", "usage") + + args := []string{} + for _, a := range test.args { + args = append(args, fmt.Sprintf("--input=%s", a)) + } + + err := fs.Parse(args) + if test.parseError != "" { + if err == nil { + t.Errorf("%d: expected error %q, got nil", i, test.parseError) + } else if !strings.Contains(err.Error(), test.parseError) { + t.Errorf("%d: expected error %q, got %q", i, test.parseError, err) + } + } else if err != nil { + t.Errorf("%d: expected nil error, got %v", i, err) + } + if !reflect.DeepEqual(gvp, test.expected) { + t.Errorf("%d: expected %+v, got %+v", i, test.expected, gvp) + } + if !reflect.DeepEqual(groups, test.expectedGroups) { + t.Errorf("%d: expected groups %+v, got groups %+v", i, test.expectedGroups, groups) + } + } +} diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvtype.go b/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvtype.go new file mode 100644 index 0000000000..e4e3ccb536 --- /dev/null +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/gvtype.go @@ -0,0 +1,110 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package args + +import ( + "flag" + "fmt" + "strings" + + "k8s.io/code-generator/cmd/client-gen/types" +) + +type gvTypeValue struct { + gvToTypes *map[types.GroupVersion][]string + changed bool +} + +func NewGVTypesValue(gvToTypes *map[types.GroupVersion][]string, def []string) *gvTypeValue { + gvt := new(gvTypeValue) + gvt.gvToTypes = gvToTypes + if def != nil { + if err := gvt.set(def); err != nil { + panic(err) + } + } + return gvt +} + +var _ flag.Value = &gvTypeValue{} + +func (s *gvTypeValue) set(vs []string) error { + if !s.changed { + *s.gvToTypes = map[types.GroupVersion][]string{} + } + + for _, input := range vs { + gvString, typeStr, err := parseGroupVersionType(input) + if err != nil { + return err + } + gv, err := types.ToGroupVersion(gvString) + if err != nil { + return err + } + types, ok := (*s.gvToTypes)[gv] + if !ok { + types = []string{} + } + types = append(types, typeStr) + (*s.gvToTypes)[gv] = types + } + + return nil +} + +func (s *gvTypeValue) Set(val string) error { + vs, err := readAsCSV(val) + if err != nil { + return err + } + if err := s.set(vs); err != nil { + return err + } + s.changed = true + return nil +} + +func (s *gvTypeValue) Type() string { + return "stringSlice" +} + +func (s *gvTypeValue) String() string { + strs := make([]string, 0, len(*s.gvToTypes)) + for gv, ts := range *s.gvToTypes { + for _, t := range ts { + strs = append(strs, gv.Group.String()+"/"+gv.Version.String()+"/"+t) + } + } + str, _ := writeAsCSV(strs) + return "[" + str + "]" +} + +func parseGroupVersionType(gvtString string) (gvString string, typeStr string, err error) { + invalidFormatErr := fmt.Errorf("invalid value: %s, should be of the form group/version/type", gvtString) + subs := strings.Split(gvtString, "/") + length := len(subs) + switch length { + case 2: + // gvtString of the form group/type, e.g. api/Service,extensions/ReplicaSet + return subs[0] + "/", subs[1], nil + case 3: + return strings.Join(subs[:length-1], "/"), subs[length-1], nil + default: + return "", "", invalidFormatErr + } +} diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go index e0d958fbf6..70bbf3d397 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go @@ -18,7 +18,6 @@ limitations under the License. package generators import ( - "fmt" "path/filepath" "strings" @@ -104,22 +103,14 @@ func DefaultNameSystem() string { return "public" } -func generatedBy(customArgs clientgenargs.Args) string { - if len(customArgs.CmdArgs) != 0 { - return fmt.Sprintf("\n// This package is generated by client-gen with custom arguments.\n\n") - } - return fmt.Sprintf("\n// This package is generated by client-gen with the default arguments.\n\n") -} - -func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, apiPath string, srcTreePath string, inputPackage string, boilerplate []byte, generatedBy string) generator.Package { +func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, apiPath string, srcTreePath string, inputPackage string, boilerplate []byte) generator.Package { groupVersionClientPackage := strings.ToLower(filepath.Join(clientsetPackage, "typed", gv.Group.NonEmpty(), gv.Version.NonEmpty())) return &generator.DefaultPackage{ PackageName: strings.ToLower(gv.Version.NonEmpty()), PackagePath: groupVersionClientPackage, HeaderText: boilerplate, PackageDocumentation: []byte( - generatedBy + - `// This package has the automatically generated typed clients. + `// This package has the automatically generated typed clients. `), // GeneratorFunc returns a list of generators. Each generator makes a // single file. @@ -175,14 +166,13 @@ func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, cli } } -func packageForClientset(customArgs clientgenargs.Args, clientsetPackage string, boilerplate []byte, generatedBy string) generator.Package { +func packageForClientset(customArgs *clientgenargs.CustomArgs, clientsetPackage string, boilerplate []byte) generator.Package { return &generator.DefaultPackage{ PackageName: customArgs.ClientsetName, PackagePath: clientsetPackage, HeaderText: boilerplate, PackageDocumentation: []byte( - generatedBy + - `// This package has the automatically generated clientset. + `// This package has the automatically generated clientset. `), // GeneratorFunc returns a list of generators. Each generator generates a // single file. @@ -206,7 +196,7 @@ func packageForClientset(customArgs clientgenargs.Args, clientsetPackage string, } } -func packageForScheme(customArgs clientgenargs.Args, clientsetPackage string, srcTreePath string, boilerplate []byte, generatedBy string) generator.Package { +func packageForScheme(customArgs *clientgenargs.CustomArgs, clientsetPackage string, srcTreePath string, boilerplate []byte) generator.Package { schemePackage := filepath.Join(clientsetPackage, "scheme") // create runtime.Registry for internal client because it has to know about group versions @@ -226,8 +216,7 @@ NextGroup: PackagePath: schemePackage, HeaderText: boilerplate, PackageDocumentation: []byte( - generatedBy + - `// This package contains the scheme of the automatically generated clientset. + `// This package contains the scheme of the automatically generated clientset. `), // GeneratorFunc returns a list of generators. Each generator generates a // single file. @@ -256,7 +245,7 @@ NextGroup: // applyGroupOverrides applies group name overrides to each package, if applicable. If there is a // comment of the form "// +groupName=somegroup" or "// +groupName=somegroup.foo.bar.io", use the // first field (somegroup) as the name of the group when generating. -func applyGroupOverrides(universe types.Universe, customArgs *clientgenargs.Args) { +func applyGroupOverrides(universe types.Universe, customArgs *clientgenargs.CustomArgs) { // Create a map from "old GV" to "new GV" so we know what changes we need to make. changes := make(map[clientgentypes.GroupVersion]clientgentypes.GroupVersion) for gv, inputDir := range customArgs.GroupVersionToInputPath { @@ -312,15 +301,13 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat glog.Fatalf("Failed loading boilerplate: %v", err) } - customArgs, ok := arguments.CustomArgs.(clientgenargs.Args) + customArgs, ok := arguments.CustomArgs.(*clientgenargs.CustomArgs) if !ok { - glog.Fatalf("cannot convert arguments.CustomArgs to clientgenargs.Args") + glog.Fatalf("cannot convert arguments.CustomArgs to clientgenargs.CustomArgs") } includedTypesOverrides := customArgs.IncludedTypesOverrides - applyGroupOverrides(context.Universe, &customArgs) - - generatedBy := generatedBy(customArgs) + applyGroupOverrides(context.Universe, customArgs) gvToTypes := map[clientgentypes.GroupVersion][]*types.Type{} for gv, inputDir := range customArgs.GroupVersionToInputPath { @@ -357,10 +344,10 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat var packageList []generator.Package clientsetPackage := filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName) - packageList = append(packageList, packageForClientset(customArgs, clientsetPackage, boilerplate, generatedBy)) - packageList = append(packageList, packageForScheme(customArgs, clientsetPackage, arguments.OutputBase, boilerplate, generatedBy)) + packageList = append(packageList, packageForClientset(customArgs, clientsetPackage, boilerplate)) + packageList = append(packageList, packageForScheme(customArgs, clientsetPackage, arguments.OutputBase, boilerplate)) if customArgs.FakeClient { - packageList = append(packageList, fake.PackageForClientset(customArgs, clientsetPackage, boilerplate, generatedBy)) + packageList = append(packageList, fake.PackageForClientset(customArgs, clientsetPackage, boilerplate)) } // If --clientset-only=true, we don't regenerate the individual typed clients. @@ -374,9 +361,9 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat gv := clientgentypes.GroupVersion{Group: group.Group, Version: version} types := gvToTypes[gv] inputPath := customArgs.GroupVersionToInputPath[gv] - packageList = append(packageList, packageForGroup(gv, orderer.OrderTypes(types), clientsetPackage, customArgs.ClientsetAPIPath, arguments.OutputBase, inputPath, boilerplate, generatedBy)) + packageList = append(packageList, packageForGroup(gv, orderer.OrderTypes(types), clientsetPackage, customArgs.ClientsetAPIPath, arguments.OutputBase, inputPath, boilerplate)) if customArgs.FakeClient { - packageList = append(packageList, fake.PackageForGroup(gv, orderer.OrderTypes(types), clientsetPackage, inputPath, boilerplate, generatedBy)) + packageList = append(packageList, fake.PackageForGroup(gv, orderer.OrderTypes(types), clientsetPackage, inputPath, boilerplate)) } } } diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go index 9b607fdb35..28935f41dc 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/fake_client_generator.go @@ -29,7 +29,7 @@ import ( clientgentypes "k8s.io/code-generator/cmd/client-gen/types" ) -func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, inputPackage string, boilerplate []byte, generatedBy string) generator.Package { +func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, inputPackage string, boilerplate []byte) generator.Package { outputPackage := strings.ToLower(filepath.Join(clientsetPackage, "typed", gv.Group.NonEmpty(), gv.Version.NonEmpty(), "fake")) // TODO: should make this a function, called by here and in client-generator.go realClientPackage := filepath.Join(clientsetPackage, "typed", gv.Group.NonEmpty(), gv.Version.NonEmpty()) @@ -38,8 +38,7 @@ func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, cli PackagePath: outputPackage, HeaderText: boilerplate, PackageDocumentation: []byte( - generatedBy + - `// Package fake has the automatically generated clients. + `// Package fake has the automatically generated clients. `), // GeneratorFunc returns a list of generators. Each generator makes a // single file. @@ -83,7 +82,7 @@ func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, cli } } -func PackageForClientset(customArgs clientgenargs.Args, fakeClientsetPackage string, boilerplate []byte, generatedBy string) generator.Package { +func PackageForClientset(customArgs *clientgenargs.CustomArgs, fakeClientsetPackage string, boilerplate []byte) generator.Package { return &generator.DefaultPackage{ // TODO: we'll generate fake clientset for different release in the future. // Package name and path are hard coded for now. @@ -91,8 +90,7 @@ func PackageForClientset(customArgs clientgenargs.Args, fakeClientsetPackage str PackagePath: filepath.Join(fakeClientsetPackage, "fake"), HeaderText: boilerplate, PackageDocumentation: []byte( - generatedBy + - `// This package has the automatically generated fake clientset. + `// This package has the automatically generated fake clientset. `), // GeneratorFunc returns a list of generators. Each generator generates a // single file. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/main.go b/staging/src/k8s.io/code-generator/cmd/client-gen/main.go index 2bbb98b75c..72404808ec 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/main.go @@ -18,181 +18,48 @@ limitations under the License. package main import ( - "fmt" + "flag" + "path" "path/filepath" - "sort" - "strings" + + "github.com/golang/glog" + "github.com/spf13/pflag" clientgenargs "k8s.io/code-generator/cmd/client-gen/args" "k8s.io/code-generator/cmd/client-gen/generators" - "k8s.io/code-generator/cmd/client-gen/types" "k8s.io/gengo/args" - - "github.com/golang/glog" - flag "github.com/spf13/pflag" ) -var ( - inputVersions = flag.StringSlice("input", []string{ - "api/", - "admissionregistration/", - "authentication/", - "authorization/", - "autoscaling/", - "batch/", - "certificates/", - "extensions/", - "rbac/", - "storage/", - "apps/", - "policy/", - "scheduling/", - "settings/", - "networking/", - }, "group/versions that client-gen will generate clients for. At most one version per group is allowed. Specified in the format \"group1/version1,group2/version2...\".") - includedTypesOverrides = flag.StringSlice("included-types-overrides", []string{}, "list of group/version/type for which client should be generated. By default, client is generated for all types which have genclient in types.go. This overrides that. For each groupVersion in this list, only the types mentioned here will be included. The default check of genclient will be used for other group versions.") - basePath = flag.String("input-base", "k8s.io/kubernetes/pkg/apis", "base path to look for the api group.") - clientsetName = flag.StringP("clientset-name", "n", "internalclientset", "the name of the generated clientset package.") - clientsetAPIPath = flag.StringP("clientset-api-path", "", "", "the value of default API path.") - clientsetPath = flag.String("clientset-path", "k8s.io/kubernetes/pkg/client/clientset_generated/", "the generated clientset will be output to /.") - clientsetOnly = flag.Bool("clientset-only", false, "when set, client-gen only generates the clientset shell, without generating the individual typed clients") - fakeClient = flag.Bool("fake-clientset", true, "when set, client-gen will generate the fake clientset that can be used in tests") -) - -func versionToPath(gvPath string, group string, version string) (path string) { - // special case for the core group - if group == "api" { - path = filepath.Join(*basePath, "../api", version) - } else { - path = filepath.Join(*basePath, gvPath, group, version) - } - return -} - -func parseGroupVersionType(gvtString string) (gvString string, typeStr string, err error) { - invalidFormatErr := fmt.Errorf("invalid value: %s, should be of the form group/version/type", gvtString) - subs := strings.Split(gvtString, "/") - length := len(subs) - switch length { - case 2: - // gvtString of the form group/type, e.g. api/Service,extensions/ReplicaSet - return subs[0] + "/", subs[1], nil - case 3: - return strings.Join(subs[:length-1], "/"), subs[length-1], nil - default: - return "", "", invalidFormatErr - } -} - -func parsePathGroupVersion(pgvString string) (gvPath string, gvString string) { - subs := strings.Split(pgvString, "/") - length := len(subs) - switch length { - case 0, 1, 2: - return "", pgvString - default: - return strings.Join(subs[:length-2], "/"), strings.Join(subs[length-2:], "/") - } -} - -func parseInputVersions() (paths []string, groups []types.GroupVersions, gvToPath map[types.GroupVersion]string, err error) { - var seenGroups = make(map[types.Group]*types.GroupVersions) - gvToPath = make(map[types.GroupVersion]string) - for _, input := range *inputVersions { - gvPath, gvString := parsePathGroupVersion(input) - gv, err := types.ToGroupVersion(gvString) - if err != nil { - return nil, nil, nil, err - } - if group, ok := seenGroups[gv.Group]; ok { - (*seenGroups[gv.Group]).Versions = append(group.Versions, gv.Version) - } else { - seenGroups[gv.Group] = &types.GroupVersions{ - Group: gv.Group, - Versions: []types.Version{gv.Version}, - } - } - - path := versionToPath(gvPath, gv.Group.String(), gv.Version.String()) - paths = append(paths, path) - gvToPath[gv] = path - } - var groupNames []string - for groupName := range seenGroups { - groupNames = append(groupNames, groupName.String()) - } - sort.Strings(groupNames) - for _, groupName := range groupNames { - groups = append(groups, *seenGroups[types.Group(groupName)]) - } - - return paths, groups, gvToPath, nil -} - -func parseIncludedTypesOverrides() (map[types.GroupVersion][]string, error) { - overrides := make(map[types.GroupVersion][]string) - for _, input := range *includedTypesOverrides { - gvString, typeStr, err := parseGroupVersionType(input) - if err != nil { - return nil, err - } - gv, err := types.ToGroupVersion(gvString) - if err != nil { - return nil, err - } - types, ok := overrides[gv] - if !ok { - types = []string{} - } - types = append(types, typeStr) - overrides[gv] = types - } - return overrides, nil -} - func main() { - arguments := args.Default() - arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") - flag.Parse() - var cmdArgs string - flag.VisitAll(func(f *flag.Flag) { - if !f.Changed || f.Name == "verify-only" { - return - } - cmdArgs = cmdArgs + fmt.Sprintf("--%s=%s ", f.Name, f.Value) - }) + arguments := args.Default().WithoutDefaultFlagParsing() - dependencies := []string{ + // Custom args. + customArgs := &clientgenargs.CustomArgs{} + customArgs.AddFlags(pflag.CommandLine) + + // Override defaults. + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") + arguments.CustomArgs = customArgs + arguments.InputDirs = []string{ "k8s.io/apimachinery/pkg/fields", "k8s.io/apimachinery/pkg/labels", "k8s.io/apimachinery/pkg/watch", "k8s.io/apimachinery/pkg/apimachinery/registered", } - inputPath, groups, gvToPath, err := parseInputVersions() - if err != nil { - glog.Fatalf("Error: %v", err) - } - includedTypesOverrides, err := parseIncludedTypesOverrides() - if err != nil { - glog.Fatalf("Unexpected error: %v", err) - } - glog.V(3).Infof("going to generate clientset from these input paths: %v", inputPath) - arguments.InputDirs = append(inputPath, dependencies...) + // Register default flags. We do this manually here because we have to override InputDirs below after additional + // input dirs are parse fromt he command-line. + arguments.AddFlags(pflag.CommandLine) + pflag.CommandLine.AddGoFlagSet(flag.CommandLine) + pflag.Parse() - arguments.CustomArgs = clientgenargs.Args{ - Groups: groups, - GroupVersionToInputPath: gvToPath, - ClientsetName: *clientsetName, - ClientsetAPIPath: *clientsetAPIPath, - ClientsetOutputPath: *clientsetPath, - ClientsetOnly: *clientsetOnly, - FakeClient: *fakeClient, - CmdArgs: cmdArgs, - IncludedTypesOverrides: includedTypesOverrides, + // Prefix with InputBaseDir and add client dirs as input dirs. + for gv, pth := range customArgs.GroupVersionToInputPath { + customArgs.GroupVersionToInputPath[gv] = path.Join(customArgs.InputBasePath, pth) + } + for _, pkg := range customArgs.GroupVersionToInputPath { + arguments.InputDirs = append(arguments.InputDirs, pkg) } - - glog.V(3).Infof("==arguments: %v\n", arguments) if err := arguments.Execute( generators.NameSystems(), diff --git a/staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go b/staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go index c8acbb18d0..510a1303d5 100644 --- a/staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go @@ -47,10 +47,6 @@ import ( func main() { arguments := args.Default() - // Override defaults. - arguments.OutputFileBaseName = "conversion_generated" - arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") - // Custom args. // TODO: make callers pass this in. It is too opaque here, and any use of // the flag that DOESN'T include these is broken. @@ -69,6 +65,10 @@ func main() { "Comma-separated list of import paths which are considered, after tag-specified peers, for conversions.") pflag.CommandLine.BoolVar(&customArgs.SkipUnsafe, "skip-unsafe", customArgs.SkipUnsafe, "If true, will not generate code using unsafe pointer conversions; resulting code may be slower.") + + // Override defaults. + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") + arguments.OutputFileBaseName = "conversion_generated" arguments.CustomArgs = customArgs // Run it. diff --git a/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go b/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go index f270bff382..b045acaf84 100644 --- a/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go @@ -60,14 +60,14 @@ import ( func main() { arguments := args.Default() - // Override defaults. - arguments.OutputFileBaseName = "deepcopy_generated" - arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") - // Custom args. customArgs := &generators.CustomArgs{} pflag.CommandLine.StringSliceVar(&customArgs.BoundingDirs, "bounding-dirs", customArgs.BoundingDirs, "Comma-separated list of import paths which bound the types for which deep-copies will be generated.") + + // Override defaults. + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") + arguments.OutputFileBaseName = "deepcopy_generated" arguments.CustomArgs = customArgs // Run it. diff --git a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go index b12e58376e..119ca11901 100644 --- a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go @@ -54,16 +54,16 @@ import ( func main() { arguments := args.Default() - // Override defaults. - arguments.OutputFileBaseName = "zz_generated.defaults" - arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") - // Custom args. customArgs := &generators.CustomArgs{ ExtraPeerDirs: []string{}, } pflag.CommandLine.StringSliceVar(&customArgs.ExtraPeerDirs, "extra-peer-dirs", customArgs.ExtraPeerDirs, "Comma-separated list of import paths which are considered, after tag-specified peers, for conversions.") + + // Override defaults. + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") + arguments.OutputFileBaseName = "zz_generated.defaults" arguments.CustomArgs = customArgs // Run it. diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/main.go b/staging/src/k8s.io/code-generator/cmd/import-boss/main.go index db9505e52b..a6fad8efe2 100644 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/main.go +++ b/staging/src/k8s.io/code-generator/cmd/import-boss/main.go @@ -68,15 +68,13 @@ import ( func main() { arguments := args.Default() - // Override defaults. These are Kubernetes specific input and output - // locations. + // Override defaults. + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") arguments.InputDirs = []string{ "k8s.io/kubernetes/pkg/...", "k8s.io/kubernetes/cmd/...", "k8s.io/kubernetes/plugin/...", } - arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") - // arguments.VerifyOnly = true if err := arguments.Execute( generators.NameSystems(), diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/main.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/main.go index 00d4eae2b8..78c0b3829c 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/main.go @@ -27,22 +27,22 @@ import ( ) func main() { + arguments := args.Default() + + // Custom arguments. customArgs := &generators.CustomArgs{ VersionedClientSetPackage: "k8s.io/kubernetes/pkg/client/clientset_generated/clientset", InternalClientSetPackage: "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset", ListersPackage: "k8s.io/kubernetes/pkg/client/listers", SingleDirectory: false, } - arguments := &args.GeneratorArgs{ - OutputBase: args.DefaultSourceTree(), - GoHeaderFilePath: filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt"), - GeneratedBuildTag: "ignore_autogenerated", - OutputPackagePath: "k8s.io/kubernetes/pkg/client/informers/informers_generated", - CustomArgs: customArgs, - } - arguments.AddFlags(pflag.CommandLine) customArgs.AddFlags(pflag.CommandLine) + // Override defaults. + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") + arguments.OutputPackagePath = "k8s.io/kubernetes/pkg/client/informers/informers_generated" + arguments.CustomArgs = customArgs + // Run it. if err := arguments.Execute( generators.NameSystems(), diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD b/staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD index 12235364c4..781ba02621 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/BUILD @@ -16,7 +16,6 @@ go_library( srcs = ["main.go"], deps = [ "//vendor/github.com/golang/glog:go_default_library", - "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/code-generator/cmd/lister-gen/generators:go_default_library", "//vendor/k8s.io/gengo/args:go_default_library", ], diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/main.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/main.go index 1be54d7471..3b305f8287 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/main.go @@ -23,17 +23,14 @@ import ( "k8s.io/gengo/args" "github.com/golang/glog" - "github.com/spf13/pflag" ) func main() { - arguments := &args.GeneratorArgs{ - OutputBase: args.DefaultSourceTree(), - GoHeaderFilePath: filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt"), - GeneratedBuildTag: "ignore_autogenerated", - OutputPackagePath: "k8s.io/kubernetes/pkg/client/listers", - } - arguments.AddFlags(pflag.CommandLine) + arguments := args.Default() + + // Override defaults. + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") + arguments.OutputPackagePath = "k8s.io/kubernetes/pkg/client/listers" // Run it. if err := arguments.Execute( diff --git a/staging/src/k8s.io/code-generator/cmd/openapi-gen/main.go b/staging/src/k8s.io/code-generator/cmd/openapi-gen/main.go index afb6957861..67355f8349 100644 --- a/staging/src/k8s.io/code-generator/cmd/openapi-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/openapi-gen/main.go @@ -32,8 +32,8 @@ func main() { arguments := args.Default() // Override defaults. - arguments.OutputFileBaseName = "openapi_generated" arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") + arguments.OutputFileBaseName = "openapi_generated" // Run it. if err := arguments.Execute( diff --git a/staging/src/k8s.io/code-generator/cmd/set-gen/main.go b/staging/src/k8s.io/code-generator/cmd/set-gen/main.go index 524ba81d03..24af2229f9 100644 --- a/staging/src/k8s.io/code-generator/cmd/set-gen/main.go +++ b/staging/src/k8s.io/code-generator/cmd/set-gen/main.go @@ -37,11 +37,10 @@ import ( func main() { arguments := args.Default() - // Override defaults. These are Kubernetes specific input and output - // locations. + // Override defaults. + arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") arguments.InputDirs = []string{"k8s.io/kubernetes/pkg/util/sets/types"} arguments.OutputPackagePath = "k8s.io/apimachinery/pkg/util/sets" - arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") if err := arguments.Execute( generators.NameSystems(), diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go index 7d72e7fb20..7f670fed47 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package clientset diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/fake/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go index 309c091bfd..b667dd5157 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalclientset diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go index 57e5b70cf5..3adf06d893 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/doc.go index 7d72e7fb20..7f670fed47 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/doc.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package clientset diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/doc.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/doc.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/doc.go index ba8d10d3b6..cdaaf62078 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/doc.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1alpha1 diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/doc.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/doc.go index 11b5238972..1b50aa1997 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/doc.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1beta1 diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/doc.go b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/doc.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/doc.go index b8eadd1e11..5a63b0e724 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package internalversion diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/scheme/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/scheme/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/typed/wardle/internalversion/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/typed/wardle/internalversion/doc.go index 57e5b70cf5..3adf06d893 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/typed/wardle/internalversion/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/typed/wardle/internalversion/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package internalversion diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/typed/wardle/internalversion/fake/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/typed/wardle/internalversion/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/typed/wardle/internalversion/fake/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/typed/wardle/internalversion/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/doc.go index 8fd89c6d52..7d2f4d80d3 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated clientset. package versioned diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake/doc.go index 5f565b3c8d..3fd8e1e2cd 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated fake clientset. package fake diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme/doc.go index 5d8ec824f0..3ec2200d09 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/doc.go index ba8d10d3b6..cdaaf62078 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // This package has the automatically generated typed clients. package v1alpha1 diff --git a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake/doc.go index c6548330a0..c58fac35e4 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake/doc.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake/doc.go @@ -14,7 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with custom arguments. - // Package fake has the automatically generated clients. package fake diff --git a/vendor/k8s.io/gengo/args/args.go b/vendor/k8s.io/gengo/args/args.go index 1a9a47884c..ad9a83480d 100644 --- a/vendor/k8s.io/gengo/args/args.go +++ b/vendor/k8s.io/gengo/args/args.go @@ -39,13 +39,12 @@ import ( // Default returns a defaulted GeneratorArgs. You may change the defaults // before calling AddFlags. func Default() *GeneratorArgs { - generatorArgs := &GeneratorArgs{ - OutputBase: DefaultSourceTree(), - GoHeaderFilePath: filepath.Join(DefaultSourceTree(), "k8s.io/gengo/boilerplate/boilerplate.go.txt"), - GeneratedBuildTag: "ignore_autogenerated", + return &GeneratorArgs{ + OutputBase: DefaultSourceTree(), + GoHeaderFilePath: filepath.Join(DefaultSourceTree(), "k8s.io/gengo/boilerplate/boilerplate.go.txt"), + GeneratedBuildTag: "ignore_autogenerated", + defaultCommandLineFlags: true, } - generatorArgs.AddFlags(pflag.CommandLine) - return generatorArgs } // GeneratorArgs has arguments that are passed to generators. @@ -76,6 +75,15 @@ type GeneratorArgs struct { // Any custom arguments go here CustomArgs interface{} + + // Whether to use default command line flags + defaultCommandLineFlags bool +} + +// WithoutDefaultFlagParsing disables implicit addition of command line flags and parsing. +func (g *GeneratorArgs) WithoutDefaultFlagParsing() *GeneratorArgs { + g.defaultCommandLineFlags = false + return g } func (g *GeneratorArgs) AddFlags(fs *pflag.FlagSet) { @@ -148,8 +156,11 @@ func DefaultSourceTree() string { // If you don't need any non-default behavior, use as: // args.Default().Execute(...) func (g *GeneratorArgs) Execute(nameSystems namer.NameSystems, defaultSystem string, pkgs func(*generator.Context, *GeneratorArgs) generator.Packages) error { - pflag.CommandLine.AddGoFlagSet(goflag.CommandLine) - pflag.Parse() + if g.defaultCommandLineFlags { + g.AddFlags(pflag.CommandLine) + pflag.CommandLine.AddGoFlagSet(goflag.CommandLine) + pflag.Parse() + } b, err := g.NewBuilder() if err != nil { diff --git a/vendor/k8s.io/gengo/parser/parse.go b/vendor/k8s.io/gengo/parser/parse.go index 2288a0e473..d2bfed30c5 100644 --- a/vendor/k8s.io/gengo/parser/parse.go +++ b/vendor/k8s.io/gengo/parser/parse.go @@ -27,6 +27,7 @@ import ( "os" "os/exec" "path/filepath" + "sort" "strings" "github.com/golang/glog" @@ -425,13 +426,20 @@ func (b *Builder) typeCheckPackage(pkgPath importPathString) (*tc.Package, error // FindPackages fetches a list of the user-imported packages. // Note that you need to call b.FindTypes() first. func (b *Builder) FindPackages() []string { + // Iterate packages in a predictable order. + pkgPaths := []string{} + for k := range b.typeCheckedPackages { + pkgPaths = append(pkgPaths, string(k)) + } + sort.Strings(pkgPaths) + result := []string{} - for pkgPath := range b.typeCheckedPackages { - if b.userRequested[pkgPath] { + for _, pkgPath := range pkgPaths { + if b.userRequested[importPathString(pkgPath)] { // Since walkType is recursive, all types that are in packages that // were directly mentioned will be included. We don't need to // include all types in all transitive packages, though. - result = append(result, string(pkgPath)) + result = append(result, pkgPath) } } return result @@ -440,16 +448,17 @@ func (b *Builder) FindPackages() []string { // FindTypes finalizes the package imports, and searches through all the // packages for types. func (b *Builder) FindTypes() (types.Universe, error) { - u := types.Universe{} - // Take a snapshot of pkgs to iterate, since this will recursively mutate - // b.parsed. - keys := []importPathString{} + // b.parsed. Iterate in a predictable order. + pkgPaths := []string{} for pkgPath := range b.parsed { - keys = append(keys, pkgPath) + pkgPaths = append(pkgPaths, string(pkgPath)) } - for _, pkgPath := range keys { - if err := b.findTypesIn(pkgPath, &u); err != nil { + sort.Strings(pkgPaths) + + u := types.Universe{} + for _, pkgPath := range pkgPaths { + if err := b.findTypesIn(importPathString(pkgPath), &u); err != nil { return nil, err } } @@ -526,7 +535,13 @@ func (b *Builder) findTypesIn(pkgPath importPathString, u *types.Universe) error b.addVariable(*u, nil, tv) } } - for p := range b.importGraph[pkgPath] { + + importedPkgs := []string{} + for k := range b.importGraph[pkgPath] { + importedPkgs = append(importedPkgs, string(k)) + } + sort.Strings(importedPkgs) + for _, p := range importedPkgs { u.AddImports(string(pkgPath), p) } return nil