Merge pull request #178 from perotinus/protos

Support protocol buffers as a transport medium in the cluster registry

Author: k8s-ci-robot

Gopkg.lock

@@ -10,6 +10,8 @@ required = [
   "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/protoc-gen-gogo",
   "k8s.io/code-generator/cmd/informer-gen",
   "k8s.io/code-generator/cmd/lister-gen",
   "k8s.io/code-generator/cmd/openapi-gen",
@@ -20,7 +22,9 @@ required = [
   "k8s.io/code-generator/cmd/set-gen",
 ]
 
-ignored = ["github.com/kubernetes/repo-infra/kazel"]
+ignored = [
+  "github.com/kubernetes/repo-infra/kazel",
+]
 
 [[constraint]]
   name = "github.com/go-openapi/spec"
@@ -69,15 +73,15 @@ ignored = ["github.com/kubernetes/repo-infra/kazel"]
 
 [[override]]
   name = "k8s.io/code-generator"
-  revision = "7ab2c9f35b06d8d9f672ee64580e534d2ab5d27e"
+  revision = "dac22934f1bf35605309431df35132fc2811bc41"
 
 [[override]]
   name = "github.com/kubernetes/repo-infra"
   revision = "0aafaab9e158d3628804242c6a9c4dd3eb8bce1f"
 
 [[override]]
   name = "k8s.io/gengo"
-  revision = "75356185a9af8f0464efa792e2e9508d5b4be83c"
+  revision = "b6c426f7730e6d66e6e476a85d1c3eb7633880e0"
 
 [[constraint]]
   branch = "master"

Gopkg.toml

@@ -2,6 +2,10 @@
   "swagger": "2.0",
   "info": {
    "title": "Cluster Registry",
+   "license": {
+    "name": "Apache License, Version 2.0",
+    "url": "https://github.com/kubernetes/cluster-registry/blob/v0.0.2/LICENSE"
+   },
    "version": "v0.0.2"
   },
   "paths": {

api/swagger.json

@@ -17,6 +17,7 @@
 set -euo pipefail
 
 SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+REPO_ROOT=$(cd ${SCRIPT_ROOT}/..; pwd)
 SCRIPT_BASE=$(cd ${SCRIPT_ROOT}/../..; pwd)
 REPO_DIRNAME=$(basename $(dirname "${SCRIPT_ROOT}"))
 TMP_GOPATH="$(mktemp -d /tmp/gopathXXXXXXXX)"
@@ -109,6 +110,24 @@ function generate_group() {
     --output-file-base zz_generated.conversion \
     "$4"
 
+  echo "generating protocol buffers for group ${GROUP_NAME} and version ${VERSION} at ${SCRIPT_BASE}/${CLIENT_PKG}"
+
+  # The generated go_binaries are not guaranteed to be in exactly the
+  # corresponding package in bazel-bin; there may be another
+  # architecture-specific subdirectory.
+  # The call to xargs trims leading whitespace.
+  PROTOC_GEN_GOGO_PATH="$(dirname "$(bazel build //vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo:protoc-gen-gogo 2>&1 | grep bazel-bin | xargs)")"
+  PROTOC_PATH="$(dirname "$(bazel build @com_google_protobuf//:protoc 2>&1 | grep bazel-bin | xargs)")"
+
+  # The protocol buffer compiler expects that the tools that it runs are in the
+  # PATH.
+  PATH="$(bazel info workspace)/${PROTOC_PATH}:$(bazel info workspace)/${PROTOC_GEN_GOGO_PATH}:${PATH}" \
+    bazel run //vendor/k8s.io/code-generator/cmd/go-to-protobuf -- \
+      --go-header-file "${SCRIPT_ROOT}/boilerplate/boilerplate.go.txt" \
+      --proto-import "$(bazel info output_base)/external/com_google_protobuf/src" \
+      --proto-import "$(bazel info workspace)/vendor" \
+      --packages "${APIS_PKG}/${GROUP_NAME}/${VERSION}"
+
   echo "generating openapi"
   mkdir -p "${OUTPUT_BASE}/${OPENAPI_PKG}"
   bazel run //vendor/k8s.io/code-generator/cmd/openapi-gen -- \
@@ -124,9 +143,11 @@ function generate_group() {
 mkdir -p "${TMP_GOPATH}/src/k8s.io/cluster-registry"
 mkdir -p "${TMP_GOPATH}/src/k8s.io/apimachinery"
 mkdir -p "${TMP_GOPATH}/src/k8s.io/kube-openapi"
+mkdir -p "${TMP_GOPATH}/src/github.com/gogo"
 cp -r "${SCRIPT_ROOT}/../"* "${TMP_GOPATH}/src/k8s.io/cluster-registry"
 cp -r "${SCRIPT_ROOT}/../vendor/k8s.io/apimachinery/"* "${TMP_GOPATH}/src/k8s.io/apimachinery"
 cp -r "${SCRIPT_ROOT}/../vendor/k8s.io/kube-openapi/"* "${TMP_GOPATH}/src/k8s.io/kube-openapi"
+cp -r "${SCRIPT_ROOT}/../vendor/github.com/gogo/"* "${TMP_GOPATH}/src/github.com/gogo"
 
 # In verify mode, generate into the temporary GOPATH.
 OUTPUT_BASE="${GEN_TMPDIR}"

hack/update-codegen.sh

@@ -18,6 +18,9 @@ set -euo pipefail
 SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ret=0
 
+# The go-to-protobuf tool requires goimports to be in the PATH.
+command -v goimports >/dev/null 2>&1 || go get golang.org/x/tools/cmd/goimports
+
 echo -e "\n########## Verifying Code Generation ##########\n"
 
 if ! ${SCRIPT_ROOT}/update-codegen.sh --verify-only; then

hack/verify-all-gensrc.sh

@@ -13,7 +13,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
     ],

pkg/apis/clusterregistry/BUILD.bazel

@@ -5,6 +5,7 @@ go_library(
     srcs = [
         "defaults.go",
         "doc.go",
+        "generated.pb.go",
         "register.go",
         "types.go",
         "zz_generated.conversion.go",
@@ -17,6 +18,8 @@ go_library(
     deps = [
         "//pkg/apis/clusterregistry:go_default_library",
         "//vendor/github.com/go-openapi/spec:go_default_library",
+        "//vendor/github.com/gogo/protobuf/proto:go_default_library",
+        "//vendor/github.com/gogo/protobuf/sortkeys:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",