Merge pull request #1039 from sdodson/fix-version-dependent-content

Fix version dependent image streams

4 files changed, 76 insertions, 866 deletions

diff --git a/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-centos7-v1-0.json b/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-centos7-v1-0.json
deleted file mode 100644
index 268d680f4..000000000
--- a/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-centos7-v1-0.json
+++ /dev/null
@@ -1,285 +0,0 @@
-{
-  "kind": "ImageStreamList",
-  "apiVersion": "v1",
-  "metadata": {},
-  "items": [
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "ruby",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/ruby-20-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "2.0",
-            "annotations": {
-              "description": "Build and run Ruby 2.0 applications",
-              "iconClass": "icon-ruby",
-              "tags": "builder,ruby",
-              "supports": "ruby:2.0,ruby",
-              "version": "2.0",
-              "sampleRepo": "https://github.com/openshift/ruby-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "nodejs",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/nodejs-010-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "0.10",
-            "annotations": {
-              "description": "Build and run NodeJS 0.10 applications",
-              "iconClass": "icon-nodejs",
-              "tags": "builder,nodejs",
-              "supports":"nodejs:0.10,nodejs:0.1,nodejs",
-              "version": "0.10",
-              "sampleRepo": "https://github.com/openshift/nodejs-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "perl",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/perl-516-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "5.16",
-            "annotations": {
-              "description": "Build and run Perl 5.16 applications",
-              "iconClass": "icon-perl",
-              "tags": "builder,perl",
-              "supports":"perl:5.16,perl",
-              "version": "5.16",
-              "sampleRepo": "https://github.com/openshift/dancer-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "php",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/php-55-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "5.5",
-            "annotations": {
-              "description": "Build and run PHP 5.5 applications",
-              "iconClass": "icon-php",
-              "tags": "builder,php",
-              "supports":"php:5.5,php",
-              "version": "5.5",
-              "sampleRepo": "https://github.com/openshift/cakephp-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "python",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/python-33-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "3.3",
-            "annotations": {
-              "description": "Build and run Python 3.3 applications",
-              "iconClass": "icon-python",
-              "tags": "builder,python",
-              "supports":"python:3.3,python",
-              "version": "3.3",
-              "sampleRepo": "https://github.com/openshift/django-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "wildfly",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/wildfly-81-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "8.1",
-            "annotations": {
-              "description": "Build and run Java applications on Wildfly 8.1",
-              "iconClass": "icon-wildfly",
-              "tags": "builder,wildfly,java",
-              "supports":"wildfly:8.1,jee,java",
-              "version": "8.1",
-              "sampleRepo": "https://github.com/bparees/openshift-jee-sample.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "mysql",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/mysql-55-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "5.5",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "postgresql",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/postgresql-92-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "9.2",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "mongodb",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/mongodb-24-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "2.4",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "jenkins",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "openshift/jenkins-1-centos7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "1",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-centos7.json b/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-centos7.json
index 1a78b1279..268d680f4 100644
--- a/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-centos7.json
+++ b/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-centos7.json
@@ -11,13 +11,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/ruby-20-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "2.0"
-            }
+            "name": "latest"
           },
           {
             "name": "2.0",
@@ -30,23 +27,8 @@
               "sampleRepo": "https://github.com/openshift/ruby-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/ruby-20-centos7:latest"
-            }
-          },
-          {
-            "name": "2.2",
-            "annotations": {
-              "description": "Build and run Ruby 2.2 applications",
-              "iconClass": "icon-ruby",
-              "tags": "builder,ruby",
-              "supports": "ruby:2.2,ruby",
-              "version": "2.2",
-              "sampleRepo": "https://github.com/openshift/ruby-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/ruby-22-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -60,13 +42,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/nodejs-010-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "0.10"
-            }
+            "name": "latest"
           },
           {
             "name": "0.10",
@@ -79,8 +58,8 @@
               "sampleRepo": "https://github.com/openshift/nodejs-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/nodejs-010-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -94,13 +73,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/perl-516-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.16"
-            }
+            "name": "latest"
           },
           {
             "name": "5.16",
@@ -113,25 +89,9 @@
               "sampleRepo": "https://github.com/openshift/dancer-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/perl-516-centos7:latest"
-            }
-          },
-          {
-            "name": "5.20",
-            "annotations": {
-              "description": "Build and run Perl 5.20 applications",
-              "iconClass": "icon-perl",
-              "tags": "builder,perl",
-              "supports":"perl:5.20,perl",
-              "version": "5.20",
-              "sampleRepo": "https://github.com/openshift/dancer-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/perl-520-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
-
           }
         ]
       }
@@ -144,13 +104,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/php-55-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.5"
-            }
+            "name": "latest"
           },
           {
             "name": "5.5",
@@ -163,23 +120,8 @@
               "sampleRepo": "https://github.com/openshift/cakephp-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/php-55-centos7:latest"
-            }
-          },
-          {
-            "name": "5.6",
-            "annotations": {
-              "description": "Build and run PHP 5.6 applications",
-              "iconClass": "icon-php",
-              "tags": "builder,php",
-              "supports":"php:5.6,php",
-              "version": "5.6",
-              "sampleRepo": "https://github.com/openshift/cakephp-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/php-56-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -193,13 +135,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/python-33-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "3.3"
-            }
+            "name": "latest"
           },
           {
             "name": "3.3",
@@ -212,38 +151,8 @@
               "sampleRepo": "https://github.com/openshift/django-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/python-33-centos7:latest"
-            }
-          },
-          {
-            "name": "2.7",
-            "annotations": {
-              "description": "Build and run Python 2.7 applications",
-              "iconClass": "icon-python",
-              "tags": "builder,python",
-              "supports":"python:2.7,python",
-              "version": "2.7",
-              "sampleRepo": "https://github.com/openshift/django-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/python-27-centos7:latest"
-            }
-          },
-          {
-            "name": "3.4",
-            "annotations": {
-              "description": "Build and run Python 3.4 applications",
-              "iconClass": "icon-python",
-              "tags": "builder,python",
-              "supports":"python:3.4,python",
-              "version": "3.4",
-              "sampleRepo": "https://github.com/openshift/django-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/python-34-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -257,13 +166,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/wildfly-81-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "8.1"
-            }
+            "name": "latest"
           },
           {
             "name": "8.1",
@@ -276,8 +182,8 @@
               "sampleRepo": "https://github.com/bparees/openshift-jee-sample.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/wildfly-81-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -291,26 +197,16 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/mysql-55-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.5"
-            }
+            "name": "latest"
           },
           {
             "name": "5.5",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/mysql-55-centos7:latest"
-            }
-          },
-          {
-            "name": "5.6",
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/mysql-56-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -324,26 +220,16 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/postgresql-92-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "9.2"
-            }
+            "name": "latest"
           },
           {
             "name": "9.2",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/postgresql-92-centos7:latest"
-            }
-          },
-          {
-            "name": "9.4",
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/postgresql-94-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -357,26 +243,16 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/mongodb-24-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "2.4"
-            }
+            "name": "latest"
           },
           {
             "name": "2.4",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/mongodb-24-centos7:latest"
-            }
-          },
-          {
-            "name": "2.6",
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "centos/mongodb-26-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -390,19 +266,16 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "openshift/jenkins-1-centos7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "1"
-            }
+            "name": "latest"
           },
           {
             "name": "1",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "openshift/jenkins-1-centos7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
diff --git a/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-rhel7-v1-0.json b/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-rhel7-v1-0.json
deleted file mode 100644
index aa62ebd53..000000000
--- a/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-rhel7-v1-0.json
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-  "kind": "ImageStreamList",
-  "apiVersion": "v1",
-  "metadata": {},
-  "items": [
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "ruby",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/ruby-20-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "2.0",
-            "annotations": {
-              "description": "Build and run Ruby 2.0 applications",
-              "iconClass": "icon-ruby",
-              "tags": "builder,ruby",
-              "supports": "ruby:2.0,ruby",
-              "version": "2.0",
-              "sampleRepo": "https://github.com/openshift/ruby-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "nodejs",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/nodejs-010-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "0.10",
-            "annotations": {
-              "description": "Build and run NodeJS 0.10 applications",
-              "iconClass": "icon-nodejs",
-              "tags": "builder,nodejs",
-              "supports":"nodejs:0.10,nodejs:0.1,nodejs",
-              "version": "0.10",
-              "sampleRepo": "https://github.com/openshift/nodejs-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "perl",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/perl-516-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "5.16",
-            "annotations": {
-              "description": "Build and run Perl 5.16 applications",
-              "iconClass": "icon-perl",
-              "tags": "builder,perl",
-              "supports":"perl:5.16,perl",
-              "version": "5.16",
-              "sampleRepo": "https://github.com/openshift/dancer-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "php",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/php-55-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "5.5",
-            "annotations": {
-              "description": "Build and run PHP 5.5 applications",
-              "iconClass": "icon-php",
-              "tags": "builder,php",
-              "supports":"php:5.5,php",
-              "version": "5.5",
-              "sampleRepo": "https://github.com/openshift/cakephp-ex.git"              
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "python",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/python-33-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "3.3",
-            "annotations": {
-              "description": "Build and run Python 3.3 applications",
-              "iconClass": "icon-python",
-              "tags": "builder,python",
-              "supports":"python:3.3,python",
-              "version": "3.3",
-              "sampleRepo": "https://github.com/openshift/django-ex.git"
-            },
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "mysql",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/mysql-55-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "5.5",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "postgresql",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/postgresql-92-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "9.2",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "mongodb",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/mongodb-24-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "2.4",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "kind": "ImageStream",
-      "apiVersion": "v1",
-      "metadata": {
-        "name": "jenkins",
-        "creationTimestamp": null
-      },
-      "spec": {
-        "dockerImageRepository": "registry.access.redhat.com/openshift3/jenkins-1-rhel7",
-        "tags": [
-          {
-            "name": "latest"
-          },
-          {
-            "name": "1",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "latest"
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-rhel7.json b/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-rhel7.json
index d2a8cfb1d..aa62ebd53 100644
--- a/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-rhel7.json
+++ b/roles/openshift_examples/files/examples/v1.0/image-streams/image-streams-rhel7.json
@@ -11,13 +11,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/ruby-20-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "2.0"
-            }
+            "name": "latest"
           },
           {
             "name": "2.0",
@@ -30,23 +27,8 @@
               "sampleRepo": "https://github.com/openshift/ruby-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/ruby-20-rhel7:latest"
-            }
-          },
-          {
-            "name": "2.2",
-            "annotations": {
-              "description": "Build and run Ruby 2.2 applications",
-              "iconClass": "icon-ruby",
-              "tags": "builder,ruby",
-              "supports": "ruby:2.2,ruby",
-              "version": "2.2",
-              "sampleRepo": "https://github.com/openshift/ruby-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/ruby-22-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -60,13 +42,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/nodejs-010-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "0.10"
-            }
+            "name": "latest"
           },
           {
             "name": "0.10",
@@ -79,8 +58,8 @@
               "sampleRepo": "https://github.com/openshift/nodejs-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/nodejs-010-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -94,13 +73,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/perl-516-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.16"
-            }
+            "name": "latest"
           },
           {
             "name": "5.16",
@@ -113,25 +89,9 @@
               "sampleRepo": "https://github.com/openshift/dancer-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/perl-516-rhel7:latest"
-            }
-          },
-          {
-            "name": "5.20",
-            "annotations": {
-              "description": "Build and run Perl 5.20 applications",
-              "iconClass": "icon-perl",
-              "tags": "builder,perl",
-              "supports":"perl:5.20,perl",
-              "version": "5.20",
-              "sampleRepo": "https://github.com/openshift/dancer-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/perl-520-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
-
           }
         ]
       }
@@ -144,13 +104,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/php-55-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.5"
-            }
+            "name": "latest"
           },
           {
             "name": "5.5",
@@ -163,23 +120,8 @@
               "sampleRepo": "https://github.com/openshift/cakephp-ex.git"              
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/php-55-rhel7:latest"
-            }
-          },
-          {
-            "name": "5.6",
-            "annotations": {
-              "description": "Build and run PHP 5.6 applications",
-              "iconClass": "icon-php",
-              "tags": "builder,php",
-              "supports":"php:5.6,php",
-              "version": "5.6",
-              "sampleRepo": "https://github.com/openshift/cakephp-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/php-56-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -193,13 +135,10 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/python-33-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "3.3"
-            }
+            "name": "latest"
           },
           {
             "name": "3.3",
@@ -212,38 +151,8 @@
               "sampleRepo": "https://github.com/openshift/django-ex.git"
             },
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/python-33-rhel7:latest"
-            }
-          },
-          {
-            "name": "2.7",
-            "annotations": {
-              "description": "Build and run Python 2.7 applications",
-              "iconClass": "icon-python",
-              "tags": "builder,python",
-              "supports":"python:2.7,python",
-              "version": "2.7",
-              "sampleRepo": "https://github.com/openshift/django-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/python-27-rhel7:latest"
-            }
-          },
-          {
-            "name": "3.4",
-            "annotations": {
-              "description": "Build and run Python 3.4 applications",
-              "iconClass": "icon-python",
-              "tags": "builder,python",
-              "supports":"python:3.4,python",
-              "version": "3.4",
-              "sampleRepo": "https://github.com/openshift/django-ex.git"
-            },
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/python-34-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -257,26 +166,16 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/mysql-55-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "5.5"
-            }
+            "name": "latest"
           },
           {
             "name": "5.5",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/mysql-55-rhel7:latest"
-            }
-          },
-          {
-            "name": "5.6",
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/mysql-56-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -290,26 +189,16 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/postgresql-92-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "9.2"
-            }
+            "name": "latest"
           },
           {
             "name": "9.2",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/postgresql-92-rhel7:latest"
-            }
-          },
-          {
-            "name": "9.4",
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/postgresql-94-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -323,26 +212,16 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/mongodb-24-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "2.4"
-            }
+            "name": "latest"
           },
           {
             "name": "2.4",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/mongodb-24-rhel7:latest"
-            }
-          },
-          {
-            "name": "2.6",
-            "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/rhscl/mongodb-26-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]
@@ -356,19 +235,16 @@
         "creationTimestamp": null
       },
       "spec": {
+        "dockerImageRepository": "registry.access.redhat.com/openshift3/jenkins-1-rhel7",
         "tags": [
           {
-            "name": "latest",
-            "from": {
-              "Kind": "ImageStreamTag",
-              "Name": "1"
-            }
+            "name": "latest"
           },
           {
             "name": "1",
             "from": {
-              "Kind": "DockerImage",
-              "Name": "registry.access.redhat.com/openshift3/jenkins-1-rhel7:latest"
+              "Kind": "ImageStreamTag",
+              "Name": "latest"
             }
           }
         ]