Merge pull request #40150 from deads2k/fix-cycle-2

hack/verify-staging-imports.sh

@@ -31,4 +31,9 @@ for dep in $(ls -1 ${KUBE_ROOT}/staging/src/k8s.io/); do
 	fi
 done
 
+if grep -rq '// import "k8s.io/kubernetes/' 'staging/'; then
+	echo 'file has "// import "k8s.io/kubernetes/"'
+	exit 1
+fi
+
 exit 0
\ No newline at end of file

staging/src/k8s.io/apiserver/pkg/server/doc.go

@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package server contains the plumbing to create kubernetes-like API server command.
-package server // import "k8s.io/kubernetes/pkg/genericapiserver/server"
+package server