Remove k8s/k8s dependency (#1355)

* Copy used types from k8s/k8s repo to Service Catalog codebase

* Remove dependency on k8s/k8s repo

* Update vendor dir (remove vendored k8s/k8s)

* FIx conversion-gen, stop importing k8s/k8s packages

* Copy init scripts from k8s/k8s, needed for running integration tests

* Update etcd version

* Removed unused scripts

Author: nilebox

Makefile

@@ -86,8 +86,8 @@ USER_BROKER_IMAGE                 = $(REGISTRY)user-broker-$(ARCH):$(VERSION)
 USER_BROKER_MUTABLE_IMAGE         = $(REGISTRY)user-broker-$(ARCH):$(MUTABLE_TAG)
 
 # precheck to avoid kubernetes-incubator/service-catalog#361
-$(if $(realpath vendor/k8s.io/kubernetes/vendor), \
-	$(error the vendor directory exists in the kubernetes \
+$(if $(realpath vendor/k8s.io/apimachinery/vendor), \
+	$(error the vendor directory exists in the apimachinery \
 		vendored source and must be flattened. \
 		run 'glide i -v'))
 
@@ -188,6 +188,7 @@ $(BINDIR)/e2e.test: .init $(NEWEST_E2ETEST_SOURCE) $(NEWEST_GO_FILE)
 	# Generate conversions
 	$(DOCKER_CMD) $(BINDIR)/conversion-gen \
 		--v 1 --logtostderr \
+		--extra-peer-dirs k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/conversion,k8s.io/apimachinery/pkg/runtime \
 		--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
 		--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog" \
 		--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1beta1" \
@@ -228,6 +229,7 @@ verify: .init .generate_files verify-client-gen
 	@# observes conventions from upstream that will not pass lint checks).
 	@$(DOCKER_CMD) sh -c \
 	  'for i in $$(find $(TOP_SRC_DIRS) -name *.go \
+	    | grep -v ^pkg/kubernetes/ \
 	    | grep -v generated \
 	    | grep -v ^pkg/client/ \
 	    | grep -v v1beta1/defaults.go); \

build/build-image/Dockerfile

@@ -24,8 +24,8 @@ RUN curl -sSL https://github.com/Masterminds/glide/releases/download/$GLIDE_VERS
     | tar -vxz -C /usr/local/bin --strip=1
 
 # Install etcd
-RUN curl -sSL https://github.com/coreos/etcd/releases/download/v3.1.0/etcd-v3.1.0-linux-amd64.tar.gz \
-    | tar -vxz -C /usr/local/bin --strip=1 etcd-v3.1.0-linux-amd64/etcd
+RUN curl -sSL https://github.com/coreos/etcd/releases/download/v3.1.10/etcd-v3.1.10-linux-amd64.tar.gz \
+    | tar -vxz -C /usr/local/bin --strip=1 etcd-v3.1.10-linux-amd64/etcd
 
 # Install the golint, use this to check our source for niceness
 RUN go get -u github.com/golang/lint/golint

build/verify-errexit.sh

@@ -33,7 +33,7 @@ fi
 
 # Gather the list of files that appear to be shell scripts.
 # Meaning they have some form of "#!...sh" as a line in them.
-shFiles=$(grep -rl '^#!.*sh$' $args)
+shFiles=$(grep -rl '^#!.*sh$' $args | grep -v ^pkg/kubernetes/)
 
 tmp=/tmp/out$RANDOM
 for file in ${shFiles}; do

cmd/apiserver/app/server/server.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/kubernetes-incubator/service-catalog/pkg"
+	"github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/util/interrupt"
 	"github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"
 	"github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/broker/authsarcheck"
 	"github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/namespace/lifecycle"
@@ -32,7 +33,6 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apiserver/pkg/admission"
 	genericserveroptions "k8s.io/apiserver/pkg/server/options"
-	"k8s.io/kubernetes/pkg/util/interrupt"
 )
 
 const (

cmd/controller-manager/app/controller_manager.go

@@ -37,13 +37,13 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/record"
 
+	"github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/util/configz"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
-	"k8s.io/kubernetes/pkg/util/configz"
 
 	// The API groups for our API must be installed before we can use the
 	// client to work with them.  This needs to be done once per process; this

cmd/controller-manager/app/options/options.go

@@ -27,9 +27,9 @@ import (
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 
 	"github.com/kubernetes-incubator/service-catalog/pkg/apis/componentconfig"
+	k8scomponentconfig "github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/apis/componentconfig"
+	"github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/client/leaderelectionconfig"
 	osb "github.com/pmorie/go-open-service-broker-client/v2"
-	k8scomponentconfig "k8s.io/kubernetes/pkg/apis/componentconfig"
-	"k8s.io/kubernetes/pkg/client/leaderelectionconfig"
 )
 
 // ControllerManagerServer is the main context object for the controller

glide.lock

@@ -68,8 +68,6 @@ import:
   - args
 - package: github.com/kubernetes/repo-infra
   version: e26fc85d14a1d3dc25569831acc06919673c545a # latest (Oct 4, 2017)
-- package: k8s.io/kubernetes
-  version: 0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4 # kubernetes 1.8.0
 - package: k8s.io/client-go
   version: afb4606c45bae77c4dc2c15291d4d7d6d792196c # release-5.0, latest (Oct 4, 2017)
 - package: k8s.io/apimachinery

glide.yaml

@@ -23,7 +23,7 @@ package componentconfig
 import (
 	"time"
 
-	"k8s.io/kubernetes/pkg/apis/componentconfig"
+	"github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/apis/componentconfig"
 )
 
 // ControllerManagerConfiguration encapsulates configuration for the

pkg/apis/componentconfig/types.go

@@ -0,0 +1,29 @@
+# Kubernetes Code Copy Area
+
+This directory is the copy of original types from the main 
+[kubernetes/kubernetes repo](https://github.com/kubernetes/kubernetes) with 
+maintaining original packages structure. The purpose of this package is to
+avoid depending on the entire main repo and copy only necessary types as needed.
+
+The types in this directory should be treated as read-only, and any necessary
+changes should be addressed in the original repository. If there are some 
+specific changes needed to be made for Service Catalog, the type should be moved
+out of this directory to the appropriate one first.
+
+## Updating dependencies to the latest Kubernetes release
+
+When updating dependencies on 
+[k8s.io/apimachinery](https://github.com/kubernetes/apimachinery),
+[k8s.io/client-go](https://github.com/kubernetes/client-go), 
+[k8s.io/apiserver](https://github.com/kubernetes/apiserver)
+and other top-level Kubernetes repositories, we need to overwrite the types in
+this directory with the latest version from the corresponding release of
+[k8s.io/kubernetes](https://github.com/kubernetes/kubernetes) to keep the files
+in sync.
+
+## Long-term plan
+
+In the long term the packages used by Kubernetes-based projects will be moved
+from the main repo to separate top-level repositories, [k8s.io/common](https://github.com/kubernetes/common)
+and [k8s.io/utils](https://github.com/kubernetes/utils). Once it is done, we can
+eventually switch to those packages and drop this directory.

pkg/kubernetes/README.md

@@ -16,7 +16,7 @@
 
 # A set of helpers for starting/running etcd for tests
 
-ETCD_VERSION=${ETCD_VERSION:-3.0.17}
+ETCD_VERSION=${ETCD_VERSION:-3.1.10}
 ETCD_HOST=${ETCD_HOST:-127.0.0.1}
 ETCD_PORT=${ETCD_PORT:-2379}
 

vendor/k8s.io/kubernetes/cluster/lib/logging.sh renamed to pkg/kubernetes/cluster/lib/logging.sh

@@ -366,13 +366,16 @@ kube::golang::setup_env() {
 
   kube::golang::create_gopath_tree
 
-  export GOPATH=${KUBE_GOPATH}
+  export GOPATH="${KUBE_GOPATH}"
 
   # Append KUBE_EXTRA_GOPATH to the GOPATH if it is defined.
   if [[ -n ${KUBE_EXTRA_GOPATH:-} ]]; then
     GOPATH="${GOPATH}:${KUBE_EXTRA_GOPATH}"
   fi
 
+  # Make sure our own Go binaries are in PATH.
+  export PATH="${KUBE_GOPATH}/bin:${PATH}"
+
   # Change directories so that we are within the GOPATH.  Some tools get really
   # upset if this is not true.  We use a whole fake GOPATH here to collect the
   # resultant binaries.  Go will not let us use GOBIN with `go install` and

vendor/k8s.io/kubernetes/hack/lib/etcd.sh renamed to pkg/kubernetes/hack/lib/etcd.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2014 The Kubernetes Authors.
+# Copyright 2017 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -56,6 +56,7 @@ admissionregistration.k8s.io/v1alpha1 \
 admission.k8s.io/v1alpha1 \
 apps/v1beta1 \
 apps/v1beta2 \
+apps/v1 \
 authentication.k8s.io/v1 \
 authentication.k8s.io/v1beta1 \
 authorization.k8s.io/v1 \
@@ -169,4 +170,3 @@ kube::realpath() {
   fi
   kube::readlinkdashf "$1"
 }
-