Skip to content

[KIECLOUD-112] - Update RHPAM/DM templates on OpenShift Service Catal… #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2019
Merged

[KIECLOUD-112] - Update RHPAM/DM templates on OpenShift Service Catal… #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions community/php/imagestreams/php-centos7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"tags": [
{
"annotations": {
"description": "Build and run PHP applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.1/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major versions updates.",
"description": "Build and run PHP applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.2/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major versions updates.",
"iconClass": "icon-php",
"openshift.io/display-name": "PHP (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
Expand All @@ -21,7 +21,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "7.1"
"name": "7.2"
},
"name": "latest",
"referencePolicy": {
Expand Down Expand Up @@ -107,6 +107,26 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Build and run PHP 7.2 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.2/README.md.",
"iconClass": "icon-php",
"openshift.io/display-name": "PHP 7.2",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git",
"supports": "php:7.2,php",
"tags": "builder,php",
"version": "7.2"
},
"from": {
"kind": "DockerImage",
"name": "docker.io/centos/php-72-centos7:latest"
},
"name": "7.2",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions official.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ variables:
rhsso_tpcd_version: sso-cd-dev
webserver_version: ose-v1.4.16
ips_ds_version: ose-v1.4.16
rhdm_version: 7.2.0.GA
rhpam_version: 7.2.0.GA
rhdm_version: 7.2.1.GA
rhpam_version: 7.2.1.GA
jdg_version: ose-v1.4.16
datagrid_version: 1.1.1
cacheservice_version: 1.0.TP
Expand Down
76 changes: 38 additions & 38 deletions official/README.md
View file
Open in desktop

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions official/index.json
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 22 additions & 2 deletions official/php/imagestreams/php-rhel7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"tags": [
{
"annotations": {
"description": "Build and run PHP applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.1/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major versions updates.",
"description": "Build and run PHP applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.2/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PHP available on OpenShift, including major versions updates.",
"iconClass": "icon-php",
"openshift.io/display-name": "PHP (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
Expand All @@ -21,7 +21,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "7.1"
"name": "7.2"
},
"name": "latest",
"referencePolicy": {
Expand Down Expand Up @@ -107,6 +107,26 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Build and run PHP 7.2 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.2/README.md.",
"iconClass": "icon-php",
"openshift.io/display-name": "PHP 7.2",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git",
"supports": "php:7.2,php",
"tags": "builder,php",
"version": "7.2"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhscl/php-72-rhel7:latest"
},
"name": "7.2",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
17 changes: 17 additions & 0 deletions official/rhdm/imagestreams/rhdm72-decisioncentral-indexing-openshift-rhel7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Red Hat Decision Manager 7.2 - Decision Central Indexing image.",
"iconClass": "icon-jboss",
"supports": "rhdm:7.2",
"tags": "rhdm",
"version": "1.1"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhdm-7-tech-preview/rhdm72-decisioncentral-indexing-openshift:1.1"
},
"name": "1.1",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
17 changes: 17 additions & 0 deletions official/rhdm/imagestreams/rhdm72-decisioncentral-openshift-rhel7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Red Hat Decision Manager 7.2 - Decision Central image.",
"iconClass": "icon-jboss",
"supports": "rhdm:7.2",
"tags": "rhdm",
"version": "1.1"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhdm-7/rhdm72-decisioncentral-openshift:1.1"
},
"name": "1.1",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
17 changes: 17 additions & 0 deletions official/rhdm/imagestreams/rhdm72-kieserver-openshift-rhel7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Red Hat Decision Manager 7.2 - KIE Server image.",
"iconClass": "icon-jboss",
"supports": "rhdm:7.2",
"tags": "rhdm",
"version": "1.1"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhdm-7/rhdm72-kieserver-openshift:1.1"
},
"name": "1.1",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
19 changes: 18 additions & 1 deletion official/rhdm/imagestreams/rhdm72-optaweb-employee-rostering-openshift-rhel7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"kind": "ImageStream",
"metadata": {
"annotations": {
"openshift.io/display-name": "Red Hat Decision Manager KIE Server 7.2",
"openshift.io/display-name": "Red Hat Decision Manager Business Optimizer OptaWeb Employee Rostering 7.2",
"openshift.io/provider-display-name": "Red Hat, Inc."
},
"name": "rhdm72-optaweb-employee-rostering-openshift"
Expand All @@ -26,6 +26,23 @@
"referencePolicy": {
"type": "Local"
}
},
{
"annotations": {
"description": "Red Hat Decision Manager 7.2 - Business Optimizer OptaWeb Employee Rostering image.",
"iconClass": "icon-jboss",
"supports": "rhdm:7.2",
"tags": "rhdm",
"version": "1.1"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhdm-7-tech-preview/rhdm72-optaweb-employee-rostering-openshift:1.1"
},
"name": "1.1",
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions official/rhdm/templates/rhdm72-authoring-ha.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"apiVersion": "v1",
"kind": "Template",
"labels": {
"rhdm": "1.0",
"rhdm": "1.1",
"template": "rhdm72-authoring-ha"
},
"message": "A new persistent HA Decision Manager application has been created in your project.\nThe username/password for accessing the Decision Central interface is\n\n Username: ${KIE_ADMIN_USER}\n Password: ${KIE_ADMIN_PWD}\n\nThe user name/password for calls to the KIE server is\n\n Username: ${KIE_SERVER_USER}\n Password: ${KIE_SERVER_PWD}\n\nPlease be sure to create the secrets named \"${DECISION_CENTRAL_HTTPS_SECRET}\" and \"${KIE_SERVER_HTTPS_SECRET}\" containing the\n${DECISION_CENTRAL_HTTPS_KEYSTORE} and ${KIE_SERVER_HTTPS_KEYSTORE} files used for serving secure content.",
Expand All @@ -17,7 +17,7 @@
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en-us/red_hat_decision_manager/7.2/html/deploying_a_red_hat_decision_manager_7.2_authoring_environment_on_red_hat_openshift_container_platform/",
"template.openshift.io/long-description": "This template defines resources needed to develop and execute Rules on Red Hat Decision Manager 7.2 with High Availability enabled as tech preview, including application deployment configuration, secure and insecure http communication and persistent volumes to store data that needs to survive a restart.",
"template.openshift.io/support-url": "https://access.redhat.com",
"version": "1.0"
"version": "1.1"
},
"name": "rhdm72-authoring-ha"
},
Expand Down Expand Up @@ -1674,7 +1674,7 @@
"value": "amq-broker72-openshift"
},
{
"description": "The AMQ image stream tag. Default is \"1.0\".",
"description": "The AMQ image stream tag. Default is \"1.1\".",
"displayName": "AMQ ImageStream Tag",
"name": "AMQ_IMAGE_STREAM_TAG",
"required": true,
Expand Down Expand Up @@ -1723,11 +1723,11 @@
"value": "rhdm72-kieserver-openshift"
},
{
"description": "A named pointer to an image in an image stream. Default is \"1.0\".",
"description": "A named pointer to an image in an image stream. Default is \"1.1\".",
"displayName": "ImageStream Tag",
"name": "IMAGE_STREAM_TAG",
"required": true,
"value": "1.0"
"value": "1.1"
},
{
"description": "The id to use for the maven repository, if set. Default is generated randomly.",
Expand Down
8 changes: 4 additions & 4 deletions official/rhdm/templates/rhdm72-authoring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"apiVersion": "v1",
"kind": "Template",
"labels": {
"rhdm": "1.0",
"rhdm": "1.1",
"template": "rhdm72-authoring"
},
"message": "A new persistent Decision Manager application has been created in your project.\nThe username/password for accessing the Decision Central interface is\n\n Username: ${KIE_ADMIN_USER}\n Password: ${KIE_ADMIN_PWD}\n\nThe user name/password for calls to the KIE server is\n\n Username: ${KIE_SERVER_USER}\n Password: ${KIE_SERVER_PWD}\n\nPlease be sure to create the secrets named \"${DECISION_CENTRAL_HTTPS_SECRET}\" and \"${KIE_SERVER_HTTPS_SECRET}\" containing the\n${DECISION_CENTRAL_HTTPS_KEYSTORE} and ${KIE_SERVER_HTTPS_KEYSTORE} files used for serving secure content.",
Expand All @@ -17,7 +17,7 @@
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en-us/red_hat_decision_manager/7.2/html/deploying_a_red_hat_decision_manager_7.2_authoring_environment_on_red_hat_openshift_container_platform/",
"template.openshift.io/long-description": "This template defines resources needed to develop and execute Rules on Red Hat Decision Manager 7.2, including application deployment configuration, secure and insecure http communication and a persistent volume to store data that needs to survive to a restart.",
"template.openshift.io/support-url": "https://access.redhat.com",
"version": "1.0"
"version": "1.1"
},
"name": "rhdm72-authoring"
},
Expand Down Expand Up @@ -1164,11 +1164,11 @@
"value": "rhdm72-kieserver-openshift"
},
{
"description": "A named pointer to an image in an image stream. Default is \"1.0\".",
"description": "A named pointer to an image in an image stream. Default is \"1.1\".",
"displayName": "ImageStream Tag",
"name": "IMAGE_STREAM_TAG",
"required": true,
"value": "1.0"
"value": "1.1"
},
{
"description": "The id to use for the maven repository, if set. Default is generated randomly.",
Expand Down
8 changes: 4 additions & 4 deletions official/rhdm/templates/rhdm72-kieserver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"apiVersion": "v1",
"kind": "Template",
"labels": {
"rhdm": "1.0",
"rhdm": "1.1",
"template": "rhdm72-kieserver"
},
"message": "A new Decision Manager KIE server application has been created in your project.\nThe username/password for accessing the KIE server\n\n Username: ${KIE_SERVER_USER}\n Password: ${KIE_SERVER_PWD}\n\nPlease be sure to create the secret named \"${KIE_SERVER_HTTPS_SECRET}\" containing the ${KIE_SERVER_HTTPS_KEYSTORE} file used for serving secure content.",
Expand All @@ -17,7 +17,7 @@
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en-us/red_hat_decision_manager/7.2/html/deploying_a_red_hat_decision_manager_7.2_managed_server_environment_on_red_hat_openshift_container_platform/",
"template.openshift.io/long-description": "This template defines resources needed to execute Rules on Red Hat Decision Manager KIE server 7.2, including application deployment configuration, secure and insecure http communication.",
"template.openshift.io/support-url": "https://access.redhat.com",
"version": "1.0"
"version": "1.1"
},
"name": "rhdm72-kieserver"
},
Expand Down Expand Up @@ -675,11 +675,11 @@
"value": "rhdm72-kieserver-openshift"
},
{
"description": "A named pointer to an image in an image stream. Default is \"1.0\".",
"description": "A named pointer to an image in an image stream. Default is \"1.1\".",
"displayName": "ImageStream Tag",
"name": "IMAGE_STREAM_TAG",
"required": true,
"value": "1.0"
"value": "1.1"
},
{
"description": "KIE server controller username (Sets the org.kie.server.controller.user system property)",
Expand Down
8 changes: 4 additions & 4 deletions official/rhdm/templates/rhdm72-optaweb-employee-rostering-trial-ephemeral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"apiVersion": "v1",
"kind": "Template",
"labels": {
"rhdm": "1.0",
"rhdm": "1.1",
"template": "rhdm72-optaweb-employee-rostering-trial-ephemeral"
},
"message": "A new Decision Manager Optaweb employee rostering application have been created in your project.\n\nPlease remember that this is an ephemeral environment and any work will be LOST with a simple pod restart.",
Expand All @@ -17,7 +17,7 @@
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en-us/red_hat_decision_manager/7.2/html/deploying_the_employee_roster_starter_application_for_red_hat_business_optimizer_on_red_hat_openshift_container_platform/",
"template.openshift.io/long-description": "This web application assists the operations department to assign shifts to employees, for example in hospitals, factories, guard firms or call centers. It automatically finds the best employee for each shift, taking into account labor regulations, skill requirements, employee preferences and other constraints.",
"template.openshift.io/support-url": "https://access.redhat.com",
"version": "1.0"
"version": "1.1"
},
"name": "rhdm72-optaweb-employee-rostering-trial-ephemeral"
},
Expand Down Expand Up @@ -271,11 +271,11 @@
"value": "rhdm72-optaweb-employee-rostering-openshift"
},
{
"description": "A named pointer to an image in an image stream. Default is \"1.0\".",
"description": "A named pointer to an image in an image stream. Default is \"1.1\".",
"displayName": "ImageStream Tag",
"name": "IMAGE_STREAM_TAG",
"required": true,
"value": "1.0"
"value": "1.1"
},
{
"description": "Custom hostname for http service route, if set will also configure the OPTAWEB_HOST. Leave blank for default hostname, e.g.: <application-name>-optaweb-employee-rostering-<project>.<default-domain-suffix>",
Expand Down
8 changes: 4 additions & 4 deletions official/rhdm/templates/rhdm72-prod-immutable-kieserver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"apiVersion": "v1",
"kind": "Template",
"labels": {
"rhdm": "1.0",
"rhdm": "1.1",
"template": "rhdm72-prod-immutable-kieserver"
},
"message": "A new immutable Red Hat Decision Manager KIE server has been created in your project.\nThe username/password for accessing the KIE server is\n\n Username: ${KIE_SERVER_USER}\n Password: ${KIE_SERVER_PWD}\n\nPlease be sure to create the secret named \"${KIE_SERVER_HTTPS_SECRET}\" containing the ${KIE_SERVER_HTTPS_KEYSTORE} files used for serving secure content.",
Expand All @@ -17,7 +17,7 @@
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en-us/red_hat_decision_manager/7.2/html/deploying_a_red_hat_decision_manager_7.2_immutable_server_environment_on_red_hat_openshift_container_platform/",
"template.openshift.io/long-description": "This template defines resources needed for an immutable production runtime environment for Red Hat Decision Manager 7.2, including a source to image (S2I) build of your services, application deployment configuration, secure and insecure http communication.",
"template.openshift.io/support-url": "https://access.redhat.com",
"version": "1.0"
"version": "1.1"
},
"name": "rhdm72-prod-immutable-kieserver"
},
Expand Down Expand Up @@ -714,11 +714,11 @@
"value": "rhdm72-kieserver-openshift"
},
{
"description": "A named pointer to an image in an image stream. Default is \"1.0\".",
"description": "A named pointer to an image in an image stream. Default is \"1.1\".",
"displayName": "ImageStream Tag",
"name": "IMAGE_STREAM_TAG",
"required": true,
"value": "1.0"
"value": "1.1"
},
{
"description": "KIE server controller username (Sets the org.kie.server.controller.user system property)",
Expand Down
Loading