From 4673beddf3c2c27728be220f35a189965af1c456 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 13 Feb 2024 16:31:19 +0000 Subject: [PATCH 1/2] Remove image streams from the UBI9 branch These ImageStream definitions are very out-of-date. The "release" branch contains the maintained ImageStreams. Remove these ones. Signed-off-by: Jonathan Dowland --- templates/community-image-streams.json | 216 -------- templates/image-streams-aarch64.json | 188 ------- templates/image-streams-ppc64le.json | 506 ------------------- templates/image-streams-s390x.json | 660 ------------------------- templates/image-streams.json | 526 -------------------- templates/runtime-image-streams.json | 166 ------- 6 files changed, 2262 deletions(-) delete mode 100644 templates/community-image-streams.json delete mode 100644 templates/image-streams-aarch64.json delete mode 100644 templates/image-streams-ppc64le.json delete mode 100644 templates/image-streams-s390x.json delete mode 100644 templates/image-streams.json delete mode 100644 templates/runtime-image-streams.json diff --git a/templates/community-image-streams.json b/templates/community-image-streams.json deleted file mode 100644 index 14c58bb5..00000000 --- a/templates/community-image-streams.json +++ /dev/null @@ -1,216 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "ubi8-openjdk-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat UBI8 OpenJDK.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "java", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "spec": { - "tags": [ - { - "name": "openjdk-8-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8:latest" - } - }, - { - "name": "8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8:latest" - } - }, - { - "name": "openjdk-11-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11:latest" - } - }, - { - "name": "11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11:latest" - } - }, - { - "name": "openjdk-17-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:17,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "17" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-17:latest" - } - }, - { - "name": "latest", - "annotations": { - "openshift.io/display-name": "Java (Latest)", - "description": "Build and run Java applications using Maven.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "latest" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "ImageStreamTag", - "name": "openjdk-17-ubi8" - } - } - ] - } - } - ] -} diff --git a/templates/image-streams-aarch64.json b/templates/image-streams-aarch64.json deleted file mode 100644 index cd1a1511..00000000 --- a/templates/image-streams-aarch64.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "openjdk18-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat OpenJDK.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "java", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "openjdk-8-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-8:latest" - } - }, - { - "name": "openjdk-11-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-11:latest" - } - }, - { - "name": "openjdk-17-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 17.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:17,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "17" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-17:latest" - } - }, - { - "name": "latest", - "annotations": { - "openshift.io/display-name": "Java (Latest)", - "description": "Build and run Java applications using Maven.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "latest" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "ImageStreamTag", - "name": "openjdk-17-ubi8" - } - } - ] - } - } - ] -} diff --git a/templates/image-streams-ppc64le.json b/templates/image-streams-ppc64le.json deleted file mode 100644 index 147dadaa..00000000 --- a/templates/image-streams-ppc64le.json +++ /dev/null @@ -1,506 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "openjdk18-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat OpenJDK.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "redhat-openjdk18-openshift", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.5", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.5" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.5" - } - }, - { - "name": "1.6", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.6" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.6" - } - }, - { - "name": "1.7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.7" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.7" - } - }, - { - "name": "1.8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.8" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "openjdk-11-rhel7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.0", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.0" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.0" - } - }, - { - "name": "1.1", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.1" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.1" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "java", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "openjdk-8-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-8:latest" - } - }, - { - "name": "openjdk-8-el7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" - } - }, - { - "name": "openj9-8-el8", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL 8)", - "description": "Build and run Java applications using Maven and OpenJ9 1.8.0.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-8-rhel8:latest" - } - }, - { - "name": "openj9-8-el7", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJ9 1.8.0.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-8-rhel7:latest" - } - }, - { - "name": "8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" - } - }, - { - "name": "openjdk-11-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-11:latest" - } - }, - { - "name": "openjdk-11-el7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" - } - }, - { - "name": "openj9-11-el8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL 8)", - "description": "Build and run Java applications using Maven and OpenJ9 11.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-11-rhel8:latest" - } - }, - { - "name": "openj9-11-el7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJ9 11.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-11-rhel7:latest" - } - }, - { - "name": "11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" - } - }, - { - "name": "openjdk-17-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 17.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:17,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "17" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-17:latest" - } - }, - { - "name": "latest", - "annotations": { - "openshift.io/display-name": "Java (Latest)", - "description": "Build and run Java applications using Maven.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "latest" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "ImageStreamTag", - "name": "openjdk-17-ubi8" - } - } - ] - } - } - ] -} diff --git a/templates/image-streams-s390x.json b/templates/image-streams-s390x.json deleted file mode 100644 index 0cbdc8bd..00000000 --- a/templates/image-streams-s390x.json +++ /dev/null @@ -1,660 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "openjdk18-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat OpenJDK and OpenJ9.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "redhat-openjdk18-openshift", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.5", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.5" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.5" - } - }, - { - "name": "1.6", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.6" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.6" - } - }, - { - "name": "1.7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.7" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.7" - } - }, - { - "name": "1.8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.8" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "openjdk-11-rhel7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.0", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.0" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.0" - } - }, - { - "name": "1.1", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.1" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.1" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "openj9-8-rhel7", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.1", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL7)", - "description": "Build and run Java applications using Maven and OpenJ9 1.8.0.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.1" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-8-rhel7:1.1" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "openj9-11-rhel7", - "annotations": { - "openshift.io/display-name": "OpenJ9 11 (RHEL7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.1", - "annotations": { - "openshift.io/display-name": "OpenJ9 11 (RHEL7)", - "description": "Build and run Java applications using Maven and OpenJ9 11.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9,hidden", - "supports": "java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.1" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-11-rhel7:1.1" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "openj9-8-rhel8", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.1", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL8)", - "description": "Build and run Java applications using Maven and OpenJ9 1.8.0 upon RHEL8.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.1" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-8-rhel8:1.1" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "openj9-11-rhel8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.1", - "annotations": { - "openshift.io/display-name": "OpenJ9 11 (RHEL8)", - "description": "Build and run Java applications using Maven and OpenJ9 11 upon RHEL8.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.1" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-11-rhel8:1.1" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "java", - "annotations": { - "openshift.io/display-name": "OpenJ9", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "openjdk-8-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-8:latest" - } - }, - { - "name": "openjdk-8-el7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" - } - }, - { - "name": "openj9-8-el8", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL 8)", - "description": "Build and run Java applications using Maven and OpenJ9 1.8.0.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-8-rhel8:latest" - } - }, - { - "name": "openj9-8-el7", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJ9 1.8.0.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-8-rhel7:latest" - } - }, - { - "name": "8", - "annotations": { - "openshift.io/display-name": "OpenJ9 1.8.0", - "description": "Build and run Java applications using Maven and OpenJ9 1.8.0.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9,hidden", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-8-rhel7:latest" - } - }, - { - "name": "openjdk-11-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-11:latest" - } - }, - { - "name": "openjdk-11-el7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" - } - }, - { - "name": "openj9-11-el8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL 8)", - "description": "Build and run Java applications using Maven and OpenJ9 11.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-11-rhel8:latest" - } - }, - { - "name": "openj9-11-el7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJ9 11.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-11-rhel7:latest" - } - }, - { - "name": "11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL7)", - "description": "Build and run Java applications using Maven and OpenJ9 11.", - "iconClass": "icon-rh-openj9", - "tags": "builder,java,openj9,hidden", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openj9/openj9-11-rhel7:latest" - } - }, - { - "name": "openjdk-17-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 17.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:17,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "17" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-17:latest" - } - }, - { - "name": "latest", - "annotations": { - "openshift.io/display-name": "Java (Latest)", - "description": "Build and run Java applications using Maven.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "latest" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "ImageStreamTag", - "name": "openjdk-17-ubi8" - } - } - ] - } - } - ] -} diff --git a/templates/image-streams.json b/templates/image-streams.json deleted file mode 100644 index 840f11e0..00000000 --- a/templates/image-streams.json +++ /dev/null @@ -1,526 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "openjdk18-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat OpenJDK.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "redhat-openjdk18-openshift", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.0", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.0" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.0" - } - }, - { - "name": "1.1", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.1" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.1" - } - }, - { - "name": "1.2", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.2" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.2" - } - }, - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.3" - } - }, - { - "name": "1.4", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.4" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.4" - } - }, - { - "name": "1.5", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.5" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.5" - } - }, - { - "name": "1.6", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.6" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.6" - } - }, - { - "name": "1.7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.7" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.7" - } - }, - { - "name": "1.8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.8" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "openjdk-11-rhel7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.0", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.0" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.0" - } - }, - { - "name": "1.1", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.1" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.1" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "1.3", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", - "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,ubi8,hidden", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.3" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11:1.3" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "java", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - }, - "labels": { - "xpaas": "1.4.17" - } - }, - "spec": { - "tags": [ - { - "name": "openjdk-8-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-8:latest" - } - }, - { - "name": "openjdk-8-el7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" - } - }, - { - "name": "8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 8", - "description": "Build and run Java applications using Maven and OpenJDK 8.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:8,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" - } - }, - { - "name": "openjdk-11-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-11:latest" - } - }, - { - "name": "openjdk-11-el7", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL 7)", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" - } - }, - { - "name": "11", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11", - "description": "Build and run Java applications using Maven and OpenJDK 11.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk,hidden", - "supports": "java:11,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" - } - }, - { - "name": "openjdk-17-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", - "description": "Build and run Java applications using Maven and OpenJDK 17.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java:17,java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "17" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/openjdk-17:latest" - } - }, - { - "name": "latest", - "annotations": { - "openshift.io/display-name": "Java (Latest)", - "description": "Build and run Java applications using Maven.", - "iconClass": "icon-rh-openjdk", - "tags": "builder,java,openjdk", - "supports": "java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "latest" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "ImageStreamTag", - "name": "openjdk-17-ubi8" - } - } - ] - } - } - ] -} diff --git a/templates/runtime-image-streams.json b/templates/runtime-image-streams.json deleted file mode 100644 index 852cd839..00000000 --- a/templates/runtime-image-streams.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "kind": "List", - "apiVersion": "v1", - "metadata": { - "name": "ubi8-openjdk-runtime-image-stream", - "annotations": { - "description": "ImageStream definition for Red Hat UBI8 OpenJDK Runtimes.", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "items": [ - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-8-runtime", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "spec": { - "tags": [ - { - "name": "1.9", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", - "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "java,openjdk,ubi8", - "version": "1.9" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.9" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "ubi8-openjdk-11-runtime", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "spec": { - "tags": [ - { - "name": "1.9", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", - "description": "Run Java applications using OpenJDK 11 upon RHEL8.", - "iconClass": "icon-rh-openjdk", - "tags": "java,openjdk,ubi8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "1.9" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.9" - } - } - ] - } - }, - { - "kind": "ImageStream", - "apiVersion": "image.openshift.io/v1", - "metadata": { - "name": "java-runtime", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK Runtime", - "openshift.io/provider-display-name": "Red Hat, Inc." - } - }, - "spec": { - "tags": [ - { - "name": "openjdk-8-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", - "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "java:8,openjdk,ubi8", - "version": "8" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:latest" - } - }, - { - "name": "openjdk-11-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", - "description": "Run Java applications using OpenJDK 11 upon UBI8.", - "iconClass": "icon-rh-openjdk", - "tags": "java:11,openjdk,ubi8", - "version": "11" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:latest" - } - }, - { - "name": "openjdk-17-ubi8", - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", - "description": "Run Java applications using OpenJDK 17 upon RHEL8.", - "iconClass": "icon-rh-openjdk", - "tags": "java:17,openjdk,ubi8", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "17" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:latest" - } - }, - { - "name": "latest", - "annotations": { - "openshift.io/display-name": "Java Runtime (Latest)", - "iconClass": "icon-rh-openjdk", - "tags": "java,openjdk", - "supports": "java", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "sampleContextDir": "undertow-servlet", - "version": "latest" - }, - "referencePolicy": { - "type": "Local" - }, - "from": { - "kind": "ImageStreamTag", - "name": "openjdk-17-ubi8" - } - } - ] - } - } - ] -} From 3a03614bfd42e6581664ca785432951e08191406 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 13 Feb 2024 16:32:01 +0000 Subject: [PATCH 2/2] Add a multistage build OpenShift template This is an attempt to capture all of the configuration for the second phase of a two-stage build: the first stage (not described) is a normal S2I-based build, and the second (this one) plucks the artifacts from the first phase and copies them into the runtime images. The technique was described here: The purpose of committing the template to the source repository is to help to ensure we maintain it and update it to prevent bit rot. To use: 1. Ensure your OpenShift instance has java ImageStreams. In particular the java-runtime imagestream, tag :latest. E.g., from the 'release' branch: oc create -f templates/community-image-streams.json oc create -f templates/rutime-image-streams.json 2. Define a new-app (oc new-app ...) based on a builder image. Care should be taken to align the JDK version in the builder with java-runtime:latest. The build needs to output to the ImageStream "quarkus-quickstart" and must be a self-contained application within /deployments, and for which the run-java.sh script can correctly detect the start-up JAR. E.g. oc new-app --name=quarkus-quickstart \ --image-stream=java:latest \ --context-dir=getting-started \ https://github.com/quarkusio/quarkus-quickstarts 3. Load this template oc create -f templates/multistage.yaml Signed-off-by: Jonathan Dowland --- templates/multistage.yaml | 96 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 templates/multistage.yaml diff --git a/templates/multistage.yaml b/templates/multistage.yaml new file mode 100644 index 00000000..38d79f58 --- /dev/null +++ b/templates/multistage.yaml @@ -0,0 +1,96 @@ +apiVersion: image.openshift.io/v1 +kind: ImageStream +metadata: + name: quarkus-quickstart-runtime +--- +apiVersion: apps.openshift.io/v1 +kind: DeploymentConfig +metadata: + name: quarkus-quickstart-runtime +spec: + replicas: 1 + selector: + app: quarkus-quickstart-runtime + template: + metadata: + labels: + app: quarkus-quickstart-runtime + spec: + containers: + - image: ' ' + name: quarkus-quickstart-runtime + ports: + - containerPort: 8080 + protocol: TCP + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - quarkus-quickstart-runtime + from: + kind: ImageStreamTag + name: quarkus-quickstart-runtime:latest +--- +apiVersion: v1 +kind: Service +metadata: + name: quarkus-quickstart-runtime +spec: + selector: + app: quarkus-quickstart-runtime + ports: + - port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + name: quarkus-quickstart-runtime +spec: + to: + kind: Service + name: quarkus-quickstart-runtime +--- +apiVersion: build.openshift.io/v1 +kind: BuildConfig +metadata: + name: quarkus-quickstart-runtime +spec: + output: + to: + kind: ImageStreamTag + name: quarkus-quickstart-runtime:latest + source: + images: + - from: + kind: ImageStreamTag + name: quarkus-quickstart:latest + paths: + - sourcePath: /deployments + destinationDir: ./deployments + dockerfile: |- + FROM - + COPY deployments / + strategy: + type: Docker + dockerStrategy: + from: + kind: ImageStreamTag + name: java-runtime:latest + triggers: + - type: ConfigChange + - type: ImageChange + imageChange: + automatic: true + from: + kind: ImageStreamTag + name: quarkus-quickstart:latest + - type: ImageChange + imageChange: + automatic: true + from: + kind: ImageStreamTag + name: java-runtime:latest