-
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.
switch easy groups to new install pattern
- Loading branch information
Showing
85 changed files
with
1,247 additions
and
852 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
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) | ||
| } | ||
| } |
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,93 @@ | ||
| package legacy | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/runtime/serializer" | ||
| "k8s.io/apimachinery/pkg/util/diff" | ||
| kapi "k8s.io/kubernetes/pkg/apis/core" | ||
|
|
||
| "github.com/openshift/origin/pkg/api/apihelpers/apitesting" | ||
| internal "github.com/openshift/origin/pkg/image/apis/image" | ||
| ) | ||
|
|
||
| func TestImageRoundTripVersionedObject(t *testing.T) { | ||
| scheme := runtime.NewScheme() | ||
| InstallInternalLegacyImage(scheme) | ||
| codecs := serializer.NewCodecFactory(scheme) | ||
|
|
||
| d := &internal.DockerImage{ | ||
| Config: &internal.DockerConfig{ | ||
| Env: []string{"A=1", "B=2"}, | ||
| }, | ||
| } | ||
| i := &internal.Image{ | ||
| ObjectMeta: metav1.ObjectMeta{Name: "foo"}, | ||
|
|
||
| DockerImageLayers: []internal.ImageLayer{{Name: "foo", LayerSize: 10}}, | ||
| DockerImageMetadata: *d, | ||
| DockerImageReference: "foo/bar/baz", | ||
| } | ||
|
|
||
| data, err := runtime.Encode(codecs.LegacyCodec(GroupVersion), i) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
|
|
||
| obj, err := runtime.Decode(codecs.UniversalDecoder(), data) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| image := obj.(*internal.Image) | ||
| if image.DockerImageMetadataVersion != "1.0" { | ||
| t.Errorf("did not default to correct metadata version: %#v", image) | ||
| } | ||
| image.DockerImageMetadataVersion = "" | ||
| if !reflect.DeepEqual(i, image) { | ||
| t.Errorf("unable to round trip object: %s", diff.ObjectDiff(i, image)) | ||
| } | ||
| } | ||
|
|
||
| func TestImageFieldSelectors(t *testing.T) { | ||
| install := func(scheme *runtime.Scheme) error { | ||
| InstallInternalLegacyImage(scheme) | ||
| return nil | ||
| } | ||
|
|
||
| apitesting.FieldKeyCheck{ | ||
| SchemeBuilder: []func(*runtime.Scheme) error{install}, | ||
| Kind: GroupVersion.WithKind("ImageStream"), | ||
| // Ensure previously supported labels have conversions. DO NOT REMOVE THINGS FROM THIS LIST | ||
| AllowedExternalFieldKeys: []string{"name", "spec.dockerImageRepository", "status.dockerImageRepository"}, | ||
| FieldKeyEvaluatorFn: internal.ImageStreamSelector, | ||
| }.Check(t) | ||
| } | ||
|
|
||
| func TestImageImportSpecDefaulting(t *testing.T) { | ||
| scheme := runtime.NewScheme() | ||
| codecs := serializer.NewCodecFactory(scheme) | ||
| InstallInternalLegacyImage(scheme) | ||
|
|
||
| i := &internal.ImageStreamImport{ | ||
| Spec: internal.ImageStreamImportSpec{ | ||
| Images: []internal.ImageImportSpec{ | ||
| {From: kapi.ObjectReference{Name: "something:other"}}, | ||
| }, | ||
| }, | ||
| } | ||
| data, err := runtime.Encode(codecs.LegacyCodec(GroupVersion), i) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| obj, err := runtime.Decode(codecs.UniversalDecoder(), data) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| isi := obj.(*internal.ImageStreamImport) | ||
| if isi.Spec.Images[0].To == nil || isi.Spec.Images[0].To.Name != "other" { | ||
| t.Errorf("unexpected round trip: %#v", isi) | ||
| } | ||
| } |
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
Oops, something went wrong.