Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Support protobuf code-generation/serialization #422

Merged
merged 8 commits into from
Sep 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
453 changes: 402 additions & 51 deletions Gopkg.lock

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@ required = [
[prune]
unused-packages = true
non-go = true
[[prune.project]]
name = "k8s.io/apimachinery"
unused-packages = false
non-go = false
[[prune.project]]
name = "github.com/gogo/protobuf"
unused-packages = false
non-go = false

[[constraint]]
name = "sigs.k8s.io/controller-runtime"
Expand Down
39 changes: 37 additions & 2 deletions cmd/apiserver-boot/boot/build/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func AddGenerate(cmd *cobra.Command) {
generateCmd.Flags().StringVar(&copyright, "copyright", "boilerplate.go.txt", "Location of copyright boilerplate file.")
generateCmd.Flags().StringVar(&vendorDir, "vendor-dir", "", "Location of directory containing vendor files.")
generateCmd.Flags().StringArrayVar(&versionedAPIs, "api-versions", []string{}, "API version to generate code for. Can be specified multiple times. e.g. --api-versions foo/v1beta1 --api-versions bar/v1 defaults to all versions found under directories pkg/apis/<group>/<version>")
generateCmd.Flags().StringArrayVar(&codegenerators, "generator", []string{}, "list of generators to run. e.g. --generator apiregister --generator conversion Valid values: [apiregister,conversion,client,deepcopy,defaulter,openapi]")
generateCmd.Flags().StringArrayVar(&codegenerators, "generator", []string{}, "list of generators to run. e.g. --generator apiregister --generator conversion Valid values: [apiregister,conversion,client,deepcopy,defaulter,openapi,protobuf]")
generateCmd.AddCommand(generateCleanCmd)

generateCleanCmd.Flags().MarkDeprecated("gen-unversioned-client", "generate unversioned client is highly unrecommended, please use versioned client instead")
Expand Down Expand Up @@ -86,7 +86,13 @@ func RunCleanGenerate(cmd *cobra.Command, args []string) {
}

func doGen(g string) bool {
g = strings.Replace(g, "-gen", "", -1)
switch g {
case "go-to-protobuf":
// disable protobuf generation by default
return generators.Has("protobuf")
default:
g = strings.Replace(g, "-gen", "", -1)
}
return generators.Has(g) || generators.Len() == 0
}

Expand Down Expand Up @@ -294,6 +300,35 @@ func RunGenerate(cmd *cobra.Command, args []string) {
klog.Fatalf("failed to run informer-gen %s %v", out, err)
}
}

if doGen("go-to-protobuf") {
versionedAPIPackages := sets.NewString()
for _, versionedAPI := range versionedAPIs {
versionedAPIPackages.Insert(filepath.Join(util.Repo, "pkg", "apis", versionedAPI))
}
c := exec.Command(filepath.Join(root, "go-to-protobuf"),
"--packages", strings.Join(versionedAPIPackages.List(), ","),
"--apimachinery-packages", strings.Join([]string{
"-k8s.io/apimachinery/pkg/util/intstr",
"-k8s.io/apimachinery/pkg/api/resource",
"-k8s.io/apimachinery/pkg/runtime/schema",
"-k8s.io/apimachinery/pkg/runtime",
"-k8s.io/apimachinery/pkg/apis/meta/v1",
"-sigs.k8s.io/apiserver-builder-alpha/pkg/builders",
}, ","),
"--drop-embedded-fields", strings.Join([]string{
"k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta",
"k8s.io/apimachinery/pkg/runtime.Serializer",
}, ","),
"--proto-import=./vendor",
"--vendor-output-base=./vendor/",
)
klog.Infof("%s", strings.Join(c.Args, " "))
out, err := c.CombinedOutput()
if err != nil {
klog.Fatalf("failed to run go-to-protobuf %s %v", out, err)
}
}
}

func getVendorApis(pkg string) []string {
Expand Down
3 changes: 2 additions & 1 deletion cmd/apiserver-builder-release/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,8 @@ var VendoredBuildPackages = []string{
"k8s.io/code-generator/cmd/conversion-gen",
"k8s.io/code-generator/cmd/deepcopy-gen",
"k8s.io/code-generator/cmd/defaulter-gen",
//"k8s.io/code-generator/cmd/go-to-protobuf",
"k8s.io/code-generator/cmd/go-to-protobuf",
"k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo",
//"k8s.io/code-generator/cmd/import-boss",
"k8s.io/code-generator/cmd/informer-gen",
"k8s.io/code-generator/cmd/lister-gen",
Expand Down
8 changes: 6 additions & 2 deletions cmd/glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions cmd/glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,7 @@ import:
version: e85c7b244fd2cc57bb829d73a061f93a441e63ce
- package: k8s.io/kube-openapi
version: b3a7cee44a305be0a69e1b9ac03018307287e1b0
- package: gonum.org/v1/gonum
repo: https://github.com/gonum/gonum
vcs: git
version: master
36 changes: 36 additions & 0 deletions cmd/vendor/gonum.org/v1/gonum/.github/ISSUE_TEMPLATE/bug_report.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions cmd/vendor/gonum.org/v1/gonum/.github/ISSUE_TEMPLATE/proposal.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions cmd/vendor/gonum.org/v1/gonum/.github/ISSUE_TEMPLATE/question.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions cmd/vendor/gonum.org/v1/gonum/.github/PULL_REQUEST_TEMPLATE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

112 changes: 112 additions & 0 deletions cmd/vendor/gonum.org/v1/gonum/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions cmd/vendor/gonum.org/v1/gonum/.travis/run-parts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading