Skip to content

Commit 4f0db51

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents cbcbb49 + 968ccd8 commit 4f0db51

File tree

4 files changed

+38
-45
lines changed

4 files changed

+38
-45
lines changed

‎Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ verify: build
8585
hack/verify-generated-bindata.sh ||r=1;\
8686
hack/verify-generated-conversions.sh ||r=1;\
8787
hack/verify-generated-clientsets.sh ||r=1;\
88+
hack/verify-generated-deep-copies.sh ||r=1;\
8889
hack/verify-generated-defaulters.sh ||r=1;\
8990
hack/verify-generated-listers.sh ||r=1;\
9091
hack/verify-generated-informers.sh ||r=1;\
@@ -115,6 +116,7 @@ update:
115116
hack/update-generated-bindata.sh
116117
hack/update-generated-conversions.sh
117118
hack/update-generated-clientsets.sh
119+
hack/update-generated-deep-copies.sh
118120
hack/update-generated-defaulters.sh
119121
hack/update-generated-listers.sh
120122
hack/update-generated-informers.sh

‎hack/update-generated-deep-copies.sh

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
3+
4+
os::build::setup_env
5+
6+
os::util::ensure::built_binary_exists 'gendeepcopy'
7+
8+
gendeepcopy --output-base="${GOPATH}/src" "$@"

‎hack/verify-generated-deep-copies.sh

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
3+
4+
function cleanup() {
5+
return_code=$?
6+
os::test::junit::generate_report
7+
os::util::describe_return_code "${return_code}"
8+
exit "${return_code}"
9+
}
10+
trap "cleanup" EXIT
11+
12+
os::test::junit::declare_suite_start "verify/deep-copies"
13+
os::cmd::expect_success "${OS_ROOT}/hack/update-generated-deep-copies.sh --verify-only"
14+
os::test::junit::declare_suite_end

‎tools/gendeepcopy/deep_copy.go

