Skip to content

Commit f6f2f9e

Browse files
authored
Merge pull request #17 from aerogear/code-gen
remove code gen from vendor dir as it gets nuked by glide. Add to external dir at release-1.8 and regenerate
2 parents ecf2777 + 6a336d6 commit f6f2f9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+119
-76
lines changed

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ build_linux:
1414
env GOOS=linux GOARCH=amd64 go build -o mobile ./cmd/mobile
1515

1616
generate:
17+
cp -R ./external/k8s.io/code-generator ./vendor/k8s.io/code-generator
1718
vendor/k8s.io/code-generator/generate-internal-groups.sh client github.com/aerogear/mobile-cli/pkg/client/mobile github.com/aerogear/mobile-cli/pkg/apis github.com/aerogear/mobile-cli/pkg/apis "mobile:v1alpha1"
1819
vendor/k8s.io/code-generator/generate-internal-groups.sh client github.com/aerogear/mobile-cli/pkg/client/servicecatalog github.com/aerogear/mobile-cli/pkg/apis github.com/aerogear/mobile-cli/pkg/apis "servicecatalog:v1beta1"
20+
rm -rf vendor/k8s.io/code-generator
1921

2022
test-unit:
2123
@echo Running tests:

external/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The code generator comes from https://github.com/kubernetes/code-generator and is based from the release-1.8 branch
2+
to update checkout the branch you want and copy to this directory

external/k8s.io/code-generator

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 306be794f1b124a9c939ab168e9ea3944387e66b

pkg/client/mobile/clientset/internalversion/clientset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/internalversion/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package has the automatically generated clientset.
1820
package internalversion

pkg/client/mobile/clientset/internalversion/fake/clientset_generated.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/internalversion/fake/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package has the automatically generated fake clientset.
1820
package fake

pkg/client/mobile/clientset/internalversion/fake/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/internalversion/scheme/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package contains the scheme of the automatically generated clientset.
1820
package scheme

pkg/client/mobile/clientset/internalversion/scheme/register.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@ limitations under the License.
1717
package scheme
1818

1919
import (
20-
os "os"
21-
2220
mobile "github.com/aerogear/mobile-cli/pkg/apis/mobile/install"
2321
announced "k8s.io/apimachinery/pkg/apimachinery/announced"
2422
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
2523
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2624
runtime "k8s.io/apimachinery/pkg/runtime"
2725
schema "k8s.io/apimachinery/pkg/runtime/schema"
2826
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
27+
os "os"
2928
)
3029

3130
var Scheme = runtime.NewScheme()

pkg/client/mobile/clientset/internalversion/typed/mobile/internalversion/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package has the automatically generated typed clients.
1820
package internalversion

pkg/client/mobile/clientset/internalversion/typed/mobile/internalversion/fake/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// Package fake has the automatically generated clients.
1820
package fake

pkg/client/mobile/clientset/internalversion/typed/mobile/internalversion/fake/fake_mobile_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/internalversion/typed/mobile/internalversion/fake/fake_mobileclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/internalversion/typed/mobile/internalversion/generated_expansion.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/internalversion/typed/mobile/internalversion/mobile_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/internalversion/typed/mobile/internalversion/mobileclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/clientset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package has the automatically generated clientset.
1820
package versioned

pkg/client/mobile/clientset/versioned/fake/clientset_generated.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/fake/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package has the automatically generated fake clientset.
1820
package fake

pkg/client/mobile/clientset/versioned/fake/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/scheme/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package contains the scheme of the automatically generated clientset.
1820
package scheme

pkg/client/mobile/clientset/versioned/scheme/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/typed/mobile/v1alpha1/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package has the automatically generated typed clients.
1820
package v1alpha1

pkg/client/mobile/clientset/versioned/typed/mobile/v1alpha1/fake/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// Package fake has the automatically generated clients.
1820
package fake

pkg/client/mobile/clientset/versioned/typed/mobile/v1alpha1/fake/fake_mobile_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/typed/mobile/v1alpha1/fake/fake_mobileclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/typed/mobile/v1alpha1/generated_expansion.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/typed/mobile/v1alpha1/mobile_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/mobile/clientset/versioned/typed/mobile/v1alpha1/mobileclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/servicecatalog/clientset/internalversion/clientset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/servicecatalog/clientset/internalversion/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package has the automatically generated clientset.
1820
package internalversion

pkg/client/servicecatalog/clientset/internalversion/fake/clientset_generated.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/servicecatalog/clientset/internalversion/fake/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package has the automatically generated fake clientset.
1820
package fake

pkg/client/servicecatalog/clientset/internalversion/fake/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

pkg/client/servicecatalog/clientset/internalversion/scheme/doc.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -14,5 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// This package is generated by client-gen with custom arguments.
18+
1719
// This package contains the scheme of the automatically generated clientset.
1820
package scheme

pkg/client/servicecatalog/clientset/internalversion/scheme/register.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2017 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@ limitations under the License.
1717
package scheme
1818

1919
import (
20-
os "os"
21-
2220
servicecatalog "github.com/aerogear/mobile-cli/pkg/apis/servicecatalog/install"
2321
announced "k8s.io/apimachinery/pkg/apimachinery/announced"
2422
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
2523
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2624
runtime "k8s.io/apimachinery/pkg/runtime"
2725
schema "k8s.io/apimachinery/pkg/runtime/schema"
2826
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
27+
os "os"
2928
)
3029

3130
var Scheme = runtime.NewScheme()

0 commit comments

Comments
 (0)