Skip to content

Commit

Permalink
Merge pull request #14 from luck3y/CLOUD-3860
Browse files Browse the repository at this point in the history 
CLOUD-3860 - EAP XP 2.0 OpenShift Image
  • Loading branch information
@luck3y
luck3y committed Dec 9, 2020
2 parents 6cbc5f7 + 21aeaad commit fb30cde
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 69 deletions.
22 changes: 11 additions & 11 deletions README.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Red Hat JBoss EAP XP 1.0 OpenShift container imagestreams and templates
# Red Hat JBoss EAP XP 2.0 OpenShift container imagestreams and templates

## Importing Imagestreams and Templates

You should have the 'oc' tools available and be logged in to your OpenShift instance. For more details on how to do this, please consult the OpenShift documentation.
For example, for OpenShift Online, see: https://docs.openshift.com/online/cli_reference/get_started_cli.html
[source, bash]
----
oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap-xp1/jboss-eap-xp1-openjdk11-openshift.json
oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap-xp2/jboss-eap-xp2-openjdk11-openshift.json

for resource in eap-xp1-basic-s2i.json \
eap-xp1-third-party-db-s2i.json
for resource in eap-xp2-basic-s2i.json \
eap-xp2-third-party-db-s2i.json
do
oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap-xp1/templates/${resource}
oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap-xp2/templates/${resource}
done
----

Expand All @@ -27,29 +27,29 @@ To update to the most recent image:

[source, bash]
----
oc import-image jboss-eap-xp1-openjdk11-openshift:1.0
oc import-image jboss-eap-xp1-openjdk11-runtime-openshift:1.0
oc import-image jboss-eap-xp2-openjdk11-openshift:latest
oc import-image jboss-eap-xp2-openjdk11-runtime-openshift:latest
----

Optionally include namespace to the import:
[source, bash]
----
oc -n myproject import-image jboss-eap-xp1-openjdk11-openshift:1.0
oc -n myproject import-image jboss-eap-xp1-openjdk11-runtime-openshift:1.0
oc -n myproject import-image jboss-eap-xp2-openjdk11-openshift:latest
oc -n myproject import-image jboss-eap-xp2-openjdk11-runtime-openshift:latest
----

#### Creating New Applications With Templates
Example:

[source, bash]
----
oc -n myproject new-app --template=eap-xp1-basic-s2i -p APPLICATION_NAME=eap-xp1-basic-app
oc -n myproject new-app --template=eap-xp2-basic-s2i -p APPLICATION_NAME=eap-xp2-basic-app
----

or, if a namespace was used with `-n` above:
[source, bash]
----
oc -n myproject new-app --template=eap-xp1-basic-s2i -p APPLICATION_NAME=eap-xp1-basic-app -p IMAGE_STREAM_NAMESPACE=myproject
oc -n myproject new-app --template=eap-xp2-basic-s2i -p APPLICATION_NAME=eap-xp2-basic-app -p IMAGE_STREAM_NAMESPACE=myproject
----

