From ea39971b7ca9f4009b201981bdc49c328a3f2877 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Fri, 21 Jul 2017 12:11:42 +0200
Subject: [PATCH] Remove traces of go2idl

---
 hack/verify-api-groups.sh                                     | 4 ++--
 .../k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go  | 2 +-
 staging/src/k8s.io/kube-gen/cmd/client-gen/main.go            | 2 +-
 .../kube-gen/cmd/conversion-gen/generators/conversion.go      | 3 +--
 staging/src/k8s.io/kube-gen/cmd/set-gen/main.go               | 2 +-
 test/test_owners.csv                                          | 3 ---
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/hack/verify-api-groups.sh b/hack/verify-api-groups.sh
index ba1cebcf7a..51dd09e2f7 100755
--- a/hack/verify-api-groups.sh
+++ b/hack/verify-api-groups.sh
@@ -31,7 +31,7 @@ while IFS= read -d $'\0' -r file ; do
 done < <(find "${KUBE_ROOT}"/pkg/apis -name register.go -print0)
 
 # every register file should contain a GroupName.  Gather the different representations.
-# 1. group directory name for go2idl client gen
+# 1. group directory name for client gen
 # 2. external group versions for init.sh all APIs list
 # 3. install packages for inclusion in import_known_versions files
 group_dirnames=()
@@ -125,4 +125,4 @@ for external_group_version in "${external_group_versions[@]}"; do
 		echo "missing ${external_group_version} from hack/lib/init.sh:/KUBE_AVAILABLE_GROUP_VERSIONS or hack/init.sh:/KUBE_NONSERVER_GROUP_VERSIONS"
 		exit 1
 	fi
-done
\ No newline at end of file
+done
diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go b/staging/src/k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go
index 29722d52e7..5bc642bc8e 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/swagger_doc_generator.go
@@ -71,7 +71,7 @@ func fmtRawDoc(rawDoc string) string {
 			delPrevChar()
 			buffer.WriteString("\n\n")
 		case strings.HasPrefix(leading, "TODO"): // Ignore one line TODOs
-		case strings.HasPrefix(leading, "+"): // Ignore instructions to go2idl
+		case strings.HasPrefix(leading, "+"): // Ignore instructions to the generators
 		default:
 			if strings.HasPrefix(line, " ") || strings.HasPrefix(line, "\t") {
 				delPrevChar()
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go
index 01823c1a0b..7ee7fead6a 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// client-gen makes the individual typed clients using go2idl.
+// client-gen makes the individual typed clients using gengo.
 package main
 
 import (
diff --git a/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/conversion.go b/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/conversion.go
index 908a297757..6864d72346 100644
--- a/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/conversion.go
+++ b/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/conversion.go
@@ -35,8 +35,7 @@ import (
 	"github.com/golang/glog"
 )
 
-// CustomArgs is used tby the go2idl framework to pass args specific to this
-// generator.
+// CustomArgs is used by the gengo framework to pass args specific to this generator.
 type CustomArgs struct {
 	ExtraPeerDirs []string // Always consider these as last-ditch possibilities for conversions.
 	// Skipunsafe indicates whether to generate unsafe conversions to improve the efficiency
diff --git a/staging/src/k8s.io/kube-gen/cmd/set-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/set-gen/main.go
index b9e66abcaa..524ba81d03 100644
--- a/staging/src/k8s.io/kube-gen/cmd/set-gen/main.go
+++ b/staging/src/k8s.io/kube-gen/cmd/set-gen/main.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// set-gen is an example usage of go2idl.
+// set-gen is an example usage of gengo.
 //
 // Structs in the input directories with the below line in their comments will
 // have sets generated for them.
diff --git a/test/test_owners.csv b/test/test_owners.csv
index 78aa8ad2f8..d260e06fb8 100644
--- a/test/test_owners.csv
+++ b/test/test_owners.csv
@@ -583,9 +583,6 @@ k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig,apelisse,1,
 k8s.io/kubernetes/cmd/kubeadm/app/util/token,sttts,1,
 k8s.io/kubernetes/cmd/kubeadm/test/cmd,krousey,0,
 k8s.io/kubernetes/cmd/kubelet/app,derekwaynecarr,0,
-k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types,caesarxuchao,0,
-k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protobuf,smarterclayton,0,
-k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators,davidopp,1,
 k8s.io/kubernetes/cmd/mungedocs,mwielgus,1,
 k8s.io/kubernetes/examples,Random-Liu,0,
 k8s.io/kubernetes/federation/apis/federation/install,nikhiljindal,0,