Skip to content

move pkg/build to external client and types #20659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Aug 21, 2018
Merged

move pkg/build to external client and types #20659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dbbe7de
move existing build helpers to external versions
mfojtik Aug 20, 2018
3806ab8
copy imagereferencemutators to internalversion
mfojtik Aug 17, 2018
879caae
image: update imagepolicy admission to use internalversion of imagere…
mfojtik Aug 17, 2018
8a5fd7a
controllers: introduce external build client
mfojtik Aug 16, 2018
77553d2
build: update pkg/build/client to versioned api
mfojtik Aug 16, 2018
eca1864
fix build conversion and validation
mfojtik Aug 17, 2018
691eac2
add build/v1 into buildscheme
mfojtik Aug 20, 2018
7911bf9
build: move some parts of api server to external and consolidate usag…
mfojtik Aug 16, 2018
39662f7
build: move build controllers to external types
mfojtik Aug 20, 2018
0df1bdb
consolidate generator helper usage
mfojtik Aug 16, 2018
58d2b57
build: move webhooks to external types
mfojtik Aug 16, 2018
f67827f
image: fix up buildconfig trigger controller
mfojtik Aug 16, 2018
e1a39a8
envresolve: copy to internal version
mfojtik Aug 20, 2018
9003b92
cli: move envresolve to external types
mfojtik Aug 16, 2018
60c41a3
cli: fix up cli for external build helpers
mfojtik Aug 20, 2018
5ac288c
template: make template instance readiness use internal build helpers
mfojtik Aug 16, 2018
c6b703e
boring: rename metrics imports
mfojtik Aug 16, 2018
442079c
fix integration build errors
mfojtik Aug 17, 2018
f6c1d1c
extended: fix helper usage and clients in build extended tests
mfojtik Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hack/import-restrictions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
"allowedImportPackages": [
"vendor/k8s.io/kubernetes/pkg/apis/core",
"vendor/k8s.io/kubernetes/pkg/apis/core/v1",
"github.com/openshift/origin/pkg/build/buildapihelpers",
"github.com/openshift/origin/pkg/build/apis/build/internal_helpers",
"github.com/openshift/origin/pkg/image/apis/image"
]
},
Expand Down Expand Up @@ -526,6 +526,7 @@
"github.com/openshift/origin/pkg/authorization/generated",
"github.com/openshift/origin/pkg/build/apis/build/v1",
"github.com/openshift/origin/pkg/build/generated",
"github.com/openshift/origin/pkg/build/apis/build/internal_helpers",
"github.com/openshift/origin/pkg/image/apis/image/v1",
"github.com/openshift/origin/pkg/image/generated",
"github.com/openshift/origin/pkg/image/util",
Expand Down Expand Up @@ -561,7 +562,6 @@
"github.com/openshift/origin/pkg/build/apis/build/install",
"github.com/openshift/origin/pkg/build/buildapihelpers",
"github.com/openshift/origin/pkg/build/client",
"github.com/openshift/origin/pkg/build/client/internalversion",
"github.com/openshift/origin/pkg/build/client/v1",
"github.com/openshift/origin/pkg/build/util",
"github.com/openshift/origin/pkg/bulk",
Expand Down Expand Up @@ -608,7 +608,7 @@
"github.com/openshift/origin/pkg/oauthserver/server/selectprovider",
"github.com/openshift/origin/pkg/oauth/urls",
"github.com/openshift/origin/pkg/oauth/util",
"github.com/openshift/origin/pkg/pod/envresolve",
"github.com/openshift/origin/pkg/pod/envresolve/internal_version",
"github.com/openshift/origin/pkg/printers/internalversion",
"github.com/openshift/origin/pkg/project/apis/project",
"github.com/openshift/origin/pkg/project/apiserver/registry/projectrequest/delegated",
Expand Down
16 changes: 8 additions & 8 deletions pkg/api/imagereferencemutators/builds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
package imagereferencemutators

import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/validation/field"
kapi "k8s.io/kubernetes/pkg/apis/core"

buildapi "github.com/openshift/origin/pkg/build/apis/build"
buildv1 "github.com/openshift/api/build/v1"
)

type buildSpecMutator struct {
spec *buildapi.CommonSpec
oldSpec *buildapi.CommonSpec
spec *buildv1.CommonSpec
oldSpec *buildv1.CommonSpec
path *field.Path
output bool
}

// NewBuildMutator returns an ImageReferenceMutator that includes the output field.
func NewBuildMutator(build *buildapi.Build) ImageReferenceMutator {
func NewBuildMutator(build *buildv1.Build) ImageReferenceMutator {
return &buildSpecMutator{
spec: &build.Spec.CommonSpec,
path: field.NewPath("spec"),
output: true,
}
}

func hasIdenticalImageSourceObjectReference(spec *buildapi.CommonSpec, ref kapi.ObjectReference) bool {
func hasIdenticalImageSourceObjectReference(spec *buildv1.CommonSpec, ref corev1.ObjectReference) bool {
if spec == nil {
return false
}
Expand All @@ -36,7 +36,7 @@ func hasIdenticalImageSourceObjectReference(spec *buildapi.CommonSpec, ref kapi.
return false
}

func hasIdenticalStrategyFrom(spec, oldSpec *buildapi.CommonSpec) bool {
func hasIdenticalStrategyFrom(spec, oldSpec *buildv1.CommonSpec) bool {
if oldSpec == nil {
return false
}
Expand All @@ -57,7 +57,7 @@ func hasIdenticalStrategyFrom(spec, oldSpec *buildapi.CommonSpec) bool {
return false
}

func hasIdenticalObjectReference(ref, oldRef *kapi.ObjectReference) bool {
func hasIdenticalObjectReference(ref, oldRef *corev1.ObjectReference) bool {
if ref == nil || oldRef == nil {
return false
}
Expand Down
Loading