## Creating Secrets
Expand Down
42 changes: 21 additions & 21 deletions jboss-eap-xp1-openjdk11-openshift.json → jboss-eap-xp2-openjdk11-openshift.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"kind": "List",
"apiVersion": "v1",
"metadata": {
"name": "jboss-eap-xp1-openjdk11-openshift",
"name": "jboss-eap-xp2-openjdk11-openshift",
"annotations": {
"description": "ImageStream definitions for JBoss Enterprise Application Platform expansion pack with OpenJDK 11",
"openshift.io/provider-display-name": "Red Hat."
Expand All @@ -13,9 +13,9 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "jboss-eap-xp1-openjdk11-openshift",
"name": "jboss-eap-xp2-openjdk11-openshift",
"annotations": {
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK 11",
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK 11",
"openshift.io/provider-display-name": "Red Hat",
"version": "1.0"
}
Expand All @@ -28,37 +28,37 @@
{
"name": "latest",
"annotations": {
"description": "JBoss EAP expansion pack 1.0 image for OpenShift to build and run Microservices applications on RHEL8 with OpenJDK11",
"description": "JBoss EAP expansion pack 2.0 image for OpenShift to build and run Microservices applications on RHEL8 with OpenJDK11",
"iconClass": "icon-eap",
"tags": "builder,eap-xp,javaee,java,jboss",
"supports": "eap-xp:1,javaee:8,java:11",
"supports": "eap-xp:2,javaee:8,java:11",
"version": "latest",
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK 11"
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK 11"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7/eap-xp1-openjdk11-openshift-rhel8:latest"
"name": "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8:latest"
}
},
{
"name": "1.0",
"annotations": {
"description": "JBoss EAP expansion pack 1.0 image for OpenShift to build and run Microservices applications on RHEL8 with OpenJDK11",
"description": "JBoss EAP expansion pack 2.0 image for OpenShift to build and run Microservices applications on RHEL8 with OpenJDK11",
"iconClass": "icon-eap",
"tags": "builder,eap-xp,javaee,java,jboss",
"supports": "eap-xp:1,javaee:8,java:11",
"supports": "eap-xp:2,javaee:8,java:11",
"version": "1.0",
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK 11"
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK 11"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7/eap-xp1-openjdk11-openshift-rhel8:1.0"
"name": "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8:1.0"
}
}
]
Expand All @@ -68,9 +68,9 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "jboss-eap-xp1-openjdk11-runtime-openshift",
"name": "jboss-eap-xp2-openjdk11-runtime-openshift",
"annotations": {
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK11 (Runtime Image)",
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK11 (Runtime Image)",
"openshift.io/provider-display-name": "Red Hat",
"version": "1.0"
}
Expand All @@ -83,37 +83,37 @@
{
"name": "latest",
"annotations": {
"description": "Runtime image for JBoss EAP expansion pack 1.0 to run Microservices applications on RHEL8 with OpenJDK11.",
"description": "Runtime image for JBoss EAP expansion pack 2.0 to run Microservices applications on RHEL8 with OpenJDK11.",
"iconClass": "icon-eap",
"tags": "runtime,eap-xp,javaee,java,jboss,hidden",
"supports": "eap-xp:1,javaee:8,java:11",
"supports": "eap-xp:2,javaee:8,java:11",
"version": "latest",
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK11 (Runtime Image)"
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK11 (Runtime Image)"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7/eap-xp1-openjdk11-runtime-openshift-rhel8:latest"
"name": "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8:latest"
}
},
{
"name": "1.0",
"annotations": {
"description": "Runtime image for JBoss EAP expansion pack 1.0 to run Microservices applications on RHEL8 with OpenJDK11.",
"description": "Runtime image for JBoss EAP expansion pack 2.0 to run Microservices applications on RHEL8 with OpenJDK11.",
"iconClass": "icon-eap",
"tags": "runtime,eap-xp,javaee,java,jboss,hidden",
"supports": "eap-xp:1,javaee:8,java:8",
"supports": "eap-xp:2,javaee:8,java:8",
"version": "1.0",
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK11 (Runtime Image)"
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK11 (Runtime Image)"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7/eap-xp1-openjdk11-runtime-openshift-rhel8:1.0"
"name": "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8:1.0"
}
}
]
Expand Down
38 changes: 19 additions & 19 deletions jboss-eap-xp1-openjdk8-openshift.json → jboss-eap-xp2-openjdk8-openshift.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"kind": "List",
"apiVersion": "v1",
"metadata": {
"name": "jboss-eap-xp1-openjdk8-openshift",
"name": "jboss-eap-xp2-openjdk8-openshift",
"annotations": {
"description": "ImageStream definitions for JBoss Enterprise Application Platform expansion pack with OpenJDK 8",
"openshift.io/provider-display-name": "Red Hat"
Expand All @@ -13,9 +13,9 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "jboss-eap-xp1-openjdk8-openshift",
"name": "jboss-eap-xp2-openjdk8-openshift",
"annotations": {
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK8",
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK8",
"openshift.io/provider-display-name": "Red Hat",
"version": "1.0"
}
Expand All @@ -28,37 +28,37 @@
{
"name": "latest",
"annotations": {
"description": "JBoss EAP expansion pack 1.0 image for OpenShift to build and run Microservices applications on RHEL7 with OpenJDK8",
"description": "JBoss EAP expansion pack 2.0 image for OpenShift to build and run Microservices applications on RHEL7 with OpenJDK8",
"iconClass": "icon-eap",
"tags": "builder,eap-xp,javaee,java,jboss",
"supports": "eap-xp:1,javaee:8,java:8",
"supports": "eap-xp:2,javaee:8,java:8",
"version": "latest",
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK8"
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK8"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7/eap-xp1-openjdk8-openshift-rhel7:latest"
"name": "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7:latest"
}
},
{
"name": "1.0",
"annotations": {
"description": "JBoss EAP expansion pack 1.0 image for OpenShift to build and run Microservices applications on RHEL7 with OpenJDK8",
"description": "JBoss EAP expansion pack 2.0 image for OpenShift to build and run Microservices applications on RHEL7 with OpenJDK8",
"iconClass": "icon-eap",
"tags": "builder,eap-xp,javaee,java,jboss",
"supports": "eap-xp:1,javaee:8,java:8",
"supports": "eap-xp:2,javaee:8,java:8",
"version": "1.0",
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK8"
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK8"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7/eap-xp1-openjdk8-openshift-rhel7:1.0"
"name": "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7:1.0"
}
}
]
Expand All @@ -68,9 +68,9 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "jboss-eap-xp1-openjdk8-runtime-openshift",
"name": "jboss-eap-xp2-openjdk8-runtime-openshift",
"annotations": {
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK8 (Runtime Image)",
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK8 (Runtime Image)",
"openshift.io/provider-display-name": "Red Hat",
"version": "1.0"
}
Expand All @@ -83,37 +83,37 @@
{
"name": "latest",
"annotations": {
"description": "Runtime image for JBoss EAP expansion pack 1.0 to run Microservices applications on RHEL7 with OpenJDK8",
"description": "Runtime image for JBoss EAP expansion pack 2.0 to run Microservices applications on RHEL7 with OpenJDK8",
"iconClass": "icon-eap",
"tags": "runtime,eap-xp,javaee,java,jboss,hidden",
"supports": "eap-xp:1,javaee:8,java:8",
"version": "latest",
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK8 (Runtime Image)"
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK8 (Runtime Image)"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7/eap-xp1-openjdk8-runtime-openshift-rhel7:latest"
"name": "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7:latest"
}
},
{
"name": "1.0",
"annotations": {
"description": "Runtime image for JBoss EAP expansion pack 1.0 to run Microservices applications on RHEL7 with OpenJDK8",
"description": "Runtime image for JBoss EAP expansion pack 2.0 to run Microservices applications on RHEL7 with OpenJDK8",
"iconClass": "icon-eap",
"tags": "runtime,eap-xp,javaee,java,jboss,hidden",
"supports": "eap-xp:1,javaee:8,java:8",
"version": "1.0",
"openshift.io/display-name": "JBoss EAP XP 1.0 with OpenJDK8 (Runtime Image)"
"openshift.io/display-name": "JBoss EAP XP 2.0 with OpenJDK8 (Runtime Image)"
},
"referencePolicy": {
"type": "Local"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/jboss-eap-7/eap-xp1-openjdk8-runtime-openshift-rhel7:1.0"
"name": "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7:1.0"
}
}
]
Expand Down
18 changes: 9 additions & 9 deletions templates/eap-xp1-basic-s2i.json → templates/eap-xp2-basic-s2i.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"iconClass": "icon-eap",
"tags": "eap,eap-xp,javaee,java,jboss",
"version": "1.0",
"openshift.io/display-name": "JBoss EAP XP 1.0 basic template",
"openshift.io/display-name": "JBoss EAP XP 2.0 basic template",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "Example of an application based on JBoss EAP XP. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-openshift-templates/blob/eap-xp1/README.adoc",
"description": "Example of an application based on JBoss EAP XP. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-openshift-templates/blob/eap-xp2/README.adoc",
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform XP based application, including a build configuration, application deployment configuration and secure communication using edge TLS.",
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/",
"template.openshift.io/support-url": "https://access.redhat.com"
},
"name": "eap-xp1-basic-s2i"
"name": "eap-xp2-basic-s2i"
},
"labels": {
"template": "eap-xp1-basic-s2i",
"template": "eap-xp2-basic-s2i",
"xpaas": "1.0"
},
"message": "A new JBoss EAP XP based application has been created in your project.",
Expand All @@ -25,21 +25,21 @@
"displayName": "Application Name",
"description": "The name for the application.",
"name": "APPLICATION_NAME",
"value": "eap-xp1-basic-app",
"value": "eap-xp2-basic-app",
"required": true
},
{
"displayName": "EAP XP Image Name",
"description": "EAP XP imagestream tag to be used, example: jboss-eap-xp1-openjdk11-openshift:1.0",
"description": "EAP XP imagestream tag to be used, example: jboss-eap-xp2-openjdk11-openshift:1.0",
"name": "EAP_IMAGE_NAME",
"value": "jboss-eap-xp1-openjdk11-openshift:1.0",
"value": "jboss-eap-xp2-openjdk11-openshift:latest",
"required": true
},
{
"displayName": "EAP XP Runtime Image Name",
"description": "EAP XP Runtime imagestream tag to be used, example: jboss-eap-xp1-openjdk11-runtime-openshift:1.0",
"description": "EAP XP Runtime imagestream tag to be used, example: jboss-eap-xp2-openjdk11-runtime-openshift:1.0",
"name": "EAP_RUNTIME_IMAGE_NAME",
"value": "jboss-eap-xp1-openjdk11-runtime-openshift:1.0",
"value": "jboss-eap-xp2-openjdk11-runtime-openshift:latest",
"required": true
},
{
Expand Down

0 comments on commit fb30cde

Please sign in to comment.