Issue #2483 Update Xpaas image streams and templates for OpenShift 3.11

minishift · Jan 16, 2019 · 3ef4050 · 3ef4050
1 parent 5720268
commit 3ef4050
Show file tree

Hide file tree

Showing 318 changed files with 96,637 additions and 1,279 deletions.
diff --git a/addons/xpaas/v3.10/xpaas-streams/datagrid72-image-stream.json b/addons/xpaas/v3.10/xpaas-streams/datagrid72-image-stream.json
@@ -16,7 +16,8 @@
                 "name": "jboss-datagrid72-openshift",
                 "annotations": {
                     "openshift.io/display-name": "Red Hat JBoss Data Grid 7.2",
-                    "openshift.io/provider-display-name": "Red Hat, Inc."
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.1"
                 }
             },
             "spec": {
@@ -31,9 +32,30 @@
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 7.2"
                         },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.redhat.io/jboss-datagrid-7/datagrid72-openshift:1.0"
+                        }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "Red Hat JBoss Data Grid 7.2 S2I images.",
+                            "iconClass": "icon-datagrid",
+                            "tags": "datagrid,jboss,hidden",
+                            "supports": "datagrid:7.2",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss Data Grid 7.2"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
                         "from": {
                             "kind": "DockerImage",
-                            "name": "registry.access.redhat.com/jboss-datagrid-7/datagrid72-openshift:1.0"
+                            "name": "registry.redhat.io/jboss-datagrid-7/datagrid72-openshift:1.1"
                         }
                     }
                 ]

diff --git a/addons/xpaas/v3.10/xpaas-streams/eap72-image-stream.json b/addons/xpaas/v3.10/xpaas-streams/eap72-image-stream.json
@@ -0,0 +1,74 @@
+{
+    "kind": "List",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "jboss-eap72-image-streams",
+        "annotations": {
+            "description": "ImageStream definition for Red Hat JBoss EAP 7.2.",
+            "openshift.io/provider-display-name": "Red Hat, Inc."
+        }
+    },
+    "items": [
+    {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "jboss-eap72-openshift",
+                "annotations": {
+                    "openshift.io/display-name": "Red Hat JBoss EAP 7.2",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.0"
+                }
+            },
+            "labels": {
+                "xpaas": "1.0.0"
+            },
+            "spec": {
+                "tags": [
+                    {
+                        "name": "latest",
+                        "annotations": {
+                            "description": "Red Hat JBoss EAP 7.2 S2I Image [Tech Preview]",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.2,javaee:7,java:8",
+                            "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "openshift",
+                            "version": "latest",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 7.2"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap72-openshift:latest"
+                        }
+                    },
+                    {
+                        "name": "1.0",
+                        "annotations": {
+                            "description": "Red Hat JBoss EAP 7.2 S2I Image [Tech Preview]",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.2,javaee:7,java:8",
+                            "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "openshift",
+                            "version": "1.0",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 7.2"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap72-openshift:1.0"
+                        }
+                    }
+                ]
+            }
+        }
+    ]
+}