Skip to content

Commit dffe68a

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #18415 from deads2k/gen-02-conversion
Automatic merge from submit-queue (batch tested with PRs 18415, 18419, 18268, 18102, 18440). switches conversiongen to use upstream binary Updates the updateconversion script to use the upstream command directly. /assign @mfojtik /assign @sttts @mfojtik I added an extra commit showing how to generate conversions for other packages too. If you like, I can add them for the non-generated conversions you've been chasing.
2 parents 8e8b874 + 72e51d2 commit dffe68a

File tree

342 files changed

+1324
-1239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

342 files changed

+1324
-1239
lines changed

Diff for: ‎hack/import-restrictions.json

+8-9
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"github.com/openshift/origin/pkg/authorization/registry/rolebinding",
7878
"github.com/openshift/origin/pkg/build/admission/jenkinsbootstrapper",
7979
"github.com/openshift/origin/pkg/build/admission/secretinjector",
80-
"github.com/openshift/origin/pkg/cmd/server/api/validation",
80+
"github.com/openshift/origin/pkg/cmd/server/apis/config/validation",
8181
"github.com/openshift/origin/pkg/cmd/server/handlers",
8282
"github.com/openshift/origin/pkg/oauth/util",
8383
"github.com/openshift/origin/pkg/oc/admin",
@@ -364,14 +364,13 @@
364364
],
365365
"allowedImportPackages": [
366366
"vendor/github.com/golang/glog",
367-
"github.com/openshift/origin/pkg/cmd/server/api",
368367
"github.com/openshift/origin/pkg/util/http/links",
369368
"github.com/openshift/origin/pkg/authorization/authorizer/scope",
370369
"github.com/openshift/origin/pkg/oauth/apis/oauth/validation",
371370
"github.com/openshift/origin/pkg/oauth/scope",
372371
"github.com/openshift/origin/pkg/oauth/registry/oauthclientauthorization",
373-
"github.com/openshift/origin/pkg/cmd/server/api",
374-
"github.com/openshift/origin/pkg/cmd/server/api/latest",
372+
"github.com/openshift/origin/pkg/cmd/server/apis/config",
373+
"github.com/openshift/origin/pkg/cmd/server/apis/config/latest",
375374
"github.com/openshift/origin/pkg/cmd/util",
376375
"github.com/openshift/origin/pkg/serviceaccounts/oauthclient",
377376
"github.com/openshift/origin/pkg/oauth/registry/oauthclient",
@@ -465,7 +464,7 @@
465464
"github.com/openshift/origin/pkg/build/client",
466465
"github.com/openshift/origin/pkg/build/client/internalversion",
467466
"github.com/openshift/origin/pkg/build/cmd",
468-
"github.com/openshift/origin/pkg/build/controller/build/defaults/api",
467+
"github.com/openshift/origin/pkg/build/controller/build/apis/defaults",
469468
"github.com/openshift/origin/pkg/build/prune",
470469
"github.com/openshift/origin/pkg/build/registry/build",
471470
"github.com/openshift/origin/pkg/build/registry/buildconfig",
@@ -475,10 +474,10 @@
475474
"github.com/openshift/origin/pkg/client/config",
476475
"github.com/openshift/origin/pkg/cmd/flagtypes",
477476
"github.com/openshift/origin/pkg/cmd/server/admin",
478-
"github.com/openshift/origin/pkg/cmd/server/api",
479-
"github.com/openshift/origin/pkg/cmd/server/api/install",
480-
"github.com/openshift/origin/pkg/cmd/server/api/latest",
481-
"github.com/openshift/origin/pkg/cmd/server/api/validation",
477+
"github.com/openshift/origin/pkg/cmd/server/apis/config",
478+
"github.com/openshift/origin/pkg/cmd/server/apis/config/install",
479+
"github.com/openshift/origin/pkg/cmd/server/apis/config/latest",
480+
"github.com/openshift/origin/pkg/cmd/server/apis/config/validation",
482481
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy",
483482
"github.com/openshift/origin/pkg/cmd/server/crypto",
484483
"github.com/openshift/origin/pkg/cmd/server/etcd",

Diff for: ‎hack/update-generated-bindata.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pushd "${OS_ROOT}" > /dev/null
3535
examples/prometheus/... \
3636
examples/service-catalog/... \
3737
install/... \
38-
pkg/image/admission/imagepolicy/api/v1/...
38+
pkg/image/admission/apis/imagepolicy/v1/...
3939

4040
"$(os::util::find::gopath_binary go-bindata)" \
4141
-nocompress \

Diff for: ‎hack/update-generated-conversions.sh

+36-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,41 @@
11
#!/bin/bash
22
source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
33

4-
os::build::setup_env
4+
SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
5+
CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../../../k8s.io/code-generator)}
56

