From c49cd4edf97d8669385bc538282cac465a525a38 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Mon, 21 Dec 2015 00:25:12 -0500
Subject: [PATCH] Alter the build to generate for __internal correctly

---
 cmd/gendeepcopy/deep_copy.go                     | 2 +-
 hack/after-build/update-generated-deep-copies.sh | 4 ++--
 hack/lib/util.sh                                 | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/gendeepcopy/deep_copy.go b/cmd/gendeepcopy/deep_copy.go
index 56fa74b03dc..70672df3a36 100644
--- a/cmd/gendeepcopy/deep_copy.go
+++ b/cmd/gendeepcopy/deep_copy.go
@@ -61,7 +61,7 @@ func pkgPath(group, version string) string {
 		group = "api"
 	}
 	gv := group
-	if version != "" {
+	if version != "__internal" {
 		gv = path.Join(group, version)
 	}
 	switch {
diff --git a/hack/after-build/update-generated-deep-copies.sh b/hack/after-build/update-generated-deep-copies.sh
index 83740149bf4..c3089be5e71 100755
--- a/hack/after-build/update-generated-deep-copies.sh
+++ b/hack/after-build/update-generated-deep-copies.sh
@@ -54,7 +54,7 @@ function generate_deep_copies() {
     else
       apiVersions="${ver}"
     fi
-    KUBE_API_VERSIONS="${apiVersions}" generate_version "${ver}"
+    KUBE_API_VERSIONS="${apiVersions:-}" generate_version "${ver}"
   done
 }
 
@@ -62,6 +62,6 @@ function generate_deep_copies() {
 # Currently pkg/api/deep_copy_generated.go is generated by the new go2idl generator.
 # All others (mentioned above) are still generated by the old reflection-based generator.
 # TODO: Migrate these to the new generator.
-DEFAULT_VERSIONS="v1 authorization/ authorization/v1beta1 extensions/ extensions/v1beta1 componentconfig/ componentconfig/v1alpha1 metrics/ metrics/v1alpha1"
+DEFAULT_VERSIONS="v1 authorization/__internal authorization/v1beta1 extensions/__internal extensions/v1beta1 componentconfig/__internal componentconfig/v1alpha1 metrics/__internal metrics/v1alpha1"
 VERSIONS=${VERSIONS:-$DEFAULT_VERSIONS}
 generate_deep_copies "$VERSIONS"
diff --git a/hack/lib/util.sh b/hack/lib/util.sh
index b4ebec1ecf8..5208a954c75 100755
--- a/hack/lib/util.sh
+++ b/hack/lib/util.sh
@@ -282,7 +282,7 @@ kube::util::group-version-to-pkg-path() {
   # moving the results to pkg/apis/api.
   case "${group_version}" in
     # both group and version are "", this occurs when we generate deep copies for internal objects of the legacy v1 API.
-    /)
+    __internal)
       echo "api"
       ;;
     v1)
@@ -292,7 +292,7 @@ kube::util::group-version-to-pkg-path() {
       echo "api/unversioned"
       ;;
     *)
-      echo "apis/${group_version}"
+      echo "apis/${group_version%__internal}"
       ;;
   esac
 }