+14-45
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,7 @@ func main() {
2020

2121
// Override defaults. These are Kubernetes specific input locations.
2222
arguments.InputDirs = []string{
23-
"k8s.io/kubernetes/pkg/api",
24-
"k8s.io/apimachinery/pkg/apis/meta/v1",
25-
"k8s.io/kubernetes/pkg/api/v1",
26-
"k8s.io/kubernetes/pkg/apis/authorization",
27-
"k8s.io/kubernetes/pkg/apis/authorization/v1beta1",
28-
"k8s.io/kubernetes/pkg/apis/autoscaling",
29-
"k8s.io/kubernetes/pkg/apis/autoscaling/v1",
30-
"k8s.io/kubernetes/pkg/apis/batch",
31-
"k8s.io/kubernetes/pkg/apis/batch/v1",
32-
"k8s.io/kubernetes/pkg/apis/componentconfig",
33-
"k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1",
34-
"k8s.io/kubernetes/pkg/apis/extensions",
35-
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1",
36-
"k8s.io/apimachinery/pkg/runtime",
37-
"k8s.io/apimachinery/pkg/util/intstr",
38-
"k8s.io/apimachinery/pkg/util/sets",
39-
"k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1",
40-
"k8s.io/kube-aggregator/pkg/apis/apiregistration",
41-
"github.com/openshift/origin/pkg/apps/apis/apps",
42-
"github.com/openshift/origin/pkg/apps/apis/apps/v1",
43-
"github.com/openshift/origin/pkg/authorization/apis/authorization",
44-
"github.com/openshift/origin/pkg/authorization/apis/authorization/v1",
4523
"github.com/openshift/origin/pkg/build/admission/testing",
46-
"github.com/openshift/origin/pkg/build/apis/build",
47-
"github.com/openshift/origin/pkg/build/apis/build/v1",
4824
"github.com/openshift/origin/pkg/build/controller/build/defaults/api",
4925
"github.com/openshift/origin/pkg/build/controller/build/defaults/api/v1",
5026
"github.com/openshift/origin/pkg/build/controller/build/overrides/api",
@@ -55,41 +31,34 @@ func main() {
5531
"github.com/openshift/origin/pkg/cmd/util/pluginconfig/testing",
5632
"github.com/openshift/origin/pkg/image/admission/imagepolicy/api",
5733
"github.com/openshift/origin/pkg/image/admission/imagepolicy/api/v1",
58-
"github.com/openshift/origin/pkg/image/apis/image",
59-
"github.com/openshift/origin/pkg/image/apis/image/docker10",
60-
"github.com/openshift/origin/pkg/image/apis/image/dockerpre012",
61-
"github.com/openshift/origin/pkg/image/apis/image/v1",
6234
"github.com/openshift/origin/pkg/ingress/admission/api",
6335
"github.com/openshift/origin/pkg/ingress/admission/api/v1",
64-
"github.com/openshift/origin/pkg/network/apis/network",
65-
"github.com/openshift/origin/pkg/network/apis/network/v1",
66-
"github.com/openshift/origin/pkg/oauth/apis/oauth",
67-
"github.com/openshift/origin/pkg/oauth/apis/oauth/v1",
6836
"github.com/openshift/origin/pkg/project/admission/lifecycle/testing",
6937
"github.com/openshift/origin/pkg/project/admission/requestlimit/api",
7038
"github.com/openshift/origin/pkg/project/admission/requestlimit/api/v1",
71-
"github.com/openshift/origin/pkg/project/apis/project",
72-
"github.com/openshift/origin/pkg/project/apis/project/v1",
7339
"github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api",
7440
"github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api/v1",
7541
"github.com/openshift/origin/pkg/quota/admission/runonceduration/api",
7642
"github.com/openshift/origin/pkg/quota/admission/runonceduration/api/v1",
77-
"github.com/openshift/origin/pkg/quota/apis/quota",
78-
"github.com/openshift/origin/pkg/quota/apis/quota/v1",
79-
"github.com/openshift/origin/pkg/route/apis/route",
80-
"github.com/openshift/origin/pkg/route/apis/route/v1",
8143
"github.com/openshift/origin/pkg/scheduler/admission/podnodeconstraints/api",
8244
"github.com/openshift/origin/pkg/scheduler/admission/podnodeconstraints/api/v1",
83-
"github.com/openshift/origin/pkg/security/apis/security",
84-
"github.com/openshift/origin/pkg/security/apis/security/v1",
85-
"github.com/openshift/origin/pkg/template/apis/template",
86-
"github.com/openshift/origin/pkg/template/apis/template/v1",
8745
"github.com/openshift/origin/pkg/template/servicebroker/apis/config",
8846
"github.com/openshift/origin/pkg/template/servicebroker/apis/config/v1",
89-
"github.com/openshift/origin/pkg/user/apis/user",
90-
"github.com/openshift/origin/pkg/user/apis/user/v1",
9147
"github.com/openshift/origin/pkg/util/testing",
9248
"github.com/openshift/origin/test/integration/testing",
49+
// internal apis
50+
"github.com/openshift/origin/pkg/apps/apis/apps",
51+
"github.com/openshift/origin/pkg/authorization/apis/authorization",
52+
"github.com/openshift/origin/pkg/build/apis/build",
53+
"github.com/openshift/origin/pkg/image/apis/image",
54+
"github.com/openshift/origin/pkg/network/apis/network",
55+
"github.com/openshift/origin/pkg/oauth/apis/oauth",
56+
"github.com/openshift/origin/pkg/project/apis/project",
57+
"github.com/openshift/origin/pkg/quota/apis/quota",
58+
"github.com/openshift/origin/pkg/route/apis/route",
59+
"github.com/openshift/origin/pkg/security/apis/security",
60+
"github.com/openshift/origin/pkg/template/apis/template",
61+
"github.com/openshift/origin/pkg/user/apis/user",
9362
}
9463

9564
arguments.GeneratedBuildTag = "ignore_autogenerated_openshift"
@@ -109,7 +78,7 @@ func main() {
10978
pkgs := generators.Packages(context, arguments)
11079
var include generator.Packages
11180
for _, pkg := range pkgs {
112-
if strings.Contains(pkg.Path(), "vendor/k8s.io/") {
81+
if strings.HasPrefix(pkg.Path(), "k8s.io/") {
11382
continue
11483
}
11584
include = append(include, pkg)

0 commit comments

Comments
 (0)