@@ -52,6 +52,7 @@ rsync -av \

 /test/fixtures/***

 /test/integration/***

 /third_party/golang/***

+/third_party/protobuf/***

 /README.md

 EOF

@@ -19,7 +19,7 @@ if [[ ! "$clientgen" ]]; then

     echo "It looks as if you don't have a compiled client-gen binary"

     echo

     echo "If you are running from a clone of the git repo, please run"

-    echo "'./hack/build-go.sh Godeps/_workspace/src/k8s.io/kubernetes/cmd/libs/go2idl/client-gen'."

+    echo "'./hack/build-go.sh vendor/k8s.io/kubernetes/cmd/libs/go2idl/client-gen'."

   } >&2

   exit 1

 fi

new file mode 100755

@@ -0,0 +1,35 @@

+#!/bin/bash

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

+OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+source "${OS_ROOT}/hack/lib/init.sh"

+

+# Go to the top of the tree.

+cd "${OS_ROOT}"

+

+if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3.0."* ]]; then

+  echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"

+  echo "install the platform appropriate Protobuf package for your OS: "

+  echo

+  echo "  https://github.com/google/protobuf/releases"

+  echo

+  exit 1

+fi

+

+os::build::setup_env

+

+hack/build-go.sh tools/genprotobuf vendor/k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo

+genprotobuf="$( os::build::find-binary genprotobuf )"

+

+if [[ -z "${genprotobuf}" ]]; then

+	echo "It looks as if you don't have a compiled genprotobuf binary."

+	echo

+	echo "If you are running from a clone of the git repo, please run"

+	echo "'./hack/build-go.sh tools/genprotobuf'."

+	exit 1

+fi

+

+${genprotobuf} --output-base="${GOPATH}/src" "$@"

\ No newline at end of file

new file mode 100755

@@ -0,0 +1,38 @@

+#!/bin/bash

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

+OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+source "${OS_ROOT}/hack/lib/init.sh"

+

+APIROOTS=${APIROOTS:-pkg}

+_tmp="${OS_ROOT}/_output/diff"

+

+cleanup() {

+  echo rm -rf "${_tmp}"

+}

+

+trap "cleanup" EXIT SIGINT

+

+cleanup

+for APIROOT in ${APIROOTS}; do

+  mkdir -p "${_tmp}/${APIROOT%/*}"

+  cp -rf "${OS_ROOT}/${APIROOT}" "${_tmp}/"

+done

+

+"${OS_ROOT}/hack/update-generated-protobuf.sh"

+for APIROOT in ${APIROOTS}; do

+  TMP_APIROOT="${_tmp}/${APIROOT}"

+  echo "diffing ${APIROOT} against freshly generated protobuf"

+  ret=0

+  diff -Naupr -I 'Auto generated by' "${OS_ROOT}/${APIROOT}" "${TMP_APIROOT}" || ret=$?

+  # cp -rf "${TMP_APIROOT}" "${OS_ROOT}/${APIROOT%/*}"

+  if [[ $ret -eq 0 ]]; then

+    echo "${APIROOT} up to date."

+  else

+    echo "${APIROOT} is out of date. Please run hack/update-generated-protobuf.sh"

+    exit 1

+  fi

+done

@@ -50,6 +50,7 @@ DIR_BLACKLIST='./hack

 ./pkg/project

 ./pkg/quota

 ./pkg/router

+./pkg/sdn

 ./pkg/security

 ./pkg/serviceaccounts

 ./pkg/template

@@ -1,6 +1,8 @@

 package api_test

 import (

+	"bytes"

+	"encoding/hex"

 	"fmt"

 	"math/rand"

 	"reflect"

@@ -11,10 +13,12 @@ import (

 	"github.com/google/gofuzz"

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/meta"

+	"k8s.io/kubernetes/pkg/api/testapi"

 	apitesting "k8s.io/kubernetes/pkg/api/testing"

 	"k8s.io/kubernetes/pkg/api/unversioned"

 	"k8s.io/kubernetes/pkg/api/validation"

 	"k8s.io/kubernetes/pkg/runtime"

+	"k8s.io/kubernetes/pkg/runtime/serializer/protobuf"

 	"k8s.io/kubernetes/pkg/types"

 	"k8s.io/kubernetes/pkg/util/diff"

 	"k8s.io/kubernetes/pkg/util/intstr"

@@ -42,6 +46,16 @@ import (

 	_ "k8s.io/kubernetes/pkg/api/install"

 )

+var codecsToTest = []func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, error){

+	func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, error) {

+		return kapi.Codecs.LegacyCodec(version), nil

+	},

+	func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, error) {

+		s := protobuf.NewSerializer(kapi.Scheme, kapi.Scheme, "application/arbitrary.content.type")

+		return kapi.Codecs.CodecForVersions(s, s, testapi.ExternalGroupVersions(), nil), nil

+	},

+}

+

 func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item runtime.Object, seed int64) runtime.Object {

 	f := apitesting.FuzzerFor(t, forVersion, rand.NewSource(seed))

 	f.Funcs(

@@ -439,6 +453,21 @@ func defaultHookContainerName(hook *deploy.LifecycleHook, containerName string)

 	}

 }

+func roundTripWithAllCodecs(t *testing.T, version unversioned.GroupVersion, item runtime.Object) {

+	var codecs []runtime.Codec

+	for _, fn := range codecsToTest {

+		codec, err := fn(version, item)

+		if err != nil {

+			t.Errorf("unable to get codec: %v", err)

+			return

+		}

+		codecs = append(codecs, codec)

+	}

+	for _, codec := range codecs {

+		roundTrip(t, codec, item)

+	}

+}

+

 func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 	// Make a copy of the originalItem to give to conversion functions

 	// This lets us know if conversion messed with the input object

@@ -453,7 +482,8 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 	data, err := runtime.Encode(codec, item)

 	if err != nil {

 		if runtime.IsNotRegisteredError(err) {

-			t.Logf("%v is not registered", name)

+			t.Logf("%v skipped: not registered: %v", name, err)

+			return

 		}

 		t.Errorf("%v: %v (%#v)", name, err, item)

 		return

@@ -474,7 +504,7 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 	}

 	if !kapi.Semantic.DeepEqual(originalItem, obj2) {

-		t.Errorf("1: %v: diff: %v\nCodec: %v\nData: %s", name, diff.ObjectReflectDiff(originalItem, obj2), codec, string(data))

+		t.Errorf("1: %v: diff: %v\nCodec: %v\nData: %s", name, diff.ObjectReflectDiff(originalItem, obj2), codec, dataToString(data))

 		return

 	}

@@ -489,6 +519,13 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 	}

 }

+func dataToString(s []byte) string {

+	if bytes.HasPrefix(s, []byte("k8s")) {

+		return "\n" + hex.Dump(s)

+	}

+	return string(s)

+}

+

 // skipStandardVersions is a map of Kind to a list of API versions to test with.

 var skipStandardVersions = map[string][]unversioned.GroupVersion{

 	// The API versions here are to test our object that serializes from/into

@@ -503,17 +540,20 @@ func TestSpecificKind(t *testing.T) {

 	kapi.Scheme.Log(t)

 	defer kapi.Scheme.Log(nil)

-	kind := "DeploymentConfig"

+	kind := "ClusterRole"

 	item, err := kapi.Scheme.New(osapi.SchemeGroupVersion.WithKind(kind))

 	if err != nil {

-		t.Errorf("Couldn't make a %v? %v", kind, err)

-		return

+		t.Fatalf("Couldn't make a %v? %v", kind, err)

+	}

+	codec, err := codecsToTest[1](v1.SchemeGroupVersion, nil)

+	if err != nil {

+		t.Fatal(err)

 	}

-	seed := int64(2703387474910584091) //rand.Int63()

+	seed := int64(2703387474910584091)

 	for i := 0; i < fuzzIters; i++ {

 		//t.Logf(`About to test %v with "v1"`, kind)

 		fuzzInternalObject(t, v1.SchemeGroupVersion, item, seed)

-		roundTrip(t, kapi.Codecs.LegacyCodec(v1.SchemeGroupVersion), item)

+		roundTrip(t, codec, item)

 	}

 }

@@ -558,7 +598,7 @@ func TestTypes(t *testing.T) {

 						continue

 					}

 					fuzzInternalObject(t, externalVersion, item, seed)

-					roundTrip(t, kapi.Codecs.LegacyCodec(externalVersion), item)

+					roundTripWithAllCodecs(t, externalVersion, item)

 				}

 			}

 		}

@@ -271,6 +271,7 @@ func roundTrip(t *testing.T, codec runtime.Codec, originalItem runtime.Object) {

 	if err != nil {

 		if runtime.IsNotRegisteredError(err) {

 			t.Logf("%v is not registered", name)

+			return

 		}

 		t.Errorf("%v: %v (%#v)", name, err, item)

 		return

new file mode 100644

@@ -0,0 +1,60 @@

+// go-to-protobuf generates a Protobuf IDL from a Go struct, respecting any

+// existing IDL tags on the Go struct.

+package main

+

+import (

+	"path/filepath"

+	"strings"

+

+	"k8s.io/kubernetes/cmd/libs/go2idl/args"

+	"k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protobuf"

+

+	flag "github.com/spf13/pflag"

+)

+

+var g = protobuf.New()

+

+func init() {

+	sourceTree := args.DefaultSourceTree()

+	g.Common.GoHeaderFilePath = filepath.Join("hack", "boilerplate.txt")

+	g.ProtoImport = []string{

+		filepath.Join("vendor"),

+		filepath.Join("vendor", "k8s.io", "kubernetes", "third_party", "protobuf"),

+	}

+	g.OutputBase = sourceTree

+	g.Packages = strings.Join([]string{

+		`-k8s.io/kubernetes/pkg/util/intstr`,

+		`-k8s.io/kubernetes/pkg/api/resource`,

+		`-k8s.io/kubernetes/pkg/runtime`,

+		`-k8s.io/kubernetes/pkg/watch/versioned`,

+		`-k8s.io/kubernetes/pkg/api/unversioned`,

+		`-k8s.io/kubernetes/pkg/api/v1`,

+		`-k8s.io/kubernetes/pkg/apis/policy/v1alpha1`,

+		`-k8s.io/kubernetes/pkg/apis/extensions/v1beta1`,

+		`-k8s.io/kubernetes/pkg/apis/autoscaling/v1`,

+		`-k8s.io/kubernetes/pkg/apis/batch/v1`,

+		`-k8s.io/kubernetes/pkg/apis/batch/v2alpha1`,

+		`-k8s.io/kubernetes/pkg/apis/apps/v1alpha1`,

+		`-k8s.io/kubernetes/federation/apis/federation/v1beta1`,

+

+		`github.com/openshift/origin/pkg/authorization/api/v1`,

+		`github.com/openshift/origin/pkg/build/api/v1`,

+		`github.com/openshift/origin/pkg/deploy/api/v1`,

+		`github.com/openshift/origin/pkg/image/api/v1`,

+		`github.com/openshift/origin/pkg/oauth/api/v1`,

+		`github.com/openshift/origin/pkg/project/api/v1`,

+		`github.com/openshift/origin/pkg/quota/api/v1`,

+		`github.com/openshift/origin/pkg/route/api/v1`,

+		`github.com/openshift/origin/pkg/sdn/api/v1`,

+		`github.com/openshift/origin/pkg/security/api/v1`,

+		`github.com/openshift/origin/pkg/template/api/v1`,

+		`github.com/openshift/origin/pkg/user/api/v1`,

+	}, ",")

+

+	g.BindFlags(flag.CommandLine)

+}

+

+func main() {

+	flag.Parse()

+	protobuf.Run(g)

+}

new file mode 100644

@@ -0,0 +1,32 @@

+/*

+Copyright 2015 The Kubernetes Authors All rights reserved.

+

+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 main defines the protoc-gen-gogo binary we use to generate our proto go files,

+// as well as takes dependencies on the correct gogo/protobuf packages for godeps.

+package main

+

+import (

+	"github.com/gogo/protobuf/vanity/command"

+

+	// dependencies that are required for our packages

+	_ "github.com/gogo/protobuf/gogoproto"

+	_ "github.com/gogo/protobuf/proto"

+	_ "github.com/gogo/protobuf/sortkeys"

+)

+

+func main() {

+	command.Write(command.Generate(command.Read()))

+}