Browse code

Bug 1281735 - remove the internal docker registry information from imagestream

Maciej Szulik authored on 2016/08/05 23:29:06
Showing 2 changed files
... ...
@@ -640,7 +640,9 @@ func (d *ImageStreamDescriber) Describe(namespace, name string, settings kctl.De
640 640
 
641 641
 	return tabbedString(func(out *tabwriter.Writer) error {
642 642
 		formatMeta(out, imageStream.ObjectMeta)
643
-		formatString(out, "Docker Pull Spec", imageStream.Status.DockerImageRepository)
643
+		if len(imageStream.Spec.DockerImageRepository) > 0 {
644
+			formatString(out, "Imported From", imageStream.Spec.DockerImageRepository)
645
+		}
644 646
 		formatImageStreamTags(out, imageStream)
645 647
 		return nil
646 648
 	})
... ...
@@ -34,7 +34,7 @@ var (
34 34
 	imageColumns            = []string{"NAME", "DOCKER REF"}
35 35
 	imageStreamTagColumns   = []string{"NAME", "DOCKER REF", "UPDATED", "IMAGENAME"}
36 36
 	imageStreamImageColumns = []string{"NAME", "DOCKER REF", "UPDATED", "IMAGENAME"}
37
-	imageStreamColumns      = []string{"NAME", "DOCKER REPO", "TAGS", "UPDATED"}
37
+	imageStreamColumns      = []string{"NAME", "TAGS", "UPDATED"}
38 38
 	projectColumns          = []string{"NAME", "DISPLAY NAME", "STATUS"}
39 39
 	routeColumns            = []string{"NAME", "HOST/PORT", "PATH", "SERVICE", "TERMINATION", "LABELS"}
40 40
 	deploymentConfigColumns = []string{"NAME", "REVISION", "DESIRED", "CURRENT", "TRIGGERED BY"}
... ...
@@ -434,11 +434,7 @@ func printImageStream(stream *imageapi.ImageStream, w io.Writer, opts kctl.Print
434 434
 			return err
435 435
 		}
436 436
 	}
437
-	repo := stream.Spec.DockerImageRepository
438
-	if len(repo) == 0 {
439
-		repo = stream.Status.DockerImageRepository
440
-	}
441
-	if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s", name, repo, tags, latestTime); err != nil {
437
+	if _, err := fmt.Fprintf(w, "%s\t%s\t%s", name, tags, latestTime); err != nil {
442 438
 		return err
443 439
 	}
444 440
 	if err := appendItemLabels(stream.Labels, w, opts.ColumnLabels, opts.ShowLabels); err != nil {