Don't revert, necessary change to make helpers to include k8s.io/api

Don't revert, change boundingdirs in Makefile for deepcopy-gen

manually fix pkg/client/clientset_generated/clientset/typed/core/v1/pod_expansion.go because external policy types are moved now
This commit is contained in:
Chao Xu 2017-06-07 19:20:18 -07:00
parent 800eb07b27
commit bad65b4c95
3 changed files with 4 additions and 4 deletions

View File

@ -222,7 +222,7 @@ RUN_GEN_DEEPCOPY = \
--v $(KUBE_VERBOSE) \
--logtostderr \
-i $$(cat $(META_DIR)/$(DEEPCOPY_GEN).todo | paste -sd, -) \
--bounding-dirs $(PRJ_SRC_PATH) \
--bounding-dirs $(PRJ_SRC_PATH),,"k8s.io/api" \
-O $(DEEPCOPY_BASENAME) \
"$$@"; \
fi \

View File

@ -39,7 +39,7 @@ function kfind() {
# include the "special" vendor directories which are actually part
# of the Kubernetes source tree - generators will use these for
# including certain core API concepts.
find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver \
find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver ./vendor/k8s.io/api \
\( \
-not \( \
\( \

View File

@ -17,9 +17,9 @@ limitations under the License.
package v1
import (
restclient "k8s.io/client-go/rest"
"k8s.io/api/core/v1"
policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
policy "k8s.io/api/policy/v1beta1"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme"
)