6-
os::util::ensure::built_binary_exists 'genconversion'
7+
go install ./${CODEGEN_PKG}/cmd/conversion-gen
78

8-
genconversion --output-base="${GOPATH}/src" "$@"
9+
function codegen::join() { local IFS="$1"; shift; echo "$*"; }
10+
11+
# enumerate group versions
12+
ALL_FQ_APIS=(
13+
github.com/openshift/origin/pkg/build/controller/build/apis/defaults/v1
14+
github.com/openshift/origin/pkg/apps/apis/apps/v1
15+
github.com/openshift/origin/pkg/authorization/apis/authorization/v1
16+
github.com/openshift/origin/pkg/build/apis/build/v1
17+
github.com/openshift/origin/pkg/image/apis/image/v1
18+
github.com/openshift/origin/pkg/network/apis/network/v1
19+
github.com/openshift/origin/pkg/oauth/apis/oauth/v1
20+
github.com/openshift/origin/pkg/project/apis/project/v1
21+
github.com/openshift/origin/pkg/quota/apis/quota/v1
22+
github.com/openshift/origin/pkg/route/apis/route/v1
23+
github.com/openshift/origin/pkg/security/apis/security/v1
24+
github.com/openshift/origin/pkg/template/apis/template/v1
25+
github.com/openshift/origin/pkg/user/apis/user/v1
26+
)
27+
28+
ALL_PEERS=(
29+
k8s.io/apimachinery/pkg/api/resource
30+
k8s.io/apimachinery/pkg/apis/meta/v1
31+
k8s.io/apimachinery/pkg/apis/meta/internalversion
32+
k8s.io/apimachinery/pkg/runtime
33+
k8s.io/apimachinery/pkg/conversion
34+
k8s.io/apimachinery/pkg/types
35+
k8s.io/api/core/v1
36+
k8s.io/kubernetes/pkg/apis/core
37+
k8s.io/kubernetes/pkg/apis/core/v1
38+
)
39+
40+
echo "Generating conversions"
41+
${GOPATH}/bin/conversion-gen --input-dirs $(codegen::join , "${ALL_FQ_APIS[@]}") --extra-peer-dirs $(codegen::join , "${ALL_PEERS[@]}") --build-tag=ignore_autogenerated_openshift -O zz_generated.conversion --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.txt --v=8 "$@"

Diff for: ‎hack/update-generated-deep-copies.sh

+52-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,57 @@
11
#!/bin/bash
22
source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
33

4-
os::build::setup_env
4+
SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
5+
CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../../../k8s.io/code-generator)}
6+
verify="${VERIFY:-}"
57

6-
os::util::ensure::built_binary_exists 'gendeepcopy'
8+
go install ./${CODEGEN_PKG}/cmd/deepcopy-gen
79

