docker10: Remove unused types and functions

Author: tchap

pkg/image/apis/image/docker10/conversion.go

@@ -3,61 +3,9 @@ package docker10
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/openshift/api/image/docker10"
-
 	"github.com/openshift/openshift-apiserver/pkg/image/apis/image"
 )
 
-// Convert_DockerV1CompatibilityImage_to_DockerImageConfig takes a container image registry digest
-// (schema 2.1) and converts it to the external API version of Image.
-func Convert_DockerV1CompatibilityImage_to_DockerImageConfig(in *DockerV1CompatibilityImage, out *DockerImageConfig) error {
-	*out = DockerImageConfig{
-		ID:              in.ID,
-		Parent:          in.Parent,
-		Comment:         in.Comment,
-		Created:         in.Created,
-		Container:       in.Container,
-		DockerVersion:   in.DockerVersion,
-		Author:          in.Author,
-		Architecture:    in.Architecture,
-		Size:            in.Size,
-		OS:              "linux",
-		ContainerConfig: in.ContainerConfig,
-	}
-	if in.Config != nil {
-		out.Config = &docker10.DockerConfig{}
-		*out.Config = *in.Config
-	}
-	return nil
-}
-
-// Convert_DockerV1CompatibilityImage_to_image_DockerImage takes a container
-// image registry digest (schema 2.1) and converts it to the internal API
-// version of Image.
-func Convert_DockerV1CompatibilityImage_to_image_DockerImage(in *DockerV1CompatibilityImage, out *image.DockerImage) error {
-	*out = image.DockerImage{
-		ID:            in.ID,
-		Parent:        in.Parent,
-		Comment:       in.Comment,
-		Created:       metav1.Time{Time: in.Created},
-		Container:     in.Container,
-		DockerVersion: in.DockerVersion,
-		Author:        in.Author,
-		Architecture:  in.Architecture,
-		Size:          in.Size,
-	}
-	if err := Convert_docker10_DockerConfig_To_image_DockerConfig(&in.ContainerConfig, &out.ContainerConfig, nil); err != nil {
-		return err
-	}
-	if in.Config != nil {
-		out.Config = &image.DockerConfig{}
-		if err := Convert_docker10_DockerConfig_To_image_DockerConfig(in.Config, out.Config, nil); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 // Convert_DockerImageConfig_to_image_DockerImage takes a container image
 // registry digest (schema 2.2) and converts it to the internal API version of
 // Image.

pkg/image/apis/image/docker10/types.go

@@ -33,41 +33,6 @@ type DockerImageManifest struct {
 	Config Descriptor   `json:"config"`
 }
 
-// DockerFSLayer is a container struct for BlobSums defined in an image manifest
-type DockerFSLayer struct {
-	// DockerBlobSum is the tarsum of the referenced filesystem image layer
-	// TODO make this digest.Digest once distribution/distribution/v3 is in Godeps
-	DockerBlobSum string `json:"blobSum"`
-}
-
-// DockerHistory stores unstructured v1 compatibility information
-type DockerHistory struct {
-	// DockerV1Compatibility is the raw v1 compatibility information
-	DockerV1Compatibility string `json:"v1Compatibility"`
-}
-
-// DockerV1CompatibilityImage represents the structured v1
-// compatibility information.
-type DockerV1CompatibilityImage struct {
-	ID              string                 `json:"id"`
-	Parent          string                 `json:"parent,omitempty"`
-	Comment         string                 `json:"comment,omitempty"`
-	Created         time.Time              `json:"created"`
-	Container       string                 `json:"container,omitempty"`
-	ContainerConfig docker10.DockerConfig  `json:"container_config,omitempty"`
-	DockerVersion   string                 `json:"docker_version,omitempty"`
-	Author          string                 `json:"author,omitempty"`
-	Config          *docker10.DockerConfig `json:"config,omitempty"`
-	Architecture    string                 `json:"architecture,omitempty"`
-	Size            int64                  `json:"size,omitempty"`
-}
-
-// DockerV1CompatibilityImageSize represents the structured v1
-// compatibility information for size
-type DockerV1CompatibilityImageSize struct {
-	Size int64 `json:"size,omitempty"`
-}
-
 // DockerImageConfig stores the image configuration
 type DockerImageConfig struct {
 	ID              string                 `json:"id"`