-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20372 from deads2k/api-04-build
switch remaining API groups to new scheme install
- Loading branch information
Showing
173 changed files
with
1,892 additions
and
1,433 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package legacy | ||
|
|
||
| import ( | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| utilruntime "k8s.io/apimachinery/pkg/util/runtime" | ||
| "k8s.io/kubernetes/pkg/apis/core" | ||
|
|
||
| buildv1 "github.com/openshift/api/build/v1" | ||
| "github.com/openshift/origin/pkg/api/apihelpers" | ||
| "github.com/openshift/origin/pkg/build/apis/build" | ||
| buildv1helpers "github.com/openshift/origin/pkg/build/apis/build/v1" | ||
| ) | ||
|
|
||
| // InstallLegacyBuild this looks like a lot of duplication, but the code in the individual versions is living and may | ||
| // change. The code here should never change and needs to allow the other code to move independently. | ||
| func InstallInternalLegacyBuild(scheme *runtime.Scheme) { | ||
| InstallExternalLegacyBuild(scheme) | ||
|
|
||
| schemeBuilder := runtime.NewSchemeBuilder( | ||
| addUngroupifiedInternalBuildTypes, | ||
| core.AddToScheme, | ||
|
|
||
| addLegacyBuildFieldSelectorKeyConversions, | ||
| buildv1helpers.AddConversionFuncs, | ||
| buildv1helpers.RegisterDefaults, | ||
| buildv1helpers.RegisterConversions, | ||
| ) | ||
| utilruntime.Must(schemeBuilder.AddToScheme(scheme)) | ||
| } | ||
|
|
||
| func InstallExternalLegacyBuild(scheme *runtime.Scheme) { | ||
| schemeBuilder := runtime.NewSchemeBuilder( | ||
| addUngroupifiedBuildTypes, | ||
| corev1.AddToScheme, | ||
| ) | ||
| utilruntime.Must(schemeBuilder.AddToScheme(scheme)) | ||
| } | ||
|
|
||
| func addUngroupifiedBuildTypes(scheme *runtime.Scheme) error { | ||
| types := []runtime.Object{ | ||
| &buildv1.Build{}, | ||
| &buildv1.BuildList{}, | ||
| &buildv1.BuildConfig{}, | ||
| &buildv1.BuildConfigList{}, | ||
| &buildv1.BuildLog{}, | ||
| &buildv1.BuildRequest{}, | ||
| &buildv1.BuildLogOptions{}, | ||
| &buildv1.BinaryBuildRequestOptions{}, | ||
| } | ||
| scheme.AddKnownTypes(GroupVersion, types...) | ||
| return nil | ||
| } | ||
|
|
||
| func addUngroupifiedInternalBuildTypes(scheme *runtime.Scheme) error { | ||
| scheme.AddKnownTypes(internalGroupVersion, | ||
| &build.Build{}, | ||
| &build.BuildList{}, | ||
| &build.BuildConfig{}, | ||
| &build.BuildConfigList{}, | ||
| &build.BuildLog{}, | ||
| &build.BuildRequest{}, | ||
| &build.BuildLogOptions{}, | ||
| &build.BinaryBuildRequestOptions{}, | ||
| ) | ||
| return nil | ||
| } | ||
|
|
||
| func addLegacyBuildFieldSelectorKeyConversions(scheme *runtime.Scheme) error { | ||
| if err := scheme.AddFieldLabelConversionFunc(GroupVersion.String(), "Build", legacyBuildFieldSelectorKeyConversionFunc); err != nil { | ||
| return err | ||
| } | ||
| if err := scheme.AddFieldLabelConversionFunc(GroupVersion.String(), "BuildConfig", apihelpers.LegacyMetaV1FieldSelectorConversionWithName); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // because field selectors can vary in support by version they are exposed under, we have one function for each | ||
| // groupVersion we're registering for | ||
|
|
||
| func legacyBuildFieldSelectorKeyConversionFunc(label, value string) (internalLabel, internalValue string, err error) { | ||
| switch label { | ||
| case "status", | ||
| "podName": | ||
| return label, value, nil | ||
| default: | ||
| return apihelpers.LegacyMetaV1FieldSelectorConversionWithName(label, value) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package legacy | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/openshift/origin/pkg/api/apihelpers/apitesting" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
|
|
||
| internal "github.com/openshift/origin/pkg/build/apis/build" | ||
| ) | ||
|
|
||
| func TestBuildFieldSelectorConversions(t *testing.T) { | ||
| install := func(scheme *runtime.Scheme) error { | ||
| InstallInternalLegacyBuild(scheme) | ||
| return nil | ||
| } | ||
|
|
||
| apitesting.FieldKeyCheck{ | ||
| SchemeBuilder: []func(*runtime.Scheme) error{install}, | ||
| Kind: GroupVersion.WithKind("Build"), | ||
| // Ensure previously supported labels have conversions. DO NOT REMOVE THINGS FROM THIS LIST | ||
| AllowedExternalFieldKeys: []string{"name", "status", "podName"}, | ||
| FieldKeyEvaluatorFn: internal.BuildFieldSelector, | ||
| }.Check(t) | ||
|
|
||
| apitesting.FieldKeyCheck{ | ||
| SchemeBuilder: []func(*runtime.Scheme) error{install}, | ||
| Kind: GroupVersion.WithKind("BuildConfig"), | ||
| // Ensure previously supported labels have conversions. DO NOT REMOVE THINGS FROM THIS LIST | ||
| AllowedExternalFieldKeys: []string{"name"}, | ||
| }.Check(t) | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package legacy | ||
|
|
||
| import ( | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| utilruntime "k8s.io/apimachinery/pkg/util/runtime" | ||
| "k8s.io/kubernetes/pkg/apis/core" | ||
| corev1conversions "k8s.io/kubernetes/pkg/apis/core/v1" | ||
|
|
||
| "github.com/openshift/api/image/docker10" | ||
| "github.com/openshift/api/image/dockerpre012" | ||
| imagev1 "github.com/openshift/api/image/v1" | ||
| "github.com/openshift/origin/pkg/api/apihelpers" | ||
| "github.com/openshift/origin/pkg/image/apis/image" | ||
| imagev1helpers "github.com/openshift/origin/pkg/image/apis/image/v1" | ||
| ) | ||
|
|
||
| // InstallLegacyImage this looks like a lot of duplication, but the code in the individual versions is living and may | ||
| // change. The code here should never change and needs to allow the other code to move independently. | ||
| func InstallInternalLegacyImage(scheme *runtime.Scheme) { | ||
| InstallExternalLegacyImage(scheme) | ||
|
|
||
| schemeBuilder := runtime.NewSchemeBuilder( | ||
| addUngroupifiedInternalImageTypes, | ||
| core.AddToScheme, | ||
| corev1conversions.AddToScheme, | ||
|
|
||
| addLegacyImageFieldSelectorKeyConversions, | ||
| imagev1helpers.RegisterDefaults, | ||
| imagev1helpers.RegisterConversions, | ||
| ) | ||
| utilruntime.Must(schemeBuilder.AddToScheme(scheme)) | ||
| } | ||
|
|
||
| func InstallExternalLegacyImage(scheme *runtime.Scheme) { | ||
| schemeBuilder := runtime.NewSchemeBuilder( | ||
| addUngroupifiedImageTypes, | ||
| docker10.AddToSchemeInCoreGroup, | ||
| dockerpre012.AddToSchemeInCoreGroup, | ||
| corev1.AddToScheme, | ||
| ) | ||
| utilruntime.Must(schemeBuilder.AddToScheme(scheme)) | ||
| } | ||
|
|
||
| func addUngroupifiedImageTypes(scheme *runtime.Scheme) error { | ||
| types := []runtime.Object{ | ||
| &imagev1.Image{}, | ||
| &imagev1.ImageList{}, | ||
| &imagev1.ImageSignature{}, | ||
| &imagev1.ImageStream{}, | ||
| &imagev1.ImageStreamList{}, | ||
| &imagev1.ImageStreamMapping{}, | ||
| &imagev1.ImageStreamTag{}, | ||
| &imagev1.ImageStreamTagList{}, | ||
| &imagev1.ImageStreamImage{}, | ||
| &imagev1.ImageStreamImport{}, | ||
| } | ||
| scheme.AddKnownTypes(GroupVersion, types...) | ||
| return nil | ||
| } | ||
|
|
||
| func addUngroupifiedInternalImageTypes(scheme *runtime.Scheme) error { | ||
| scheme.AddKnownTypes(internalGroupVersion, | ||
| &image.Image{}, | ||
| &image.ImageList{}, | ||
| &image.DockerImage{}, | ||
| &image.ImageSignature{}, | ||
| &image.ImageStream{}, | ||
| &image.ImageStreamList{}, | ||
| &image.ImageStreamMapping{}, | ||
| &image.ImageStreamTag{}, | ||
| &image.ImageStreamTagList{}, | ||
| &image.ImageStreamImage{}, | ||
| &image.ImageStreamImport{}, | ||
| ) | ||
| return nil | ||
| } | ||
|
|
||
| func addLegacyImageFieldSelectorKeyConversions(scheme *runtime.Scheme) error { | ||
| if err := scheme.AddFieldLabelConversionFunc(GroupVersion.String(), "ImageStream", legacyImageStreamFieldSelectorKeyConversionFunc); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func legacyImageStreamFieldSelectorKeyConversionFunc(label, value string) (internalLabel, internalValue string, err error) { | ||
| switch label { | ||
| case "spec.dockerImageRepository", | ||
| "status.dockerImageRepository": | ||
| return label, value, nil | ||
| default: | ||
| return apihelpers.LegacyMetaV1FieldSelectorConversionWithName(label, value) | ||
| } | ||
| } |
Oops, something went wrong.