8-
gendeepcopy --output-base="${GOPATH}/src" "$@"
10+
function codegen::join() { local IFS="$1"; shift; echo "$*"; }
11+
12+
# enumerate group versions
13+
ALL_FQ_APIS=(
14+
github.com/openshift/origin/pkg/build/controller/build/apis/defaults
15+
github.com/openshift/origin/pkg/build/controller/build/apis/defaults/v1
16+
github.com/openshift/origin/pkg/build/controller/build/apis/overrides
17+
github.com/openshift/origin/pkg/build/controller/build/apis/overrides/v1
18+
github.com/openshift/origin/pkg/build/controller/build/pluginconfig/testing
19+
github.com/openshift/origin/pkg/cmd/server/apis/config
20+
github.com/openshift/origin/pkg/cmd/server/apis/config/v1
21+
github.com/openshift/origin/pkg/cmd/server/apis/config/v1/testing
22+
github.com/openshift/origin/pkg/image/admission/apis/imagepolicy
23+
github.com/openshift/origin/pkg/image/admission/apis/imagepolicy/v1
24+
github.com/openshift/origin/pkg/image/admission/apis/imagequalify
25+
github.com/openshift/origin/pkg/image/admission/apis/imagequalify/v1
26+
github.com/openshift/origin/pkg/ingress/admission/apis/ingressadmission
27+
github.com/openshift/origin/pkg/ingress/admission/apis/ingressadmission/v1
28+
github.com/openshift/origin/pkg/project/admission/lifecycle/testing
29+
github.com/openshift/origin/pkg/project/admission/apis/requestlimit
30+
github.com/openshift/origin/pkg/project/admission/apis/requestlimit/v1
31+
github.com/openshift/origin/pkg/quota/admission/apis/clusterresourceoverride
32+
github.com/openshift/origin/pkg/quota/admission/apis/clusterresourceoverride/v1
33+
github.com/openshift/origin/pkg/quota/admission/apis/runonceduration
34+
github.com/openshift/origin/pkg/quota/admission/apis/runonceduration/v1
35+
github.com/openshift/origin/pkg/router/f5/testing
36+
github.com/openshift/origin/pkg/scheduler/admission/apis/podnodeconstraints
37+
github.com/openshift/origin/pkg/scheduler/admission/apis/podnodeconstraints/v1
38+
github.com/openshift/origin/pkg/template/servicebroker/apis/config
39+
github.com/openshift/origin/pkg/template/servicebroker/apis/config/v1
40+
github.com/openshift/origin/pkg/util/testing
41+
github.com/openshift/origin/test/integration/testing
42+
github.com/openshift/origin/pkg/apps/apis/apps
43+
github.com/openshift/origin/pkg/authorization/apis/authorization
44+
github.com/openshift/origin/pkg/build/apis/build
45+
github.com/openshift/origin/pkg/image/apis/image
46+
github.com/openshift/origin/pkg/network/apis/network
47+
github.com/openshift/origin/pkg/oauth/apis/oauth
48+
github.com/openshift/origin/pkg/project/apis/project
49+
github.com/openshift/origin/pkg/quota/apis/quota
50+
github.com/openshift/origin/pkg/route/apis/route
51+
github.com/openshift/origin/pkg/security/apis/security
52+
github.com/openshift/origin/pkg/template/apis/template
53+
github.com/openshift/origin/pkg/user/apis/user
54+
)
55+
56+
echo "Generating deepcopy funcs"
57+
${GOPATH}/bin/deepcopy-gen --input-dirs $(codegen::join , "${ALL_FQ_APIS[@]}") -O zz_generated.deepcopy --bounding-dirs $(codegen::join , "${ALL_FQ_APIS[@]}") --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.txt ${verify} "$@"

Diff for: ‎pkg/api/install/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
_ "k8s.io/kubernetes/pkg/apis/settings/install"
2525
_ "k8s.io/kubernetes/pkg/apis/storage/install"
2626

27-
_ "github.com/openshift/origin/pkg/cmd/server/api/install"
27+
_ "github.com/openshift/origin/pkg/cmd/server/apis/config/install"
2828

2929
apps "github.com/openshift/origin/pkg/apps/apis/apps/install"
3030
authz "github.com/openshift/origin/pkg/authorization/apis/authorization/install"

Diff for: ‎pkg/api/install/tags_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"k8s.io/apimachinery/pkg/util/sets"
1313
"k8s.io/kubernetes/pkg/api/legacyscheme"
1414

15-
configapi "github.com/openshift/origin/pkg/cmd/server/api"
16-
configapiv1 "github.com/openshift/origin/pkg/cmd/server/api/v1"
15+
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
16+
configapiv1 "github.com/openshift/origin/pkg/cmd/server/apis/config/v1"
1717
)
1818

