Merge pull request #17680 from openshift-cherrypick-robot/cherry-pick…

…-17662-to-release-3.8

Automatic merge from submit-queue.

Automated cherry-pick of #17662 on release-3.8

This is an automated cherry-pick of #17662

/assign deads2k

Makefile

@@ -85,6 +85,7 @@ verify: build
 	hack/verify-generated-bindata.sh ||r=1;\
 	hack/verify-generated-conversions.sh ||r=1;\
 	hack/verify-generated-clientsets.sh ||r=1;\
+	hack/verify-generated-deep-copies.sh ||r=1;\
 	hack/verify-generated-defaulters.sh ||r=1;\
 	hack/verify-generated-listers.sh ||r=1;\
 	hack/verify-generated-informers.sh ||r=1;\
@@ -115,6 +116,7 @@ update:
 	hack/update-generated-bindata.sh
 	hack/update-generated-conversions.sh
 	hack/update-generated-clientsets.sh
+	hack/update-generated-deep-copies.sh
 	hack/update-generated-defaulters.sh
 	hack/update-generated-listers.sh
 	hack/update-generated-informers.sh

hack/update-generated-deep-copies.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
+
+os::build::setup_env
+
+os::util::ensure::built_binary_exists 'gendeepcopy'
+
+gendeepcopy --output-base="${GOPATH}/src" "$@"

hack/verify-generated-deep-copies.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
+
+function cleanup() {
+    return_code=$?
+    os::test::junit::generate_report
+    os::util::describe_return_code "${return_code}"
+    exit "${return_code}"
+}
+trap "cleanup" EXIT
+
+os::test::junit::declare_suite_start "verify/deep-copies"
+os::cmd::expect_success "${OS_ROOT}/hack/update-generated-deep-copies.sh --verify-only"
+os::test::junit::declare_suite_end

tools/gendeepcopy/deep_copy.go

