deprecate the imagestream.spec.DockerImageRepository field

openshift · Sep 6, 2017 · 52d21dc · 52d21dc
1 parent bb340c5
commit 52d21dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/pkg/image/apis/image/types.go b/pkg/image/apis/image/types.go
@@ -217,6 +217,8 @@ type ImageStreamSpec struct {
 	// lookupPolicy controls how other resources reference images within this namespace.
 	LookupPolicy ImageLookupPolicy
 	// Optional, if specified this stream is backed by a Docker repository on this server
+	// Deprecated: This field is deprecated as of v3.7 and will be removed in a future release
+	// Specify the source for the tags to be imported in each tag via the spec.tags.from reference instead.
 	DockerImageRepository string
 	// Tags map arbitrary string values to specific image locators
 	Tags map[string]TagReference

diff --git a/pkg/image/apis/image/v1/types.go b/pkg/image/apis/image/v1/types.go
@@ -173,6 +173,8 @@ type ImageStreamSpec struct {
 	// lookupPolicy controls how other resources reference images within this namespace.
 	LookupPolicy ImageLookupPolicy `json:"lookupPolicy,omitempty" protobuf:"bytes,3,opt,name=lookupPolicy"`
 	// dockerImageRepository is optional, if specified this stream is backed by a Docker repository on this server
+	// Deprecated: This field is deprecated as of v3.7 and will be removed in a future release
+	// Specify the source for the tags to be imported in each tag via the spec.tags.from reference instead.
 	DockerImageRepository string `json:"dockerImageRepository,omitempty" protobuf:"bytes,1,opt,name=dockerImageRepository"`
 	// tags map arbitrary string values to specific image locators
 	Tags []TagReference `json:"tags,omitempty" protobuf:"bytes,2,rep,name=tags"`
@@ -195,7 +197,8 @@ type TagReference struct {
 	Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
 	// Annotations associated with images using this tag
 	Annotations map[string]string `json:"annotations" protobuf:"bytes,2,rep,name=annotations"`
-	// From is a reference to an image stream tag or image stream this tag should track
+	// Optional; if specified, a reference to another image that this tag should point to. Valid values
+	// are ImageStreamTag, ImageStreamImage, and DockerImage.
 	From *kapi.ObjectReference `json:"from,omitempty" protobuf:"bytes,3,opt,name=from"`
 	// Reference states if the tag will be imported. Default value is false, which means the tag will be imported.
 	Reference bool `json:"reference,omitempty" protobuf:"varint,4,opt,name=reference"`

diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go
@@ -6149,7 +6149,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
 						},
 						"dockerImageRepository": {
 							SchemaProps: spec.SchemaProps{
-								Description: "dockerImageRepository is optional, if specified this stream is backed by a Docker repository on this server",
+								Description: "dockerImageRepository is optional, if specified this stream is backed by a Docker repository on this server Deprecated: This field is deprecated as of v3.7 and will be removed in a future release Specify the source for the tags to be imported in each tag via the spec.tags.from reference instead.",
 								Type:        []string{"string"},
 								Format:      "",
 							},
@@ -6729,7 +6729,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
 						},
 						"from": {
 							SchemaProps: spec.SchemaProps{
-								Description: "From is a reference to an image stream tag or image stream this tag should track",
+								Description: "Optional; if specified, a reference to another image that this tag should point to. Valid values are ImageStreamTag, ImageStreamImage, and DockerImage.",
 								Ref:         ref("k8s.io/kubernetes/pkg/api/v1.ObjectReference"),
 							},
 						},