1919
func TestDescriptions(t *testing.T) {

Diff for: ‎pkg/apps/apis/apps/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pkg/authorization/apis/authorization/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pkg/build/admission/jenkinsbootstrapper/admission.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/openshift/origin/pkg/bulk"
2323
authenticationclient "github.com/openshift/origin/pkg/client/impersonatingclient"
2424
oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
25-
configapi "github.com/openshift/origin/pkg/cmd/server/api"
25+
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
2626
templateclient "github.com/openshift/origin/pkg/template/generated/internalclientset"
2727
)
2828

Diff for: ‎pkg/build/admission/jenkinsbootstrapper/admission_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
1515

1616
buildapi "github.com/openshift/origin/pkg/build/apis/build"
17-
configapi "github.com/openshift/origin/pkg/cmd/server/api"
17+
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
1818
templatefake "github.com/openshift/origin/pkg/template/generated/internalclientset/fake"
1919
)
2020

Diff for: ‎pkg/build/apis/build/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pkg/build/controller/build/overrides/api/doc.go renamed to ‎pkg/build/controller/build/apis/defaults/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// +k8s:deepcopy-gen=package,register
22

33
// Package api is the internal version of the API.
4-
package api
4+
package defaults

Diff for: ‎pkg/build/controller/build/overrides/api/install/install.go renamed to ‎pkg/build/controller/build/apis/defaults/install/install.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"k8s.io/apimachinery/pkg/runtime/schema"
77

8-
"github.com/openshift/origin/pkg/build/controller/build/overrides/api"
9-
"github.com/openshift/origin/pkg/build/controller/build/overrides/api/v1"
10-
configapi "github.com/openshift/origin/pkg/cmd/server/api"
8+
"github.com/openshift/origin/pkg/build/controller/build/apis/defaults"
9+
"github.com/openshift/origin/pkg/build/controller/build/apis/defaults/v1"
10+
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
1111
)
1212

1313
// availableVersions lists all known external versions for this group from most preferred to least preferred
@@ -30,7 +30,7 @@ func enableVersions(externalVersions []schema.GroupVersion) error {
3030

3131
func addVersionsToScheme(externalVersions ...schema.GroupVersion) {
3232
// add the internal version to Scheme
33-
api.AddToScheme(configapi.Scheme)
33+
defaults.AddToScheme(configapi.Scheme)
3434
// add the enabled external versions to Scheme
3535
for _, v := range externalVersions {
3636
switch v {

Diff for: ‎pkg/build/controller/build/defaults/api/register.go renamed to ‎pkg/build/controller/build/apis/defaults/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package api
1+
package defaults
22

33
import (
44
"k8s.io/apimachinery/pkg/runtime"

Diff for: ‎pkg/build/controller/build/defaults/api/types.go renamed to ‎pkg/build/controller/build/apis/defaults/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package api
1+
package defaults
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Diff for: ‎pkg/build/controller/build/apis/defaults/v1/doc.go

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// +k8s:conversion-gen=github.com/openshift/origin/pkg/build/controller/build/apis/defaults
2+
// +k8s:conversion-gen-external-types=github.com/openshift/origin/pkg/build/controller/build/apis/defaults/v1
3+
// +k8s:deepcopy-gen=package,register
4+
5+
// Package v1 is the v1 version of the API.
6+
package v1

Diff for: ‎pkg/build/controller/build/defaults/api/v1/register.go renamed to ‎pkg/build/controller/build/apis/defaults/v1/register.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
var SchemeGroupVersion = schema.GroupVersion{Group: "", Version: "v1"}
1010

1111
var (
12-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
13-
AddToScheme = SchemeBuilder.AddToScheme
12+
localSchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
13+
AddToScheme = localSchemeBuilder.AddToScheme
1414
)
1515

1616
// Adds the list of known types to api.Scheme.

Diff for: ‎pkg/build/controller/build/defaults/api/v1/swagger_doc.go renamed to ‎pkg/build/controller/build/apis/defaults/v1/swagger_doc.go

File renamed without changes.

Diff for: ‎pkg/build/controller/build/defaults/api/v1/types.go renamed to ‎pkg/build/controller/build/apis/defaults/v1/types.go

File renamed without changes.

Diff for: ‎pkg/build/controller/build/apis/defaults/v1/zz_generated.conversion.go

+112
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)