@@ -20,31 +20,7 @@ func main() {
 
 	// Override defaults. These are Kubernetes specific input locations.
 	arguments.InputDirs = []string{
-		"k8s.io/kubernetes/pkg/api",
-		"k8s.io/apimachinery/pkg/apis/meta/v1",
-		"k8s.io/kubernetes/pkg/api/v1",
-		"k8s.io/kubernetes/pkg/apis/authorization",
-		"k8s.io/kubernetes/pkg/apis/authorization/v1beta1",
-		"k8s.io/kubernetes/pkg/apis/autoscaling",
-		"k8s.io/kubernetes/pkg/apis/autoscaling/v1",
-		"k8s.io/kubernetes/pkg/apis/batch",
-		"k8s.io/kubernetes/pkg/apis/batch/v1",
-		"k8s.io/kubernetes/pkg/apis/componentconfig",
-		"k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1",
-		"k8s.io/kubernetes/pkg/apis/extensions",
-		"k8s.io/kubernetes/pkg/apis/extensions/v1beta1",
-		"k8s.io/apimachinery/pkg/runtime",
-		"k8s.io/apimachinery/pkg/util/intstr",
-		"k8s.io/apimachinery/pkg/util/sets",
-		"k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1",
-		"k8s.io/kube-aggregator/pkg/apis/apiregistration",
-		"github.com/openshift/origin/pkg/apps/apis/apps",
-		"github.com/openshift/origin/pkg/apps/apis/apps/v1",
-		"github.com/openshift/origin/pkg/authorization/apis/authorization",
-		"github.com/openshift/origin/pkg/authorization/apis/authorization/v1",
 		"github.com/openshift/origin/pkg/build/admission/testing",
-		"github.com/openshift/origin/pkg/build/apis/build",
-		"github.com/openshift/origin/pkg/build/apis/build/v1",
 		"github.com/openshift/origin/pkg/build/controller/build/defaults/api",
 		"github.com/openshift/origin/pkg/build/controller/build/defaults/api/v1",
 		"github.com/openshift/origin/pkg/build/controller/build/overrides/api",
@@ -55,41 +31,34 @@ func main() {
 		"github.com/openshift/origin/pkg/cmd/util/pluginconfig/testing",
 		"github.com/openshift/origin/pkg/image/admission/imagepolicy/api",
 		"github.com/openshift/origin/pkg/image/admission/imagepolicy/api/v1",
-		"github.com/openshift/origin/pkg/image/apis/image",
-		"github.com/openshift/origin/pkg/image/apis/image/docker10",
-		"github.com/openshift/origin/pkg/image/apis/image/dockerpre012",
-		"github.com/openshift/origin/pkg/image/apis/image/v1",
 		"github.com/openshift/origin/pkg/ingress/admission/api",
 		"github.com/openshift/origin/pkg/ingress/admission/api/v1",
-		"github.com/openshift/origin/pkg/network/apis/network",
-		"github.com/openshift/origin/pkg/network/apis/network/v1",
-		"github.com/openshift/origin/pkg/oauth/apis/oauth",
-		"github.com/openshift/origin/pkg/oauth/apis/oauth/v1",
 		"github.com/openshift/origin/pkg/project/admission/lifecycle/testing",
 		"github.com/openshift/origin/pkg/project/admission/requestlimit/api",
 		"github.com/openshift/origin/pkg/project/admission/requestlimit/api/v1",
-		"github.com/openshift/origin/pkg/project/apis/project",
-		"github.com/openshift/origin/pkg/project/apis/project/v1",
 		"github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api",
 		"github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api/v1",
 		"github.com/openshift/origin/pkg/quota/admission/runonceduration/api",
 		"github.com/openshift/origin/pkg/quota/admission/runonceduration/api/v1",
-		"github.com/openshift/origin/pkg/quota/apis/quota",
-		"github.com/openshift/origin/pkg/quota/apis/quota/v1",
-		"github.com/openshift/origin/pkg/route/apis/route",
-		"github.com/openshift/origin/pkg/route/apis/route/v1",
 		"github.com/openshift/origin/pkg/scheduler/admission/podnodeconstraints/api",
 		"github.com/openshift/origin/pkg/scheduler/admission/podnodeconstraints/api/v1",
-		"github.com/openshift/origin/pkg/security/apis/security",
-		"github.com/openshift/origin/pkg/security/apis/security/v1",
-		"github.com/openshift/origin/pkg/template/apis/template",
-		"github.com/openshift/origin/pkg/template/apis/template/v1",
 		"github.com/openshift/origin/pkg/template/servicebroker/apis/config",
 		"github.com/openshift/origin/pkg/template/servicebroker/apis/config/v1",
-		"github.com/openshift/origin/pkg/user/apis/user",
-		"github.com/openshift/origin/pkg/user/apis/user/v1",
 		"github.com/openshift/origin/pkg/util/testing",
 		"github.com/openshift/origin/test/integration/testing",
+		// internal apis
+		"github.com/openshift/origin/pkg/apps/apis/apps",
+		"github.com/openshift/origin/pkg/authorization/apis/authorization",
+		"github.com/openshift/origin/pkg/build/apis/build",
+		"github.com/openshift/origin/pkg/image/apis/image",
+		"github.com/openshift/origin/pkg/network/apis/network",
+		"github.com/openshift/origin/pkg/oauth/apis/oauth",
+		"github.com/openshift/origin/pkg/project/apis/project",
+		"github.com/openshift/origin/pkg/quota/apis/quota",
+		"github.com/openshift/origin/pkg/route/apis/route",
+		"github.com/openshift/origin/pkg/security/apis/security",
+		"github.com/openshift/origin/pkg/template/apis/template",
+		"github.com/openshift/origin/pkg/user/apis/user",
 	}
 
 	arguments.GeneratedBuildTag = "ignore_autogenerated_openshift"
@@ -109,7 +78,7 @@ func main() {
 			pkgs := generators.Packages(context, arguments)
 			var include generator.Packages
 			for _, pkg := range pkgs {
-				if strings.Contains(pkg.Path(), "vendor/k8s.io/") {
+				if strings.HasPrefix(pkg.Path(), "k8s.io/") {
 					continue
 				}
 				include = append(include, pkg)