fix jenkins verification issue

kubernetes · Nov 17, 2016 · c24d4e1 · c24d4e1
1 parent 3a97cb7
commit c24d4e1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD
@@ -29,6 +29,8 @@ go_library(
         "//pkg/registry/generic:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/storage/storagebackend:go_default_library",
+        "//pkg/util/sets:go_default_library",
+        "//vendor:github.com/emicklei/go-restful",
         "//vendor:github.com/golang/glog",
     ],
 )
diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go
@@ -100,7 +100,7 @@ type thirdPartyEntry struct {
 }
 
 func (g *thirdPartyGroup) versionInstalled(version string) bool {
-	for installedVersion, _ := range g.versionedEntry {
+	for installedVersion := range g.versionedEntry {
 		if reflect.DeepEqual(version, installedVersion) {
 			return true
 		}

diff --git a/pkg/registry/extensions/rest/BUILD b/pkg/registry/extensions/rest/BUILD
@@ -19,7 +19,9 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
+        "//pkg/api/meta:go_default_library",
         "//pkg/api/rest:go_default_library",
+        "//pkg/api/unversioned:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library",

diff --git a/pkg/registry/extensions/rest/thirdparty_controller.go b/pkg/registry/extensions/rest/thirdparty_controller.go
@@ -94,7 +94,7 @@ func (t *ThirdPartyController) syncResourceList(list runtime.Object) error {
 					Kind:    kind,
 				})
 				// place it in the set of resources that we expect, so that we don't delete it in the delete pass
-				fullAPIPath := MakeThirdPartyPath(group) + "/" + version.Name + "/" + plural.Resource
+				fullAPIPath := makeFullAPIPath(group, version.Name) + "/" + plural.Resource
 				existing.Insert(fullAPIPath)
 			}
 			// ensure a RESTful resource for this schema exists on the master
@@ -134,6 +134,16 @@ func MakeThirdPartyPath(group string) string {
 	return thirdpartyprefix + "/" + group
 }
 
+func makeFullAPIPath(group, version string) string {
+	if len(group) == 0 {
+		return thirdpartyprefix
+	}
+	if len(version) == 0 {
+		return thirdpartyprefix + "/" + group
+	}
+	return thirdpartyprefix + "/" + group + "/" + version
+}
+
 func GetThirdPartyGroupName(path string) string {
 	ix := strings.LastIndex(path, "/")
 	if ix == -1 {

diff --git a/test/e2e/generated/BUILD b/test/e2e/generated/BUILD
@@ -12,9 +12,6 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "bindata.go",
-        "main.go",
-    ],
+    srcs = ["main.go"],
     tags = ["automanaged"],
 )