diff --git a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json index e8fdf317e..1b96f4391 100755 --- a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-example", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -308,7 +308,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json index 7a0398aea..e1bb86859 100755 --- a/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-aarch64/cakephp/templates/cakephp-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-persistent", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -325,7 +325,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-example.json b/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-example.json index b5244e9a4..3c5a3829f 100755 --- a/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -281,7 +281,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-persistent.json b/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-persistent.json index 2b0cad268..f33a6637b 100755 --- a/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-aarch64/dancer/templates/dancer-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -298,7 +298,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/ocp-aarch64/django/templates/django-psql-example.json b/assets/operator/ocp-aarch64/django/templates/django-psql-example.json index 51a708aa0..6359561b6 100755 --- a/assets/operator/ocp-aarch64/django/templates/django-psql-example.json +++ b/assets/operator/ocp-aarch64/django/templates/django-psql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/ocp-aarch64/django/templates/django-psql-persistent.json b/assets/operator/ocp-aarch64/django/templates/django-psql-persistent.json index 9fb7eae2a..28f2aa2ac 100755 --- a/assets/operator/ocp-aarch64/django/templates/django-psql-persistent.json +++ b/assets/operator/ocp-aarch64/django/templates/django-psql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-rhel-aarch64.json b/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-rhel-aarch64.json new file mode 100755 index 000000000..86e82042a --- /dev/null +++ b/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-rhel-aarch64.json @@ -0,0 +1,89 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "dotnet", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": ".NET" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": { + "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET (Latest)", + "sampleContextDir": "app", + "sampleRef": "dotnet-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet", + "tags": "builder,.net,dotnet,dotnetcore,hidden" + }, + "from": { + "kind": "ImageStreamTag", + "name": "6.0-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0-ubi8", + "annotations": { + "description": "Build and run .NET 6 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnet-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:6.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet60", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0", + "annotations": { + "description": "Build and run .NET 6 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnetcore-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:6.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet60,hidden", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-runtime-rhel-aarch64.json b/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-runtime-rhel-aarch64.json new file mode 100755 index 000000000..e8ab0c944 --- /dev/null +++ b/assets/operator/ocp-aarch64/dotnet/imagestreams/dotnet-runtime-rhel-aarch64.json @@ -0,0 +1,80 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "dotnet-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": ".NET Core Runtime" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": { + "description": "Run .NET applications. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET Runtime (Latest)", + "supports": "dotnet-runtime", + "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden" + }, + "from": { + "kind": "ImageStreamTag", + "name": "6.0-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0-ubi8", + "annotations": { + "description": "Run .NET 6 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 Runtime (UBI 8)", + "supports": "dotnet-runtime", + "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0", + "annotations": { + "description": "Run .NET 6 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 Runtime (UBI 8)", + "supports": "dotnet-runtime", + "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/golang/imagestreams/golang-rhel-aarch64.json b/assets/operator/ocp-aarch64/golang/imagestreams/golang-rhel-aarch64.json index be01940a9..c48199f04 100755 --- a/assets/operator/ocp-aarch64/golang/imagestreams/golang-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/golang/imagestreams/golang-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "golang", "creationTimestamp": null, @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.14.7-ubi8" + "name": "1.16.7-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,11 +35,11 @@ } }, { - "name": "1.14.7-ubi8", + "name": "1.16.7-ubi8", "annotations": { "description": "Build and run Go applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.14.7 (UBI 8)", + "openshift.io/display-name": "Go 1.16.7 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -47,7 +47,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/go-toolset:1.14.7" + "name": "registry.redhat.io/ubi8/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/httpd/imagestreams/httpd-rhel-aarch64.json b/assets/operator/ocp-aarch64/httpd/imagestreams/httpd-rhel-aarch64.json index ce7c7d8a6..038026503 100755 --- a/assets/operator/ocp-aarch64/httpd/imagestreams/httpd-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/httpd/imagestreams/httpd-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "httpd", "creationTimestamp": null, diff --git a/assets/operator/ocp-aarch64/httpd/templates/httpd-example.json b/assets/operator/ocp-aarch64/httpd/templates/httpd-example.json index d9d9d2197..f125e8135 100755 --- a/assets/operator/ocp-aarch64/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-aarch64/httpd/templates/httpd-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "httpd-example", "creationTimestamp": null, @@ -41,7 +41,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -65,7 +65,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -122,7 +122,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/java/imagestreams/java-rhel-aarch64.json b/assets/operator/ocp-aarch64/java/imagestreams/java-rhel-aarch64.json index 66996fb0d..2e202ba34 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/java-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/java-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "java", "creationTimestamp": null, @@ -62,6 +62,28 @@ "type": "Local" } }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:17,java", + "tags": "builder,java,openjdk", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-17:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { @@ -76,7 +98,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "openjdk-11-ubi8" + "name": "openjdk-17-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/java/imagestreams/java-runtime-ubi.json b/assets/operator/ocp-aarch64/java/imagestreams/java-runtime-ubi.json new file mode 100755 index 000000000..fd9e66c02 --- /dev/null +++ b/assets/operator/ocp-aarch64/java/imagestreams/java-runtime-ubi.json @@ -0,0 +1,102 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "java-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK Runtime", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "openjdk-8-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java:8,openjdk,ubi8", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java:11,openjdk,ubi8", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java:17,openjdk,ubi8", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Java Runtime (Latest)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java", + "tags": "java,openjdk", + "version": "latest" + }, + "from": { + "kind": "ImageStreamTag", + "name": "openjdk-17-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-rhel-aarch64.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-rhel-aarch64.json index 29d4ac860..4d6dd3b74 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ubi8-openjdk-11", "creationTimestamp": null, @@ -38,6 +38,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json new file mode 100755 index 000000000..1adfce208 --- /dev/null +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -0,0 +1,64 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-11-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-rhel-aarch64.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-rhel-aarch64.json index a43f915cc..896bf3cb6 100755 --- a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ubi8-openjdk-8", "creationTimestamp": null, @@ -38,6 +38,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json new file mode 100755 index 000000000..907431810 --- /dev/null +++ b/assets/operator/ocp-aarch64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -0,0 +1,60 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-8-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-aarch64/java/templates/openjdk-web-basic-s2i.json b/assets/operator/ocp-aarch64/java/templates/openjdk-web-basic-s2i.json index 26ff0aa62..719d671ca 100755 --- a/assets/operator/ocp-aarch64/java/templates/openjdk-web-basic-s2i.json +++ b/assets/operator/ocp-aarch64/java/templates/openjdk-web-basic-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "openjdk-web-basic-s2i", "creationTimestamp": null, @@ -47,7 +47,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -135,7 +135,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-base-rhel.json b/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-base-rhel.json index 63c5d8cf9..9fd029518 100755 --- a/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-base-rhel.json +++ b/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-base-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-base", "creationTimestamp": null diff --git a/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-maven-rhel.json b/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-maven-rhel.json index 205d1f29a..6001705b3 100755 --- a/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-maven-rhel.json +++ b/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-maven-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-maven", "creationTimestamp": null, diff --git a/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json b/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json index 5122df528..77a0cb014 100755 --- a/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json +++ b/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-nodejs", "creationTimestamp": null, diff --git a/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-rhel.json b/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-rhel.json index c33eea6dd..e131286b8 100755 --- a/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-rhel.json +++ b/assets/operator/ocp-aarch64/jenkins/imagestreams/jenkins-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins", "creationTimestamp": null, diff --git a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral-monitored.json b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral-monitored.json index e41ac805f..d14157583 100755 --- a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral-monitored.json +++ b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -356,6 +356,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral.json b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral.json index 7ed8adf1b..b04448e8e 100755 --- a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -324,6 +324,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent-monitored.json b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent-monitored.json index 0da638332..a995d54dd 100755 --- a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent-monitored.json +++ b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via Prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -390,6 +390,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent.json b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent.json index ab747d40a..d2a17d748 100755 --- a/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/ocp-aarch64/jenkins/templates/jenkins-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -358,6 +358,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json b/assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json index 011f123da..b7b5f137b 100755 --- a/assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mariadb", "creationTimestamp": null, diff --git a/assets/operator/ocp-aarch64/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-aarch64/mariadb/templates/mariadb-ephemeral.json index b3cc99ff1..411af8bb4 100755 --- a/assets/operator/ocp-aarch64/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-aarch64/mariadb/templates/mariadb-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-ephemeral", "creationTimestamp": null, @@ -58,7 +58,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-aarch64/mariadb/templates/mariadb-persistent.json index 9af30abbe..856a37b6c 100755 --- a/assets/operator/ocp-aarch64/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-aarch64/mariadb/templates/mariadb-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/mysql/imagestreams/mysql-rhel-aarch64.json b/assets/operator/ocp-aarch64/mysql/imagestreams/mysql-rhel-aarch64.json index a3341575b..36aa3fd3e 100755 --- a/assets/operator/ocp-aarch64/mysql/imagestreams/mysql-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/mysql/imagestreams/mysql-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mysql", "creationTimestamp": null, diff --git a/assets/operator/ocp-aarch64/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-aarch64/mysql/templates/mysql-ephemeral.json index e6fceb378..3ef5f630d 100755 --- a/assets/operator/ocp-aarch64/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-aarch64/mysql/templates/mysql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-ephemeral", "creationTimestamp": null, @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/mysql/templates/mysql-persistent.json b/assets/operator/ocp-aarch64/mysql/templates/mysql-persistent.json index 6e36f9871..61d5eaf1b 100755 --- a/assets/operator/ocp-aarch64/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-aarch64/mysql/templates/mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json b/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json index 3f9f7b556..35313b818 100755 --- a/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nginx", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.18-ubi8" + "name": "1.20-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "1.18-ubi8", + "name": "1.20-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-118:latest" + "name": "registry.redhat.io/ubi8/nginx-120:latest" }, "generation": null, "importPolicy": {}, @@ -57,20 +57,20 @@ } }, { - "name": "1.16-el8", + "name": "1.18-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (RHEL 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/nginx-116:latest" + "name": "registry.redhat.io/ubi8/nginx-118:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/nginx/templates/nginx-example.json b/assets/operator/ocp-aarch64/nginx/templates/nginx-example.json index 9586e7adf..ad203770f 100755 --- a/assets/operator/ocp-aarch64/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-aarch64/nginx/templates/nginx-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "nginx-example", "creationTimestamp": null, @@ -40,7 +40,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -57,7 +57,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -124,7 +124,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16-el8 by default).", - "value": "1.16-el8", + "description": "Version of NGINX image to be used (1.20-el8 by default).", + "value": "1.20-el8", "required": true }, { diff --git a/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json b/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json index ac96912c3..bcf89f594 100755 --- a/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nodejs", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", + "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", "iconClass": "icon-nodejs", "openshift.io/display-name": "Node.js (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "14-ubi8" + "name": "16-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,19 +35,19 @@ } }, { - "name": "14-ubi8", + "name": "16-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14:latest" + "name": "registry.redhat.io/ubi8/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,32 @@ } }, { - "name": "14-ubi8-minimal", + "name": "16-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", + "tags": "builder,nodejs", + "version": "16" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/nodejs-16-minimal:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "14-ubi8", + "annotations": { + "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "iconClass": "icon-nodejs", + "openshift.io/display-name": "Node.js 14 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", @@ -68,7 +89,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" + "name": "registry.redhat.io/ubi8/nodejs-14:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +98,19 @@ } }, { - "name": "12-ubi8", + "name": "14-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 8)", + "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-12:latest" + "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-example.json b/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-example.json index 03caa5562..57ff1338d 100755 --- a/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-example.json +++ b/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-example.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-persistent.json b/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-persistent.json index c21a5254b..5c625dee3 100755 --- a/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-persistent.json +++ b/assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-persistent.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/perl/imagestreams/perl-rhel-aarch64.json b/assets/operator/ocp-aarch64/perl/imagestreams/perl-rhel-aarch64.json index 340847d82..a6ed1a563 100755 --- a/assets/operator/ocp-aarch64/perl/imagestreams/perl-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/perl/imagestreams/perl-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "perl", "creationTimestamp": null, diff --git a/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json b/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json index 103123a04..c3cb70153 100755 --- a/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "php", "creationTimestamp": null, @@ -55,28 +55,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "7.3-ubi8", - "annotations": { - "description": "Build and run PHP 7.3 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.", - "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", - "tags": "builder,php", - "version": "7.3" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-73:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }, diff --git a/assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json b/assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json index ec1d51aca..c0a32edbd 100755 --- a/assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "postgresql", "creationTimestamp": null, @@ -91,26 +91,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "9.6-el8", - "annotations": { - "description": "Provides a PostgreSQL 9.6 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 9.6 (RHEL 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql", - "version": "9.6" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-96:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }, diff --git a/assets/operator/ocp-aarch64/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-aarch64/postgresql/templates/postgresql-ephemeral.json index b61755011..1a7d47325 100755 --- a/assets/operator/ocp-aarch64/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-aarch64/postgresql/templates/postgresql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-ephemeral", "creationTimestamp": null, @@ -64,7 +64,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-aarch64/postgresql/templates/postgresql-persistent.json index e3f752ca1..623bc36dd 100755 --- a/assets/operator/ocp-aarch64/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-aarch64/postgresql/templates/postgresql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-persistent", "creationTimestamp": null, @@ -81,7 +81,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/python/imagestreams/python-rhel-aarch64.json b/assets/operator/ocp-aarch64/python/imagestreams/python-rhel-aarch64.json index 1dd7a2850..fbf3a3305 100755 --- a/assets/operator/ocp-aarch64/python/imagestreams/python-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/python/imagestreams/python-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "python", "creationTimestamp": null, diff --git a/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json index e03d3a6c1..6408ab5bc 100755 --- a/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-pgsql-persistent", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -341,7 +341,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/rails/templates/rails-postgresql-example.json b/assets/operator/ocp-aarch64/rails/templates/rails-postgresql-example.json index 9d4366f7f..a6aa97190 100755 --- a/assets/operator/ocp-aarch64/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-aarch64/rails/templates/rails-postgresql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-postgresql-example", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -324,7 +324,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-aarch64/redis/imagestreams/redis-rhel-aarch64.json b/assets/operator/ocp-aarch64/redis/imagestreams/redis-rhel-aarch64.json index 421b7a551..d5bc5bd59 100755 --- a/assets/operator/ocp-aarch64/redis/imagestreams/redis-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/redis/imagestreams/redis-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "redis", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Provides a Redis database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Redis available on OpenShift, including major version updates.", + "description": "Provides a Redis database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Redis available on OpenShift, including major version updates.", "iconClass": "icon-redis", "openshift.io/display-name": "Redis (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -24,7 +24,27 @@ }, "from": { "kind": "ImageStreamTag", - "name": "5-el8" + "name": "6-el8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6-el8", + "annotations": { + "description": "Provides a Redis 6 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.", + "iconClass": "icon-redis", + "openshift.io/display-name": "Redis 6 (RHEL 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "redis", + "version": "6" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhel8/redis-6:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-aarch64/redis/templates/redis-ephemeral.json b/assets/operator/ocp-aarch64/redis/templates/redis-ephemeral.json index e9af758bd..104f1f03c 100755 --- a/assets/operator/ocp-aarch64/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-aarch64/redis/templates/redis-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-ephemeral", "creationTimestamp": null, @@ -60,7 +60,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/ocp-aarch64/redis/templates/redis-persistent.json b/assets/operator/ocp-aarch64/redis/templates/redis-persistent.json index 68ee70a6c..d1f4ed9d6 100755 --- a/assets/operator/ocp-aarch64/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-aarch64/redis/templates/redis-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-persistent", "creationTimestamp": null, @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/ocp-aarch64/ruby/imagestreams/ruby-rhel-aarch64.json b/assets/operator/ocp-aarch64/ruby/imagestreams/ruby-rhel-aarch64.json index d63be524e..3d2b71be6 100755 --- a/assets/operator/ocp-aarch64/ruby/imagestreams/ruby-rhel-aarch64.json +++ b/assets/operator/ocp-aarch64/ruby/imagestreams/ruby-rhel-aarch64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ruby", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/2.7/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", + "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/3.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", "iconClass": "icon-ruby", "openshift.io/display-name": "Ruby (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,29 @@ }, "from": { "kind": "ImageStreamTag", - "name": "2.7-ubi8" + "name": "3.0-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "3.0-ubi8", + "annotations": { + "description": "Build and run Ruby 3.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.", + "iconClass": "icon-ruby", + "openshift.io/display-name": "Ruby 3.0 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/ruby-ex.git", + "supports": "ruby:3.0,ruby", + "tags": "builder,ruby", + "version": "3.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/ruby-30:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json index e8fdf317e..1b96f4391 100755 --- a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-example", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -308,7 +308,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json index 7a0398aea..e1bb86859 100755 --- a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-persistent", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -325,7 +325,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json index b5244e9a4..3c5a3829f 100755 --- a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -281,7 +281,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json index 2b0cad268..f33a6637b 100755 --- a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -298,7 +298,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/django/templates/django-psql-example.json b/assets/operator/ocp-ppc64le/django/templates/django-psql-example.json index 51a708aa0..6359561b6 100755 --- a/assets/operator/ocp-ppc64le/django/templates/django-psql-example.json +++ b/assets/operator/ocp-ppc64le/django/templates/django-psql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/django/templates/django-psql-persistent.json b/assets/operator/ocp-ppc64le/django/templates/django-psql-persistent.json index 9fb7eae2a..28f2aa2ac 100755 --- a/assets/operator/ocp-ppc64le/django/templates/django-psql-persistent.json +++ b/assets/operator/ocp-ppc64le/django/templates/django-psql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/golang/imagestreams/golang-rhel.json b/assets/operator/ocp-ppc64le/golang/imagestreams/golang-rhel.json index 3cfd1a0f7..f8254727e 100755 --- a/assets/operator/ocp-ppc64le/golang/imagestreams/golang-rhel.json +++ b/assets/operator/ocp-ppc64le/golang/imagestreams/golang-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "golang", "creationTimestamp": null, @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.14.7-ubi8" + "name": "1.16.7-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,11 +35,11 @@ } }, { - "name": "1.14.7-ubi8", + "name": "1.16.7-ubi8", "annotations": { "description": "Build and run Go applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.14.7 (UBI 8)", + "openshift.io/display-name": "Go 1.16.7 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -47,7 +47,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/go-toolset:1.14.7" + "name": "registry.redhat.io/ubi8/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,11 @@ } }, { - "name": "1.13.4-ubi7", + "name": "1.16.7-ubi7", "annotations": { "description": "Build and run Go applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.13.4 (UBI 7)", + "openshift.io/display-name": "Go 1.16.7 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -68,7 +68,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/go-toolset:1.13.4" + "name": "registry.redhat.io/ubi7/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json b/assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json index eab177e10..ba29caaba 100755 --- a/assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json +++ b/assets/operator/ocp-ppc64le/httpd/imagestreams/httpd-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "httpd", "creationTimestamp": null, diff --git a/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json b/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json index d9d9d2197..f125e8135 100755 --- a/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "httpd-example", "creationTimestamp": null, @@ -41,7 +41,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -65,7 +65,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -122,7 +122,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json index e60982c2e..1589892dc 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "java", "creationTimestamp": null, @@ -62,6 +62,50 @@ "type": "Local" } }, + { + "name": "openj9-8-el8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJ9 1.8.0.", + "iconClass": "icon-rh-openj9", + "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openj9", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openj9/openj9-8-rhel8:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openj9-8-el7", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJ9 1.8.0.", + "iconClass": "icon-rh-openj9", + "openshift.io/display-name": "OpenJ9 1.8.0 (RHEL 7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openj9", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openj9/openj9-8-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "8", "annotations": { @@ -128,6 +172,50 @@ "type": "Local" } }, + { + "name": "openj9-11-el8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJ9 11.", + "iconClass": "icon-rh-openj9", + "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openj9", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openj9/openj9-11-rhel8:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openj9-11-el7", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJ9 11.", + "iconClass": "icon-rh-openj9", + "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL 7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openj9", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openj9/openj9-11-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "11", "annotations": { @@ -150,6 +238,28 @@ "type": "Local" } }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:17,java", + "tags": "builder,java,openjdk", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-17:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { @@ -164,7 +274,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "openjdk-11-ubi8" + "name": "openjdk-17-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/java-runtime-ubi.json b/assets/operator/ocp-ppc64le/java/imagestreams/java-runtime-ubi.json new file mode 100755 index 000000000..fd9e66c02 --- /dev/null +++ b/assets/operator/ocp-ppc64le/java/imagestreams/java-runtime-ubi.json @@ -0,0 +1,102 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "java-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK Runtime", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "openjdk-8-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java:8,openjdk,ubi8", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java:11,openjdk,ubi8", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java:17,openjdk,ubi8", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Java Runtime (Latest)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java", + "tags": "java,openjdk", + "version": "latest" + }, + "from": { + "kind": "ImageStreamTag", + "name": "openjdk-17-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json index 389db83b6..19197533f 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "openjdk-11-rhel7", "creationTimestamp": null, @@ -61,6 +61,28 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json index ed8365d26..41d29be0c 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "redhat-openjdk18-openshift", "creationTimestamp": null, @@ -105,6 +105,28 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json index 29d4ac860..4d6dd3b74 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ubi8-openjdk-11", "creationTimestamp": null, @@ -38,6 +38,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json new file mode 100755 index 000000000..1adfce208 --- /dev/null +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -0,0 +1,64 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-11-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json index a43f915cc..896bf3cb6 100755 --- a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ubi8-openjdk-8", "creationTimestamp": null, @@ -38,6 +38,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json new file mode 100755 index 000000000..907431810 --- /dev/null +++ b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -0,0 +1,60 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-8-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/java/templates/openjdk-web-basic-s2i.json b/assets/operator/ocp-ppc64le/java/templates/openjdk-web-basic-s2i.json index 26ff0aa62..719d671ca 100755 --- a/assets/operator/ocp-ppc64le/java/templates/openjdk-web-basic-s2i.json +++ b/assets/operator/ocp-ppc64le/java/templates/openjdk-web-basic-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "openjdk-web-basic-s2i", "creationTimestamp": null, @@ -47,7 +47,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -135,7 +135,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-base-rhel.json b/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-base-rhel.json index 63c5d8cf9..9fd029518 100755 --- a/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-base-rhel.json +++ b/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-base-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-base", "creationTimestamp": null diff --git a/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-maven-rhel.json b/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-maven-rhel.json index 205d1f29a..6001705b3 100755 --- a/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-maven-rhel.json +++ b/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-maven-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-maven", "creationTimestamp": null, diff --git a/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json b/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json index 5122df528..77a0cb014 100755 --- a/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json +++ b/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-nodejs", "creationTimestamp": null, diff --git a/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-rhel.json b/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-rhel.json index c33eea6dd..e131286b8 100755 --- a/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-rhel.json +++ b/assets/operator/ocp-ppc64le/jenkins/imagestreams/jenkins-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins", "creationTimestamp": null, diff --git a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral-monitored.json b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral-monitored.json index e41ac805f..d14157583 100755 --- a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral-monitored.json +++ b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -356,6 +356,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral.json b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral.json index 7ed8adf1b..b04448e8e 100755 --- a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -324,6 +324,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent-monitored.json b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent-monitored.json index 0da638332..a995d54dd 100755 --- a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent-monitored.json +++ b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via Prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -390,6 +390,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent.json b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent.json index ab747d40a..d2a17d748 100755 --- a/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/ocp-ppc64le/jenkins/templates/jenkins-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -358,6 +358,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json b/assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json index 09e5ef6d1..2e8909b57 100755 --- a/assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json +++ b/assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mariadb", "creationTimestamp": null, diff --git a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json index b3cc99ff1..411af8bb4 100755 --- a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-ephemeral", "creationTimestamp": null, @@ -58,7 +58,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json index 9af30abbe..856a37b6c 100755 --- a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/mysql/imagestreams/mysql-rhel.json b/assets/operator/ocp-ppc64le/mysql/imagestreams/mysql-rhel.json index 14ceb6a0f..11181fbea 100755 --- a/assets/operator/ocp-ppc64le/mysql/imagestreams/mysql-rhel.json +++ b/assets/operator/ocp-ppc64le/mysql/imagestreams/mysql-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mysql", "creationTimestamp": null, diff --git a/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json index e6fceb378..3ef5f630d 100755 --- a/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-ephemeral", "creationTimestamp": null, @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json b/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json index 6e36f9871..61d5eaf1b 100755 --- a/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json b/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json index 8e161e6c1..6dd541818 100755 --- a/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json +++ b/assets/operator/ocp-ppc64le/nginx/imagestreams/nginx-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nginx", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.18-ubi8" + "name": "1.20-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "1.18-ubi8", + "name": "1.20-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-118:latest" + "name": "registry.redhat.io/ubi8/nginx-120:latest" }, "generation": null, "importPolicy": {}, @@ -57,20 +57,20 @@ } }, { - "name": "1.18-ubi7", + "name": "1.20-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nginx-118:latest" + "name": "registry.redhat.io/ubi7/nginx-120:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +79,20 @@ } }, { - "name": "1.16-el8", + "name": "1.18-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (RHEL 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/nginx-116:latest" + "name": "registry.redhat.io/ubi8/nginx-118:latest" }, "generation": null, "importPolicy": {}, @@ -101,42 +101,20 @@ } }, { - "name": "1.16-el7", + "name": "1.18-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (RHEL 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nginx-116-rhel7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "1.16", - "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", - "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx,hidden", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nginx-116-rhel7:latest" + "name": "registry.redhat.io/ubi7/nginx-118:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json b/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json index 9586e7adf..ad203770f 100755 --- a/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "nginx-example", "creationTimestamp": null, @@ -40,7 +40,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -57,7 +57,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -124,7 +124,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16-el8 by default).", - "value": "1.16-el8", + "description": "Version of NGINX image to be used (1.20-el8 by default).", + "value": "1.20-el8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json index f212ede43..7c36c7f1c 100755 --- a/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nodejs", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", + "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", "iconClass": "icon-nodejs", "openshift.io/display-name": "Node.js (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "14-ubi8" + "name": "16-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,19 +35,19 @@ } }, { - "name": "14-ubi8", + "name": "16-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14:latest" + "name": "registry.redhat.io/ubi8/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -56,19 +56,19 @@ } }, { - "name": "14-ubi8-minimal", + "name": "16-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" + "name": "registry.redhat.io/ubi8/nodejs-16-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +77,19 @@ } }, { - "name": "14-ubi7", + "name": "14-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 7)", + "openshift.io/display-name": "Node.js 14 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs,hidden", + "tags": "builder,nodejs", "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nodejs-14:latest" + "name": "registry.redhat.io/ubi8/nodejs-14:latest" }, "generation": null, "importPolicy": {}, @@ -98,40 +98,19 @@ } }, { - "name": "12-ubi8", + "name": "14-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 8)", + "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "12" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-12:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "12-ubi7", - "annotations": { - "description": "Build and run Node.js 12 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs,hidden", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nodejs-12:latest" + "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -140,19 +119,19 @@ } }, { - "name": "12", + "name": "14-ubi7", "annotations": { - "description": "Build and run Node.js 12 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12", + "openshift.io/display-name": "Node.js 14 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs,hidden", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nodejs-12-rhel7:latest" + "name": "registry.redhat.io/ubi7/nodejs-14:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/nodejs/templates/nodejs-postgresql-example.json b/assets/operator/ocp-ppc64le/nodejs/templates/nodejs-postgresql-example.json index 03caa5562..57ff1338d 100755 --- a/assets/operator/ocp-ppc64le/nodejs/templates/nodejs-postgresql-example.json +++ b/assets/operator/ocp-ppc64le/nodejs/templates/nodejs-postgresql-example.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/nodejs/templates/nodejs-postgresql-persistent.json b/assets/operator/ocp-ppc64le/nodejs/templates/nodejs-postgresql-persistent.json index c21a5254b..5c625dee3 100755 --- a/assets/operator/ocp-ppc64le/nodejs/templates/nodejs-postgresql-persistent.json +++ b/assets/operator/ocp-ppc64le/nodejs/templates/nodejs-postgresql-persistent.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/perl/imagestreams/perl-rhel.json b/assets/operator/ocp-ppc64le/perl/imagestreams/perl-rhel.json index e4fd38d2e..2ce2e295f 100755 --- a/assets/operator/ocp-ppc64le/perl/imagestreams/perl-rhel.json +++ b/assets/operator/ocp-ppc64le/perl/imagestreams/perl-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "perl", "creationTimestamp": null, diff --git a/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json b/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json index d45a515ca..8d89200be 100755 --- a/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "php", "creationTimestamp": null, @@ -56,28 +56,6 @@ "type": "Local" } }, - { - "name": "7.3-ubi8", - "annotations": { - "description": "Build and run PHP 7.3 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.", - "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", - "tags": "builder,php", - "version": "7.3" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-73:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "7.3-ubi7", "annotations": { diff --git a/assets/operator/ocp-ppc64le/postgresql/imagestreams/postgresql-rhel.json b/assets/operator/ocp-ppc64le/postgresql/imagestreams/postgresql-rhel.json index 3d1c15733..570b11ee0 100755 --- a/assets/operator/ocp-ppc64le/postgresql/imagestreams/postgresql-rhel.json +++ b/assets/operator/ocp-ppc64le/postgresql/imagestreams/postgresql-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "postgresql", "creationTimestamp": null, @@ -52,6 +52,26 @@ "type": "Local" } }, + { + "name": "13-el7", + "annotations": { + "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "iconClass": "icon-postgresql", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,postgresql", + "version": "13" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "12-el8", "annotations": { @@ -191,26 +211,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "9.6-el8", - "annotations": { - "description": "Provides a PostgreSQL 9.6 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 9.6 (RHEL 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql", - "version": "9.6" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-96:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }, diff --git a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json index b61755011..1a7d47325 100755 --- a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-ephemeral", "creationTimestamp": null, @@ -64,7 +64,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json index e3f752ca1..623bc36dd 100755 --- a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-persistent", "creationTimestamp": null, @@ -81,7 +81,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/python/imagestreams/python-rhel.json b/assets/operator/ocp-ppc64le/python/imagestreams/python-rhel.json index 57b9036c4..390b4d49d 100755 --- a/assets/operator/ocp-ppc64le/python/imagestreams/python-rhel.json +++ b/assets/operator/ocp-ppc64le/python/imagestreams/python-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "python", "creationTimestamp": null, diff --git a/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json index e03d3a6c1..6408ab5bc 100755 --- a/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-pgsql-persistent", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -341,7 +341,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json b/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json index 9d4366f7f..a6aa97190 100755 --- a/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-postgresql-example", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -324,7 +324,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-ppc64le/redis/imagestreams/redis-rhel.json b/assets/operator/ocp-ppc64le/redis/imagestreams/redis-rhel.json index 1d5654e0c..0d1901baf 100755 --- a/assets/operator/ocp-ppc64le/redis/imagestreams/redis-rhel.json +++ b/assets/operator/ocp-ppc64le/redis/imagestreams/redis-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "redis", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Provides a Redis database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Redis available on OpenShift, including major version updates.", + "description": "Provides a Redis database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Redis available on OpenShift, including major version updates.", "iconClass": "icon-redis", "openshift.io/display-name": "Redis (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -24,7 +24,47 @@ }, "from": { "kind": "ImageStreamTag", - "name": "5-el8" + "name": "6-el8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6-el8", + "annotations": { + "description": "Provides a Redis 6 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.", + "iconClass": "icon-redis", + "openshift.io/display-name": "Redis 6 (RHEL 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "redis", + "version": "6" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhel8/redis-6:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6-el7", + "annotations": { + "description": "Provides a Redis 6 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.", + "iconClass": "icon-redis", + "openshift.io/display-name": "Redis 6 (RHEL 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "redis", + "version": "6" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhscl/redis-6-rhel7:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json b/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json index e9af758bd..104f1f03c 100755 --- a/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-ephemeral", "creationTimestamp": null, @@ -60,7 +60,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json b/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json index 68ee70a6c..d1f4ed9d6 100755 --- a/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-persistent", "creationTimestamp": null, @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/ocp-ppc64le/ruby/imagestreams/ruby-rhel.json b/assets/operator/ocp-ppc64le/ruby/imagestreams/ruby-rhel.json index aa1bcfd00..ed2eb1c22 100755 --- a/assets/operator/ocp-ppc64le/ruby/imagestreams/ruby-rhel.json +++ b/assets/operator/ocp-ppc64le/ruby/imagestreams/ruby-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ruby", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/2.7/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", + "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/3.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", "iconClass": "icon-ruby", "openshift.io/display-name": "Ruby (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "2.7-ubi8" + "name": "3.0-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "2.7-ubi8", + "name": "3.0-ubi8", "annotations": { - "description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.", + "description": "Build and run Ruby 3.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Ruby 2.7 (UBI 8)", + "openshift.io/display-name": "Ruby 3.0 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/ruby-ex.git", - "supports": "ruby:2.7,ruby", + "supports": "ruby:3.0,ruby", "tags": "builder,ruby", - "version": "2.7" + "version": "3.0" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/ruby-27:latest" + "name": "registry.redhat.io/ubi8/ruby-30:latest" }, "generation": null, "importPolicy": {}, @@ -78,6 +78,28 @@ "type": "Local" } }, + { + "name": "2.7-ubi8", + "annotations": { + "description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.", + "iconClass": "icon-ruby", + "openshift.io/display-name": "Ruby 2.7 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/ruby-ex.git", + "supports": "ruby:2.7,ruby", + "tags": "builder,ruby", + "version": "2.7" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/ruby-27:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "2.7-ubi7", "annotations": { diff --git a/assets/operator/ocp-ppc64le/sso/imagestreams/sso74-openj9-openshift-rhel8.json b/assets/operator/ocp-ppc64le/sso/imagestreams/sso74-openj9-openshift-rhel8.json index 8a5e10352..e0759ad66 100755 --- a/assets/operator/ocp-ppc64le/sso/imagestreams/sso74-openj9-openshift-rhel8.json +++ b/assets/operator/ocp-ppc64le/sso/imagestreams/sso74-openj9-openshift-rhel8.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "sso74-openj9-openshift-rhel8", "creationTimestamp": null, @@ -8,7 +8,7 @@ "description": "Red Hat Single Sign-On 7.4 on OpenJ9", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9", "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "spec": { diff --git a/assets/operator/ocp-ppc64le/sso/imagestreams/sso75-openj9-openshift-rhel8.json b/assets/operator/ocp-ppc64le/sso/imagestreams/sso75-openj9-openshift-rhel8.json new file mode 100755 index 000000000..d19e103f1 --- /dev/null +++ b/assets/operator/ocp-ppc64le/sso/imagestreams/sso75-openj9-openshift-rhel8.json @@ -0,0 +1,57 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-openshift-rhel8", + "creationTimestamp": null, + "annotations": { + "description": "Red Hat Single Sign-On 7.5 on OpenJ9", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "7.5.0.GA" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "ImageStreamTag", + "name": "7.5" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "" + } + }, + { + "name": "7.5", + "annotations": { + "description": "Red Hat Single Sign-On 7.5 on OpenJ9 image", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9", + "supports": "sso:7.5", + "tags": "sso,keycloak,redhat,hidden", + "version": "1.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rh-sso-7/sso75-openj9-openshift-rhel8:7.5" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-https.json b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-https.json index dce44eb7a..fd4fdbe6f 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-https.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-https.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-https", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 (Ephemeral with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -93,7 +93,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -113,7 +113,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -136,7 +136,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -539,7 +539,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-ocp4-x509-https.json b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-ocp4-x509-https.json index 073bb4c82..20f1d3d4f 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-ocp4-x509-https.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-ocp4-x509-https.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-ocp4-x509-https", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, securing RH-SSO communication using re-encrypt TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", @@ -85,7 +85,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -107,7 +107,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -387,7 +387,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-ocp4-x509-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-ocp4-x509-postgresql-persistent.json b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-ocp4-x509-postgresql-persistent.json index 8d4c014b7..660a98865 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-ocp4-x509-postgresql-persistent.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-ocp4-x509-postgresql-persistent.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-ocp4-x509-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -132,7 +132,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -354,7 +354,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -635,7 +635,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-postgresql-persistent.json b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-postgresql-persistent.json index 838789ce3..729834de8 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-postgresql-persistent.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-postgresql-persistent.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 + PostgreSQL (Persistent with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -119,7 +119,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -162,7 +162,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -432,7 +432,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -788,7 +788,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-postgresql.json b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-postgresql.json index c3a4e5b1d..02844e87e 100755 --- a/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-postgresql.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso74-openj9-postgresql.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-postgresql", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 + PostgreSQL (Ephemeral with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -122,7 +122,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -143,7 +143,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -167,7 +167,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -439,7 +439,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -766,7 +766,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-postgresql" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap/templates/eap73-https-s2i.json b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-https.json similarity index 52% rename from assets/operator/ocp-x86_64/eap/templates/eap73-https-s2i.json rename to assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-https.json index 222ee2dfd..2d49622e2 100755 --- a/assets/operator/ocp-x86_64/eap/templates/eap73-https-s2i.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-https.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "eap73-https-s2i", + "name": "sso75-openj9-https", "creationTimestamp": null, "annotations": { - "description": "An example JBoss Enterprise Application Platform application configured with secure communication using HTTPS. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/7.3.x/README.adoc", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP 7.3 (OpenJDK 8) with passthrough TLS", + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 (Ephemeral with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "eap,javaee,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", - "template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform application, including a build configuration, application deployment configuration and secure communication using passthrough TLS.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.3" + "version": "7.5.0.GA" } }, - "message": "A new JBoss EAP based application with SSL support has been created in your project. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.", + "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", "objects": [ { "apiVersion": "v1", @@ -87,14 +87,13 @@ "port": 8888 } ], - "publishNotReadyAddresses": true, "selector": { "deploymentConfig": "${APPLICATION_NAME}" } } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -107,13 +106,14 @@ "name": "${APPLICATION_NAME}" }, "spec": { + "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" } } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -136,168 +136,7 @@ } }, { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "MAVEN_ARGS_APPEND", - "value": "${MAVEN_ARGS_APPEND}" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "value": "${GALLEON_PROVISION_LAYERS}" - }, - { - "name": "GALLEON_PROVISION_DEFAULT_FAT_SERVER", - "value": "true" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "${EAP_IMAGE_NAME}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "incremental": true - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "dockerfile": "FROM ${EAP_RUNTIME_IMAGE_NAME}\nCOPY /server $JBOSS_HOME\nUSER root\nRUN chown -R jboss:root $JBOSS_HOME \u0026\u0026 chmod -R ug+rwX $JBOSS_HOME\nUSER jboss\nCMD $JBOSS_HOME/bin/openshift-launch.sh", - "images": [ - { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - }, - "paths": [ - { - "destinationDir": ".", - "sourcePath": "/s2i-output/server/" - } - ] - } - ] - }, - "strategy": { - "dockerStrategy": { - "from": { - "kind": "ImageStreamTag", - "name": "${EAP_RUNTIME_IMAGE_NAME}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "imageOptimizationPolicy": "SkipLayers" - }, - "type": "Docker" - }, - "triggers": [ - { - "imageChange": { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -325,9 +164,25 @@ "containers": [ { "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, { "name": "JGROUPS_PING_PROTOCOL", - "value": "dns.DNS_PING" + "value": "openshift.DNS_PING" }, { "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", @@ -357,18 +212,6 @@ "name": "HTTPS_PASSWORD", "value": "${HTTPS_PASSWORD}" }, - { - "name": "MQ_CLUSTER_PASSWORD", - "value": "${MQ_CLUSTER_PASSWORD}" - }, - { - "name": "MQ_QUEUES", - "value": "${MQ_QUEUES}" - }, - { - "name": "MQ_TOPICS", - "value": "${MQ_TOPICS}" - }, { "name": "JGROUPS_ENCRYPT_SECRET", "value": "${JGROUPS_ENCRYPT_SECRET}" @@ -394,12 +237,36 @@ "value": "${JGROUPS_CLUSTER_PASSWORD}" }, { - "name": "AUTO_DEPLOY_EXPLODED", - "value": "${AUTO_DEPLOY_EXPLODED}" + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" }, { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "value": "${ENABLE_GENERATE_DEFAULT_DATASOURCE}" + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" } ], "image": "${APPLICATION_NAME}", @@ -444,8 +311,7 @@ "-c", "/opt/eap/bin/readinessProbe.sh" ] - }, - "initialDelaySeconds": 10 + } }, "resources": { "limits": { @@ -462,6 +328,11 @@ "mountPath": "/etc/jgroups-encrypt-secret-volume", "name": "eap-jgroups-keystore-volume", "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true } ] } @@ -479,6 +350,12 @@ "secret": { "secretName": "${JGROUPS_ENCRYPT_SECRET}" } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } } ] } @@ -492,7 +369,8 @@ ], "from": { "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, "type": "ImageChange" @@ -509,74 +387,29 @@ "name": "APPLICATION_NAME", "displayName": "Application Name", "description": "The name for the application.", - "value": "eap-app", - "required": true - }, - { - "name": "EAP_IMAGE_NAME", - "displayName": "EAP Image Name", - "description": "Name of the EAP image to use, example: jboss-eap73-openshift:7.3", - "value": "jboss-eap73-openshift:7.3", + "value": "sso", "required": true }, { - "name": "EAP_RUNTIME_IMAGE_NAME", - "displayName": "EAP Runtime Image Name", - "description": "Name of the EAP image to use, example: jboss-eap73-runtime-openshift:7.3", - "value": "jboss-eap73-runtime-openshift:7.3", - "required": true + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" }, { "name": "HOSTNAME_HTTPS", "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "7.3.x-openshift" + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" }, { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "kitchensink" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "displayName": "Galleon layers", - "description": "Comma separated list of Galleon layers to provision a server." - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "displayName": "Enable ExampleDS datasource", - "description": "Enable ExampleDS datasource.", - "value": "false" - }, - { - "name": "MQ_QUEUES", - "displayName": "Queues", - "description": "Queue names, separated by commas. These queues will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all queues used by the application *must* be specified here in order to be created automatically on the remote AMQ broker." - }, - { - "name": "MQ_TOPICS", - "displayName": "Topics", - "description": "Topic names, separated by commas. These topics will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all topics used by the application *must* be specified here in order to be created automatically on the remote AMQ broker." + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." }, { "name": "HTTPS_SECRET", "displayName": "Server Keystore Secret Name", "description": "The name of the secret containing the keystore file", - "value": "eap7-app-secret", - "required": true + "value": "sso-app-secret" }, { "name": "HTTPS_KEYSTORE", @@ -592,49 +425,33 @@ { "name": "HTTPS_NAME", "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate" + "description": "The name associated with the server certificate (e.g. jboss)" }, { "name": "HTTPS_PASSWORD", "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate" + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" }, { - "name": "MQ_CLUSTER_PASSWORD", - "displayName": "AMQ cluster password", - "description": "AMQ cluster admin password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." }, { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." }, { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." }, { "name": "JGROUPS_ENCRYPT_SECRET", "displayName": "JGroups Secret Name", "description": "The name of the secret containing the keystore file", - "value": "eap7-app-secret" + "value": "sso-app-secret" }, { "name": "JGROUPS_ENCRYPT_KEYSTORE", @@ -645,12 +462,12 @@ { "name": "JGROUPS_ENCRYPT_NAME", "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate" + "description": "The name associated with the server certificate (e.g. secret-key)" }, { "name": "JGROUPS_ENCRYPT_PASSWORD", "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate" + "description": "The password for the keystore and certificate (e.g. password)" }, { "name": "JGROUPS_CLUSTER_PASSWORD", @@ -661,34 +478,68 @@ "required": true }, { - "name": "AUTO_DEPLOY_EXPLODED", - "displayName": "Deploy Exploded Archives", - "description": "Controls whether exploded deployment content should be automatically deployed", - "value": "false" + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." }, { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" }, { - "name": "MAVEN_ARGS_APPEND", - "displayName": "Maven Additional Arguments", - "description": "Maven additional arguments to use for S2I builds", - "value": "-Dcom.redhat.xpaas.repo.jbossorg" + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" }, { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" }, { "name": "MEMORY_LIMIT", - "description": "Container memory limit", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", "value": "1Gi" } ], "labels": { - "template": "eap73-https-s2i", - "xpaas": "7.3" + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-ocp4-x509-https.json b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-ocp4-x509-https.json new file mode 100755 index 000000000..0197bbf2b --- /dev/null +++ b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-ocp4-x509-https.json @@ -0,0 +1,393 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-ocp4-x509-https", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 (Ephemeral)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, securing RH-SSO communication using re-encrypt TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", + "objects": [ + { + "apiVersion": "v1", + "kind": "ConfigMap", + "metadata": { + "annotations": { + "description": "ConfigMap providing service ca bundle.", + "service.beta.openshift.io/inject-cabundle": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-service-ca" + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-https-secret" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "tls": { + "termination": "reencrypt" + }, + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "X509_CA_BUNDLE", + "value": "/var/run/configmaps/service-ca/service-ca.crt /var/run/secrets/kubernetes.io/serviceaccount/ca.crt" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/x509/https", + "name": "sso-x509-https-volume", + "readOnly": true + }, + { + "mountPath": "/etc/x509/jgroups", + "name": "sso-x509-jgroups-volume", + "readOnly": true + }, + { + "mountPath": "/var/run/configmaps/service-ca", + "name": "service-ca", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "sso-x509-https-volume", + "secret": { + "secretName": "sso-x509-https-secret" + } + }, + { + "name": "sso-x509-jgroups-volume", + "secret": { + "secretName": "sso-x509-jgroups-secret" + } + }, + { + "configMap": { + "name": "${APPLICATION_NAME}-service-ca" + }, + "name": "service-ca" + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "The password for the JGroups cluster.", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", + "required": true + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server admininistrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-ocp4-x509-https" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-postgresql-persistent-s2i.json b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-ocp4-x509-postgresql-persistent.json similarity index 59% rename from assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-postgresql-persistent-s2i.json rename to assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-ocp4-x509-postgresql-persistent.json index 562d90214..d145b502f 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-postgresql-persistent-s2i.json +++ b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-ocp4-x509-postgresql-persistent.json @@ -1,43 +1,35 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws31-tomcat8-postgresql-persistent-s2i", + "name": "sso75-openj9-ocp4-x509-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "Application template for JWS PostgreSQL applications with persistent storage built using S2I.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + PostgreSQL (with https)", + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat8,java,jboss", - "version": "1.4" + "tags": "sso,keycloak,jboss", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" } }, - "message": "A new persistent JWS application for Apache Tomcat 8 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", "objects": [ { "apiVersion": "v1", - "kind": "Service", + "kind": "ConfigMap", "metadata": { "annotations": { - "description": "The web server's http port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + "description": "ConfigMap providing service ca bundle.", + "service.beta.openshift.io/inject-cabundle": "true" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } + "name": "${APPLICATION_NAME}-service-ca" } }, { @@ -46,12 +38,13 @@ "metadata": { "annotations": { "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-https-secret" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" }, "spec": { "ports": [ @@ -91,26 +84,33 @@ }, { "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", + "kind": "Service", "metadata": { "annotations": { - "description": "Route for application's http service." + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}-ping" }, "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" } } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -120,98 +120,19 @@ "labels": { "application": "${APPLICATION_NAME}" }, - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" }, "spec": { - "host": "${HOSTNAME_HTTPS}", "tls": { - "termination": "passthrough" + "termination": "reencrypt" }, "to": { - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" } } }, { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver31-tomcat8-openshift:1.4", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -239,6 +160,10 @@ "containers": [ { "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, { "name": "DB_SERVICE_PREFIX_MAPPING", "value": "${APPLICATION_NAME}-postgresql=DB" @@ -259,6 +184,10 @@ "name": "DB_DATABASE", "value": "${DB_DATABASE}" }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, { "name": "DB_MIN_POOL_SIZE", "value": "${DB_MIN_POOL_SIZE}" @@ -272,32 +201,58 @@ "value": "${DB_TX_ISOLATION}" }, { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" }, { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" }, { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" + "name": "X509_CA_BUNDLE", + "value": "/var/run/configmaps/service-ca/service-ca.crt /var/run/secrets/kubernetes.io/serviceaccount/ca.crt" }, { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" }, { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" }, { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" } ], "image": "${APPLICATION_NAME}", "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, "name": "${APPLICATION_NAME}", "ports": [ { @@ -314,6 +269,11 @@ "containerPort": 8443, "name": "https", "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" } ], "readinessProbe": { @@ -321,26 +281,53 @@ "command": [ "/bin/bash", "-c", - "curl --noproxy '*' -s -u ${JWS_ADMIN_USERNAME}:${JWS_ADMIN_PASSWORD} 'http://localhost:8080/manager/jmxproxy/?get=Catalina%3Atype%3DServer\u0026att=stateName' |grep -iq 'stateName *= *STARTED'" + "/opt/eap/bin/readinessProbe.sh" ] } }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, "volumeMounts": [ { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", + "mountPath": "/etc/x509/https", + "name": "sso-x509-https-volume", + "readOnly": true + }, + { + "mountPath": "/etc/x509/jgroups", + "name": "sso-x509-jgroups-volume", + "readOnly": true + }, + { + "mountPath": "/var/run/configmaps/service-ca", + "name": "service-ca", "readOnly": true } ] } ], - "terminationGracePeriodSeconds": 60, + "terminationGracePeriodSeconds": 75, "volumes": [ { - "name": "jws-certificate-volume", + "name": "sso-x509-https-volume", + "secret": { + "secretName": "sso-x509-https-secret" + } + }, + { + "name": "sso-x509-jgroups-volume", "secret": { - "secretName": "${JWS_HTTPS_SECRET}" + "secretName": "sso-x509-jgroups-secret" } + }, + { + "configMap": { + "name": "${APPLICATION_NAME}-service-ca" + }, + "name": "service-ca" } ] } @@ -354,7 +341,8 @@ ], "from": { "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, "type": "ImageChange" @@ -366,7 +354,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -420,12 +408,15 @@ } ], "image": "postgresql", + "imagePullPolicy": "Always", "livenessProbe": { - "initialDelaySeconds": 30, + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, "tcpSocket": { "port": 5432 }, - "timeoutSeconds": 1 + "timeoutSeconds": 10 }, "name": "${APPLICATION_NAME}-postgresql", "ports": [ @@ -443,8 +434,10 @@ "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" ] }, - "initialDelaySeconds": 5, - "timeoutSeconds": 1 + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "timeoutSeconds": 10 }, "volumeMounts": [ { @@ -512,43 +505,27 @@ "name": "APPLICATION_NAME", "displayName": "Application Name", "description": "The name for the application.", - "value": "jws-app", + "value": "sso", "required": true }, { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." }, { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "The password for the JGroups cluster.", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", "required": true }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "todolist/todolist-jdbc" - }, { "name": "DB_JNDI", "displayName": "Database JNDI Name", - "description": "Database JNDI name used by application to resolve the datasource, e.g. jboss/datasources/postgresqlDS", - "value": "jboss/datasources/defaultDS" + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" }, { "name": "DB_DATABASE", @@ -557,37 +534,6 @@ "value": "root", "required": true }, - { - "name": "VOLUME_CAPACITY", - "displayName": "Database Volume Capacity", - "description": "Size of persistent storage for database volume.", - "value": "1Gi", - "required": true - }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, { "name": "DB_MIN_POOL_SIZE", "displayName": "Datasource Minimum Pool Size", @@ -626,67 +572,70 @@ "displayName": "Database Password", "description": "Database user password", "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "from": "[a-zA-Z0-9]{32}", "required": true }, { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "name": "VOLUME_CAPACITY", + "displayName": "Database Volume Capacity", + "description": "Size of persistent storage for database volume.", + "value": "1Gi", "required": true }, { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", "required": true }, { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", "generate": "expression", "from": "[a-zA-Z0-9]{8}", "required": true }, { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "from": "[a-zA-Z0-9]{32}", "required": true }, { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." }, { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." }, { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." }, { "name": "POSTGRESQL_IMAGE_STREAM_TAG", "displayName": "PostgreSQL Image Stream Tag", "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", - "value": "9.5", + "value": "10", "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" } ], "labels": { - "jws31": "1.4", - "template": "jws31-tomcat8-postgresql-persistent-s2i" + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-postgresql-persistent.json b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-postgresql-persistent.json new file mode 100755 index 000000000..ae68a8786 --- /dev/null +++ b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-postgresql-persistent.json @@ -0,0 +1,794 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-postgresql-persistent", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 + PostgreSQL (Persistent with passthrough TLS)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", + "objects": [ + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's http port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The database server's port." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "ports": [ + { + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-http", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's http service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTP}", + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTPS}", + "tls": { + "termination": "passthrough" + }, + "to": { + "name": "secure-${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_SERVICE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_JNDI", + "value": "${DB_JNDI}" + }, + { + "name": "DB_USERNAME", + "value": "${DB_USERNAME}" + }, + { + "name": "DB_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "DB_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "HTTPS_KEYSTORE_DIR", + "value": "/etc/eap-secret-volume" + }, + { + "name": "HTTPS_KEYSTORE", + "value": "${HTTPS_KEYSTORE}" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "value": "${HTTPS_KEYSTORE_TYPE}" + }, + { + "name": "HTTPS_NAME", + "value": "${HTTPS_NAME}" + }, + { + "name": "HTTPS_PASSWORD", + "value": "${HTTPS_PASSWORD}" + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "value": "${JGROUPS_ENCRYPT_SECRET}" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", + "value": "/etc/jgroups-encrypt-secret-volume" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "value": "${JGROUPS_ENCRYPT_KEYSTORE}" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "value": "${JGROUPS_ENCRYPT_NAME}" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "value": "${JGROUPS_ENCRYPT_PASSWORD}" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/eap-secret-volume", + "name": "eap-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/jgroups-encrypt-secret-volume", + "name": "eap-jgroups-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "eap-keystore-volume", + "secret": { + "secretName": "${HTTPS_SECRET}" + } + }, + { + "name": "eap-jgroups-keystore-volume", + "secret": { + "secretName": "${JGROUPS_ENCRYPT_SECRET}" + } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "POSTGRESQL_USER", + "value": "${DB_USERNAME}" + }, + { + "name": "POSTGRESQL_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + } + ], + "image": "postgresql", + "imagePullPolicy": "Always", + "livenessProbe": { + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "tcpSocket": { + "port": 5432 + }, + "timeoutSeconds": 10 + }, + "name": "${APPLICATION_NAME}-postgresql", + "ports": [ + { + "containerPort": 5432, + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/sh", + "-i", + "-c", + "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" + ] + }, + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "timeoutSeconds": 10 + }, + "volumeMounts": [ + { + "mountPath": "/var/lib/pgsql/data", + "name": "${APPLICATION_NAME}-postgresql-pvol" + } + ] + } + ], + "terminationGracePeriodSeconds": 60, + "volumes": [ + { + "name": "${APPLICATION_NAME}-postgresql-pvol", + "persistentVolumeClaim": { + "claimName": "${APPLICATION_NAME}-postgresql-claim" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}-postgresql" + ], + "from": { + "kind": "ImageStreamTag", + "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "v1", + "kind": "PersistentVolumeClaim", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql-claim" + }, + "spec": { + "accessModes": [ + "ReadWriteOnce" + ], + "resources": { + "requests": { + "storage": "${VOLUME_CAPACITY}" + } + } + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "HOSTNAME_HTTPS", + "displayName": "Custom https Route Hostname", + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "DB_JNDI", + "displayName": "Database JNDI Name", + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" + }, + { + "name": "DB_DATABASE", + "displayName": "Database Name", + "description": "Database name", + "value": "root", + "required": true + }, + { + "name": "HTTPS_SECRET", + "displayName": "Server Keystore Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "HTTPS_KEYSTORE", + "displayName": "Server Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "keystore.jks" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "displayName": "Server Keystore Type", + "description": "The type of the keystore file (JKS or JCEKS)" + }, + { + "name": "HTTPS_NAME", + "displayName": "Server Certificate Name", + "description": "The name associated with the server certificate (e.g. jboss)" + }, + { + "name": "HTTPS_PASSWORD", + "displayName": "Server Keystore Password", + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "displayName": "PostgreSQL Maximum number of connections", + "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions." + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "displayName": "PostgreSQL Shared Buffers", + "description": "Configures how much memory is dedicated to PostgreSQL for caching data." + }, + { + "name": "DB_USERNAME", + "displayName": "Database Username", + "description": "Database user name", + "generate": "expression", + "from": "user[a-zA-Z0-9]{3}", + "required": true + }, + { + "name": "DB_PASSWORD", + "displayName": "Database Password", + "description": "Database user password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "VOLUME_CAPACITY", + "displayName": "Database Volume Capacity", + "description": "Size of persistent storage for database volume.", + "value": "1Gi", + "required": true + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "displayName": "JGroups Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "displayName": "JGroups Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "jgroups.jceks" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "displayName": "JGroups Certificate Name", + "description": "The name associated with the server certificate (e.g. secret-key)" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "displayName": "JGroups Keystore Password", + "description": "The password for the keystore and certificate (e.g. password)" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "JGroups cluster password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" + }, + { + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" + }, + { + "name": "POSTGRESQL_IMAGE_STREAM_TAG", + "displayName": "PostgreSQL Image Stream Tag", + "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", + "value": "10", + "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-postgresql-persistent" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-postgresql.json b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-postgresql.json new file mode 100755 index 000000000..eaf111fb3 --- /dev/null +++ b/assets/operator/ocp-ppc64le/sso/templates/sso75-openj9-postgresql.json @@ -0,0 +1,772 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-postgresql", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 + PostgreSQL (Ephemeral with passthrough TLS)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", + "objects": [ + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's http port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The database server's port." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "ports": [ + { + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-http", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's http service." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTP}", + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTPS}", + "tls": { + "termination": "passthrough" + }, + "to": { + "name": "secure-${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_SERVICE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_JNDI", + "value": "${DB_JNDI}" + }, + { + "name": "DB_USERNAME", + "value": "${DB_USERNAME}" + }, + { + "name": "DB_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "DB_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "HTTPS_KEYSTORE_DIR", + "value": "/etc/eap-secret-volume" + }, + { + "name": "HTTPS_KEYSTORE", + "value": "${HTTPS_KEYSTORE}" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "value": "${HTTPS_KEYSTORE_TYPE}" + }, + { + "name": "HTTPS_NAME", + "value": "${HTTPS_NAME}" + }, + { + "name": "HTTPS_PASSWORD", + "value": "${HTTPS_PASSWORD}" + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "value": "${JGROUPS_ENCRYPT_SECRET}" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", + "value": "/etc/jgroups-encrypt-secret-volume" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "value": "${JGROUPS_ENCRYPT_KEYSTORE}" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "value": "${JGROUPS_ENCRYPT_NAME}" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "value": "${JGROUPS_ENCRYPT_PASSWORD}" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/eap-secret-volume", + "name": "eap-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/jgroups-encrypt-secret-volume", + "name": "eap-jgroups-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "eap-keystore-volume", + "secret": { + "secretName": "${HTTPS_SECRET}" + } + }, + { + "name": "eap-jgroups-keystore-volume", + "secret": { + "secretName": "${JGROUPS_ENCRYPT_SECRET}" + } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database", + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "POSTGRESQL_USER", + "value": "${DB_USERNAME}" + }, + { + "name": "POSTGRESQL_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + } + ], + "image": "postgresql", + "imagePullPolicy": "Always", + "livenessProbe": { + "initialDelaySeconds": 30, + "tcpSocket": { + "port": 5432 + }, + "timeoutSeconds": 1 + }, + "name": "${APPLICATION_NAME}-postgresql", + "ports": [ + { + "containerPort": 5432, + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/sh", + "-i", + "-c", + "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" + ] + }, + "initialDelaySeconds": 5, + "timeoutSeconds": 1 + }, + "volumeMounts": [ + { + "mountPath": "/var/lib/pgsql/data", + "name": "${APPLICATION_NAME}-data" + } + ] + } + ], + "terminationGracePeriodSeconds": 60, + "volumes": [ + { + "emptyDir": { + "medium": "" + }, + "name": "${APPLICATION_NAME}-data" + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}-postgresql" + ], + "from": { + "kind": "ImageStreamTag", + "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "HOSTNAME_HTTPS", + "displayName": "Custom https Route Hostname", + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "DB_JNDI", + "displayName": "Database JNDI Name", + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" + }, + { + "name": "DB_DATABASE", + "displayName": "Database Name", + "description": "Database name", + "value": "root", + "required": true + }, + { + "name": "HTTPS_SECRET", + "displayName": "Server Keystore Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "HTTPS_KEYSTORE", + "displayName": "Server Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "keystore.jks" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "displayName": "Server Keystore Type", + "description": "The type of the keystore file (JKS or JCEKS)" + }, + { + "name": "HTTPS_NAME", + "displayName": "Server Certificate Name", + "description": "The name associated with the server certificate (e.g. jboss)" + }, + { + "name": "HTTPS_PASSWORD", + "displayName": "Server Keystore Password", + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "displayName": "PostgreSQL Maximum number of connections", + "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions." + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "displayName": "PostgreSQL Shared Buffers", + "description": "Configures how much memory is dedicated to PostgreSQL for caching data." + }, + { + "name": "DB_USERNAME", + "displayName": "Database Username", + "description": "Database user name", + "generate": "expression", + "from": "user[a-zA-Z0-9]{3}", + "required": true + }, + { + "name": "DB_PASSWORD", + "displayName": "Database Password", + "description": "Database user password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "displayName": "JGroups Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "displayName": "JGroups Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "jgroups.jceks" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "displayName": "JGroups Certificate Name", + "description": "The name associated with the server certificate (e.g. secret-key)" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "displayName": "JGroups Keystore Password", + "description": "The password for the keystore and certificate (e.g. password)" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "JGroups cluster password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" + }, + { + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" + }, + { + "name": "POSTGRESQL_IMAGE_STREAM_TAG", + "displayName": "PostgreSQL Image Stream Tag", + "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", + "value": "10", + "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-postgresql" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/webserver/imagestreams/jboss-webserver54-openj9-tomcat9-openshift-ubi8.json b/assets/operator/ocp-ppc64le/webserver/imagestreams/jboss-webserver56-openj9-tomcat9-openshift-ubi8.json similarity index 63% rename from assets/operator/ocp-ppc64le/webserver/imagestreams/jboss-webserver54-openj9-tomcat9-openshift-ubi8.json rename to assets/operator/ocp-ppc64le/webserver/imagestreams/jboss-webserver56-openj9-tomcat9-openshift-ubi8.json index 0f8f56597..2cd3453fa 100755 --- a/assets/operator/ocp-ppc64le/webserver/imagestreams/jboss-webserver54-openj9-tomcat9-openshift-ubi8.json +++ b/assets/operator/ocp-ppc64le/webserver/imagestreams/jboss-webserver56-openj9-tomcat9-openshift-ubi8.json @@ -1,13 +1,13 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { - "name": "jboss-webserver54-openj9-tomcat9-openshift-ubi8", + "name": "jboss-webserver56-openj9-tomcat9-openshift-ubi8", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11", "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.0" + "version": "5.6" } }, "spec": { @@ -18,18 +18,18 @@ { "name": "latest", "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 S2I images.", + "description": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 S2I images.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8", "sampleContextDir": "tomcat-websocket-chat", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:11", + "supports": "tomcat9:5.6,tomcat:9,java:11", "tags": "builder,tomcat,tomcat9,java,jboss,hidden", "version": "latest" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openj9-11-tomcat9-openshift-rhel8:latest" + "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:latest" }, "generation": null, "importPolicy": { @@ -40,20 +40,20 @@ } }, { - "name": "1.0", + "name": "5.6.0", "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 S2I images.", + "description": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 S2I images.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8", "sampleContextDir": "tomcat-websocket-chat", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:11", + "supports": "tomcat9:5.6,tomcat:9,java:11", "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "version": "1.0" + "version": "1.2" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openj9-11-tomcat9-openshift-rhel8:1.0" + "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:5.6.0" }, "generation": null, "importPolicy": { diff --git a/assets/operator/ocp-s390x/webserver/templates/jws54-openj9-tomcat9-ubi8-basic-s2i.json b/assets/operator/ocp-ppc64le/webserver/templates/jws56-openj9-tomcat9-ubi8-basic-s2i.json similarity index 85% rename from assets/operator/ocp-s390x/webserver/templates/jws54-openj9-tomcat9-ubi8-basic-s2i.json rename to assets/operator/ocp-ppc64le/webserver/templates/jws56-openj9-tomcat9-ubi8-basic-s2i.json index 242366b6d..acac81f34 100755 --- a/assets/operator/ocp-s390x/webserver/templates/jws54-openj9-tomcat9-ubi8-basic-s2i.json +++ b/assets/operator/ocp-ppc64le/webserver/templates/jws56-openj9-tomcat9-ubi8-basic-s2i.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws54-openj9-tomcat9-ubi8-basic-s2i", + "name": "jws56-openj9-tomcat9-ubi8-basic-s2i", "creationTimestamp": null, "annotations": { "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 (no https)", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 (no https)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 based application, including a build configuration, and an application deployment configuration.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 based application, including a build configuration, and an application deployment configuration.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" + "version": "5.6" } }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}.", + "message": "A new JWS application for Apache Tomcat 9 has been created in your project.", "objects": [ { "apiVersion": "v1", @@ -43,7 +43,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -63,7 +63,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -73,7 +73,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -111,7 +111,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "jboss-webserver54-openj9-tomcat9-openshift-ubi8:1.0", + "name": "jboss-webserver56-openj9-tomcat9-openshift-ubi8:5.6.0", "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, @@ -141,7 +141,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -168,16 +168,6 @@ "spec": { "containers": [ { - "env": [ - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], "image": "${APPLICATION_NAME}", "imagePullPolicy": "Always", "name": "${APPLICATION_NAME}", @@ -260,22 +250,6 @@ "description": "Path within Git project to build; empty for root project directory.", "value": "tomcat-websocket-chat" }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "Github Webhook Secret", @@ -310,7 +284,7 @@ } ], "labels": { - "jws54openj9ubi8": "1.0", - "template": "jws54-openj9-tomcat9-ubi8-basic-s2i" + "jws56openj9ubi8": "5.6.0", + "template": "jws56-openj9-tomcat9-ubi8-basic-s2i" } } \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/webserver/templates/jws54-openj9-tomcat9-ubi8-https-s2i.json b/assets/operator/ocp-ppc64le/webserver/templates/jws56-openj9-tomcat9-ubi8-https-s2i.json similarity index 87% rename from assets/operator/ocp-ppc64le/webserver/templates/jws54-openj9-tomcat9-ubi8-https-s2i.json rename to assets/operator/ocp-ppc64le/webserver/templates/jws56-openj9-tomcat9-ubi8-https-s2i.json index e859672c3..c51198b5e 100755 --- a/assets/operator/ocp-ppc64le/webserver/templates/jws54-openj9-tomcat9-ubi8-https-s2i.json +++ b/assets/operator/ocp-ppc64le/webserver/templates/jws56-openj9-tomcat9-ubi8-https-s2i.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws54-openj9-tomcat9-ubi8-https-s2i", + "name": "jws56-openj9-tomcat9-ubi8-https-s2i", "creationTimestamp": null, "annotations": { "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 (with https)", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 (with https)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss,hidden", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 based application, including a build configuration, application deployment configuration, and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 based application, including a build configuration, application deployment configuration, and secure communication using https.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" + "version": "5.6" } }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 9 has been created in your project. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", "objects": [ { "apiVersion": "v1", @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -87,7 +87,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -120,7 +120,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -158,7 +158,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "jboss-webserver54-openj9-tomcat9-openshift-ubi8:1.0", + "name": "jboss-webserver56-openj9-tomcat9-openshift-ubi8:5.6.0", "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, @@ -188,7 +188,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -231,14 +231,6 @@ { "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" } ], "image": "${APPLICATION_NAME}", @@ -372,22 +364,6 @@ "displayName": "Certificate Password", "description": "The certificate password" }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "Github Webhook Secret", @@ -422,7 +398,7 @@ } ], "labels": { - "jws54openj9ubi8": "1.0", - "template": "jws54-openj9-tomcat9-ubi8-https-s2i" + "jws56openj9ubi8": "5.6.0", + "template": "jws56-openj9-tomcat9-ubi8-https-s2i" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json index e8fdf317e..1b96f4391 100755 --- a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-example", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -308,7 +308,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json index 7a0398aea..e1bb86859 100755 --- a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-persistent", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -325,7 +325,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json index b5244e9a4..3c5a3829f 100755 --- a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -281,7 +281,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json index 2b0cad268..f33a6637b 100755 --- a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -298,7 +298,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/ocp-s390x/django/templates/django-psql-example.json b/assets/operator/ocp-s390x/django/templates/django-psql-example.json index 51a708aa0..6359561b6 100755 --- a/assets/operator/ocp-s390x/django/templates/django-psql-example.json +++ b/assets/operator/ocp-s390x/django/templates/django-psql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/ocp-s390x/django/templates/django-psql-persistent.json b/assets/operator/ocp-s390x/django/templates/django-psql-persistent.json index 9fb7eae2a..28f2aa2ac 100755 --- a/assets/operator/ocp-s390x/django/templates/django-psql-persistent.json +++ b/assets/operator/ocp-s390x/django/templates/django-psql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/ocp-s390x/dotnet/imagestreams/dotnet-rhel-s390x.json b/assets/operator/ocp-s390x/dotnet/imagestreams/dotnet-rhel-s390x.json new file mode 100755 index 000000000..86e82042a --- /dev/null +++ b/assets/operator/ocp-s390x/dotnet/imagestreams/dotnet-rhel-s390x.json @@ -0,0 +1,89 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "dotnet", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": ".NET" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": { + "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET (Latest)", + "sampleContextDir": "app", + "sampleRef": "dotnet-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet", + "tags": "builder,.net,dotnet,dotnetcore,hidden" + }, + "from": { + "kind": "ImageStreamTag", + "name": "6.0-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0-ubi8", + "annotations": { + "description": "Build and run .NET 6 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnet-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:6.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet60", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0", + "annotations": { + "description": "Build and run .NET 6 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnetcore-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:6.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet60,hidden", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/dotnet/imagestreams/dotnet-runtime-rhel-s390x.json b/assets/operator/ocp-s390x/dotnet/imagestreams/dotnet-runtime-rhel-s390x.json new file mode 100755 index 000000000..e8ab0c944 --- /dev/null +++ b/assets/operator/ocp-s390x/dotnet/imagestreams/dotnet-runtime-rhel-s390x.json @@ -0,0 +1,80 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "dotnet-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": ".NET Core Runtime" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": { + "description": "Run .NET applications. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET Runtime (Latest)", + "supports": "dotnet-runtime", + "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden" + }, + "from": { + "kind": "ImageStreamTag", + "name": "6.0-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0-ubi8", + "annotations": { + "description": "Run .NET 6 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 Runtime (UBI 8)", + "supports": "dotnet-runtime", + "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0", + "annotations": { + "description": "Run .NET 6 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 Runtime (UBI 8)", + "supports": "dotnet-runtime", + "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/golang/imagestreams/golang-rhel.json b/assets/operator/ocp-s390x/golang/imagestreams/golang-rhel.json index 3cfd1a0f7..f8254727e 100755 --- a/assets/operator/ocp-s390x/golang/imagestreams/golang-rhel.json +++ b/assets/operator/ocp-s390x/golang/imagestreams/golang-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "golang", "creationTimestamp": null, @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.14.7-ubi8" + "name": "1.16.7-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,11 +35,11 @@ } }, { - "name": "1.14.7-ubi8", + "name": "1.16.7-ubi8", "annotations": { "description": "Build and run Go applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.14.7 (UBI 8)", + "openshift.io/display-name": "Go 1.16.7 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -47,7 +47,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/go-toolset:1.14.7" + "name": "registry.redhat.io/ubi8/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,11 @@ } }, { - "name": "1.13.4-ubi7", + "name": "1.16.7-ubi7", "annotations": { "description": "Build and run Go applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.13.4 (UBI 7)", + "openshift.io/display-name": "Go 1.16.7 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -68,7 +68,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/go-toolset:1.13.4" + "name": "registry.redhat.io/ubi7/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/httpd/imagestreams/httpd-rhel.json b/assets/operator/ocp-s390x/httpd/imagestreams/httpd-rhel.json index eab177e10..ba29caaba 100755 --- a/assets/operator/ocp-s390x/httpd/imagestreams/httpd-rhel.json +++ b/assets/operator/ocp-s390x/httpd/imagestreams/httpd-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "httpd", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/httpd/templates/httpd-example.json b/assets/operator/ocp-s390x/httpd/templates/httpd-example.json index d9d9d2197..f125e8135 100755 --- a/assets/operator/ocp-s390x/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-s390x/httpd/templates/httpd-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "httpd-example", "creationTimestamp": null, @@ -41,7 +41,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -65,7 +65,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -122,7 +122,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/java/imagestreams/java-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/java-rhel-s390x.json index 53808c10e..aa7e5adc1 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/java-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/java-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "java", "creationTimestamp": null, @@ -238,21 +238,43 @@ "type": "Local" } }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:17,java", + "tags": "builder,java,openjdk", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-17:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { "description": "Build and run Java applications using Maven.", - "iconClass": "icon-rh-openj9", + "iconClass": "icon-rh-openjdk", "openshift.io/display-name": "Java (Latest)", "sampleContextDir": "undertow-servlet", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", "supports": "java", - "tags": "builder,java,openj9", + "tags": "builder,java,openjdk", "version": "latest" }, "from": { "kind": "ImageStreamTag", - "name": "openjdk-11-ubi8" + "name": "openjdk-17-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/java/imagestreams/java-runtime-ubi.json b/assets/operator/ocp-s390x/java/imagestreams/java-runtime-ubi.json new file mode 100755 index 000000000..fd9e66c02 --- /dev/null +++ b/assets/operator/ocp-s390x/java/imagestreams/java-runtime-ubi.json @@ -0,0 +1,102 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "java-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK Runtime", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "openjdk-8-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java:8,openjdk,ubi8", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java:11,openjdk,ubi8", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java:17,openjdk,ubi8", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Java Runtime (Latest)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java", + "tags": "java,openjdk", + "version": "latest" + }, + "from": { + "kind": "ImageStreamTag", + "name": "openjdk-17-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel7-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel7-rhel-s390x.json index 6318bd7f1..8ddd19890 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel7-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel7-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "openj9-11-rhel7", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel8-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel8-rhel-s390x.json index 1f2cea87c..08fb72eda 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel8-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel8-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "openj9-11-rhel8", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel7-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel7-rhel-s390x.json index c496ba29c..d2f6500b0 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel7-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel7-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "openj9-8-rhel7", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel8-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel8-rhel-s390x.json index f248cc6eb..b6e55dcbb 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel8-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel8-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "openj9-8-rhel8", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json index 389db83b6..19197533f 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "openjdk-11-rhel7", "creationTimestamp": null, @@ -61,6 +61,28 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json index ed8365d26..41d29be0c 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "redhat-openjdk18-openshift", "creationTimestamp": null, @@ -105,6 +105,28 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json index 29d4ac860..4d6dd3b74 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ubi8-openjdk-11", "creationTimestamp": null, @@ -38,6 +38,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json new file mode 100755 index 000000000..1adfce208 --- /dev/null +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -0,0 +1,64 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-11-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json index a43f915cc..896bf3cb6 100755 --- a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ubi8-openjdk-8", "creationTimestamp": null, @@ -38,6 +38,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json new file mode 100755 index 000000000..907431810 --- /dev/null +++ b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -0,0 +1,60 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-8-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/java/templates/openjdk-web-basic-s2i.json b/assets/operator/ocp-s390x/java/templates/openjdk-web-basic-s2i.json index 26ff0aa62..719d671ca 100755 --- a/assets/operator/ocp-s390x/java/templates/openjdk-web-basic-s2i.json +++ b/assets/operator/ocp-s390x/java/templates/openjdk-web-basic-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "openjdk-web-basic-s2i", "creationTimestamp": null, @@ -47,7 +47,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -135,7 +135,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-base-rhel.json b/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-base-rhel.json index 63c5d8cf9..9fd029518 100755 --- a/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-base-rhel.json +++ b/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-base-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-base", "creationTimestamp": null diff --git a/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-maven-rhel.json b/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-maven-rhel.json index 205d1f29a..6001705b3 100755 --- a/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-maven-rhel.json +++ b/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-maven-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-maven", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json b/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json index 5122df528..77a0cb014 100755 --- a/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json +++ b/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-nodejs", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-rhel.json b/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-rhel.json index c33eea6dd..e131286b8 100755 --- a/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-rhel.json +++ b/assets/operator/ocp-s390x/jenkins/imagestreams/jenkins-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral-monitored.json b/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral-monitored.json index e41ac805f..d14157583 100755 --- a/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral-monitored.json +++ b/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -356,6 +356,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral.json b/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral.json index 7ed8adf1b..b04448e8e 100755 --- a/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/ocp-s390x/jenkins/templates/jenkins-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -324,6 +324,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent-monitored.json b/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent-monitored.json index 0da638332..a995d54dd 100755 --- a/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent-monitored.json +++ b/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via Prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -390,6 +390,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent.json b/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent.json index ab747d40a..d2a17d748 100755 --- a/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/ocp-s390x/jenkins/templates/jenkins-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -358,6 +358,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-s390x/mariadb/imagestreams/mariadb-rhel.json b/assets/operator/ocp-s390x/mariadb/imagestreams/mariadb-rhel.json index 09e5ef6d1..2e8909b57 100755 --- a/assets/operator/ocp-s390x/mariadb/imagestreams/mariadb-rhel.json +++ b/assets/operator/ocp-s390x/mariadb/imagestreams/mariadb-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mariadb", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json index b3cc99ff1..411af8bb4 100755 --- a/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-ephemeral", "creationTimestamp": null, @@ -58,7 +58,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json index 9af30abbe..856a37b6c 100755 --- a/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/mysql/imagestreams/mysql-rhel.json b/assets/operator/ocp-s390x/mysql/imagestreams/mysql-rhel.json index 14ceb6a0f..11181fbea 100755 --- a/assets/operator/ocp-s390x/mysql/imagestreams/mysql-rhel.json +++ b/assets/operator/ocp-s390x/mysql/imagestreams/mysql-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mysql", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json index e6fceb378..3ef5f630d 100755 --- a/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-ephemeral", "creationTimestamp": null, @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json b/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json index 6e36f9871..61d5eaf1b 100755 --- a/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/nginx/imagestreams/nginx-rhel.json b/assets/operator/ocp-s390x/nginx/imagestreams/nginx-rhel.json index 8e161e6c1..6dd541818 100755 --- a/assets/operator/ocp-s390x/nginx/imagestreams/nginx-rhel.json +++ b/assets/operator/ocp-s390x/nginx/imagestreams/nginx-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nginx", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.18-ubi8" + "name": "1.20-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "1.18-ubi8", + "name": "1.20-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-118:latest" + "name": "registry.redhat.io/ubi8/nginx-120:latest" }, "generation": null, "importPolicy": {}, @@ -57,20 +57,20 @@ } }, { - "name": "1.18-ubi7", + "name": "1.20-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nginx-118:latest" + "name": "registry.redhat.io/ubi7/nginx-120:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +79,20 @@ } }, { - "name": "1.16-el8", + "name": "1.18-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (RHEL 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/nginx-116:latest" + "name": "registry.redhat.io/ubi8/nginx-118:latest" }, "generation": null, "importPolicy": {}, @@ -101,42 +101,20 @@ } }, { - "name": "1.16-el7", + "name": "1.18-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (RHEL 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nginx-116-rhel7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "1.16", - "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", - "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx,hidden", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nginx-116-rhel7:latest" + "name": "registry.redhat.io/ubi7/nginx-118:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/nginx/templates/nginx-example.json b/assets/operator/ocp-s390x/nginx/templates/nginx-example.json index 9586e7adf..ad203770f 100755 --- a/assets/operator/ocp-s390x/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-s390x/nginx/templates/nginx-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "nginx-example", "creationTimestamp": null, @@ -40,7 +40,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -57,7 +57,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -124,7 +124,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16-el8 by default).", - "value": "1.16-el8", + "description": "Version of NGINX image to be used (1.20-el8 by default).", + "value": "1.20-el8", "required": true }, { diff --git a/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json index f212ede43..7c36c7f1c 100755 --- a/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nodejs", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", + "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", "iconClass": "icon-nodejs", "openshift.io/display-name": "Node.js (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "14-ubi8" + "name": "16-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,19 +35,19 @@ } }, { - "name": "14-ubi8", + "name": "16-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14:latest" + "name": "registry.redhat.io/ubi8/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -56,19 +56,19 @@ } }, { - "name": "14-ubi8-minimal", + "name": "16-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" + "name": "registry.redhat.io/ubi8/nodejs-16-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +77,19 @@ } }, { - "name": "14-ubi7", + "name": "14-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 7)", + "openshift.io/display-name": "Node.js 14 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs,hidden", + "tags": "builder,nodejs", "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nodejs-14:latest" + "name": "registry.redhat.io/ubi8/nodejs-14:latest" }, "generation": null, "importPolicy": {}, @@ -98,40 +98,19 @@ } }, { - "name": "12-ubi8", + "name": "14-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 8)", + "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "12" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-12:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "12-ubi7", - "annotations": { - "description": "Build and run Node.js 12 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs,hidden", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nodejs-12:latest" + "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -140,19 +119,19 @@ } }, { - "name": "12", + "name": "14-ubi7", "annotations": { - "description": "Build and run Node.js 12 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12", + "openshift.io/display-name": "Node.js 14 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs,hidden", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nodejs-12-rhel7:latest" + "name": "registry.redhat.io/ubi7/nodejs-14:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/nodejs/templates/nodejs-postgresql-example.json b/assets/operator/ocp-s390x/nodejs/templates/nodejs-postgresql-example.json index 03caa5562..57ff1338d 100755 --- a/assets/operator/ocp-s390x/nodejs/templates/nodejs-postgresql-example.json +++ b/assets/operator/ocp-s390x/nodejs/templates/nodejs-postgresql-example.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/nodejs/templates/nodejs-postgresql-persistent.json b/assets/operator/ocp-s390x/nodejs/templates/nodejs-postgresql-persistent.json index c21a5254b..5c625dee3 100755 --- a/assets/operator/ocp-s390x/nodejs/templates/nodejs-postgresql-persistent.json +++ b/assets/operator/ocp-s390x/nodejs/templates/nodejs-postgresql-persistent.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/perl/imagestreams/perl-rhel.json b/assets/operator/ocp-s390x/perl/imagestreams/perl-rhel.json index e4fd38d2e..2ce2e295f 100755 --- a/assets/operator/ocp-s390x/perl/imagestreams/perl-rhel.json +++ b/assets/operator/ocp-s390x/perl/imagestreams/perl-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "perl", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json b/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json index d45a515ca..8d89200be 100755 --- a/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-s390x/php/imagestreams/php-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "php", "creationTimestamp": null, @@ -56,28 +56,6 @@ "type": "Local" } }, - { - "name": "7.3-ubi8", - "annotations": { - "description": "Build and run PHP 7.3 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.", - "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", - "tags": "builder,php", - "version": "7.3" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-73:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "7.3-ubi7", "annotations": { diff --git a/assets/operator/ocp-s390x/postgresql/imagestreams/postgresql-rhel.json b/assets/operator/ocp-s390x/postgresql/imagestreams/postgresql-rhel.json index 3d1c15733..570b11ee0 100755 --- a/assets/operator/ocp-s390x/postgresql/imagestreams/postgresql-rhel.json +++ b/assets/operator/ocp-s390x/postgresql/imagestreams/postgresql-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "postgresql", "creationTimestamp": null, @@ -52,6 +52,26 @@ "type": "Local" } }, + { + "name": "13-el7", + "annotations": { + "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "iconClass": "icon-postgresql", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,postgresql", + "version": "13" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "12-el8", "annotations": { @@ -191,26 +211,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "9.6-el8", - "annotations": { - "description": "Provides a PostgreSQL 9.6 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 9.6 (RHEL 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql", - "version": "9.6" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-96:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }, diff --git a/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json index b61755011..1a7d47325 100755 --- a/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-ephemeral", "creationTimestamp": null, @@ -64,7 +64,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json index e3f752ca1..623bc36dd 100755 --- a/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-persistent", "creationTimestamp": null, @@ -81,7 +81,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/python/imagestreams/python-rhel.json b/assets/operator/ocp-s390x/python/imagestreams/python-rhel.json index 57b9036c4..390b4d49d 100755 --- a/assets/operator/ocp-s390x/python/imagestreams/python-rhel.json +++ b/assets/operator/ocp-s390x/python/imagestreams/python-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "python", "creationTimestamp": null, diff --git a/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json index e03d3a6c1..6408ab5bc 100755 --- a/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-pgsql-persistent", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -341,7 +341,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json b/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json index 9d4366f7f..a6aa97190 100755 --- a/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-postgresql-example", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -324,7 +324,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-s390x/redis/imagestreams/redis-rhel.json b/assets/operator/ocp-s390x/redis/imagestreams/redis-rhel.json index 1d5654e0c..0d1901baf 100755 --- a/assets/operator/ocp-s390x/redis/imagestreams/redis-rhel.json +++ b/assets/operator/ocp-s390x/redis/imagestreams/redis-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "redis", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Provides a Redis database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Redis available on OpenShift, including major version updates.", + "description": "Provides a Redis database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Redis available on OpenShift, including major version updates.", "iconClass": "icon-redis", "openshift.io/display-name": "Redis (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -24,7 +24,47 @@ }, "from": { "kind": "ImageStreamTag", - "name": "5-el8" + "name": "6-el8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6-el8", + "annotations": { + "description": "Provides a Redis 6 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.", + "iconClass": "icon-redis", + "openshift.io/display-name": "Redis 6 (RHEL 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "redis", + "version": "6" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhel8/redis-6:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6-el7", + "annotations": { + "description": "Provides a Redis 6 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.", + "iconClass": "icon-redis", + "openshift.io/display-name": "Redis 6 (RHEL 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "redis", + "version": "6" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhscl/redis-6-rhel7:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json b/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json index e9af758bd..104f1f03c 100755 --- a/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-ephemeral", "creationTimestamp": null, @@ -60,7 +60,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/ocp-s390x/redis/templates/redis-persistent.json b/assets/operator/ocp-s390x/redis/templates/redis-persistent.json index 68ee70a6c..d1f4ed9d6 100755 --- a/assets/operator/ocp-s390x/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-s390x/redis/templates/redis-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-persistent", "creationTimestamp": null, @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/ocp-s390x/ruby/imagestreams/ruby-rhel.json b/assets/operator/ocp-s390x/ruby/imagestreams/ruby-rhel.json index aa1bcfd00..ed2eb1c22 100755 --- a/assets/operator/ocp-s390x/ruby/imagestreams/ruby-rhel.json +++ b/assets/operator/ocp-s390x/ruby/imagestreams/ruby-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ruby", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/2.7/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", + "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/3.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", "iconClass": "icon-ruby", "openshift.io/display-name": "Ruby (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "2.7-ubi8" + "name": "3.0-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "2.7-ubi8", + "name": "3.0-ubi8", "annotations": { - "description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.", + "description": "Build and run Ruby 3.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Ruby 2.7 (UBI 8)", + "openshift.io/display-name": "Ruby 3.0 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/ruby-ex.git", - "supports": "ruby:2.7,ruby", + "supports": "ruby:3.0,ruby", "tags": "builder,ruby", - "version": "2.7" + "version": "3.0" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/ruby-27:latest" + "name": "registry.redhat.io/ubi8/ruby-30:latest" }, "generation": null, "importPolicy": {}, @@ -78,6 +78,28 @@ "type": "Local" } }, + { + "name": "2.7-ubi8", + "annotations": { + "description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.", + "iconClass": "icon-ruby", + "openshift.io/display-name": "Ruby 2.7 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/ruby-ex.git", + "supports": "ruby:2.7,ruby", + "tags": "builder,ruby", + "version": "2.7" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/ruby-27:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "2.7-ubi7", "annotations": { diff --git a/assets/operator/ocp-s390x/sso/imagestreams/sso74-openj9-openshift-rhel8.json b/assets/operator/ocp-s390x/sso/imagestreams/sso74-openj9-openshift-rhel8.json index 8a5e10352..e0759ad66 100755 --- a/assets/operator/ocp-s390x/sso/imagestreams/sso74-openj9-openshift-rhel8.json +++ b/assets/operator/ocp-s390x/sso/imagestreams/sso74-openj9-openshift-rhel8.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "sso74-openj9-openshift-rhel8", "creationTimestamp": null, @@ -8,7 +8,7 @@ "description": "Red Hat Single Sign-On 7.4 on OpenJ9", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9", "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "spec": { diff --git a/assets/operator/ocp-s390x/sso/imagestreams/sso75-openj9-openshift-rhel8.json b/assets/operator/ocp-s390x/sso/imagestreams/sso75-openj9-openshift-rhel8.json new file mode 100755 index 000000000..d19e103f1 --- /dev/null +++ b/assets/operator/ocp-s390x/sso/imagestreams/sso75-openj9-openshift-rhel8.json @@ -0,0 +1,57 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-openshift-rhel8", + "creationTimestamp": null, + "annotations": { + "description": "Red Hat Single Sign-On 7.5 on OpenJ9", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "7.5.0.GA" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "ImageStreamTag", + "name": "7.5" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "" + } + }, + { + "name": "7.5", + "annotations": { + "description": "Red Hat Single Sign-On 7.5 on OpenJ9 image", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9", + "supports": "sso:7.5", + "tags": "sso,keycloak,redhat,hidden", + "version": "1.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rh-sso-7/sso75-openj9-openshift-rhel8:7.5" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-https.json b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-https.json index dce44eb7a..fd4fdbe6f 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-https.json +++ b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-https.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-https", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 (Ephemeral with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -93,7 +93,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -113,7 +113,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -136,7 +136,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -539,7 +539,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-ocp4-x509-https.json b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-ocp4-x509-https.json index 073bb4c82..20f1d3d4f 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-ocp4-x509-https.json +++ b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-ocp4-x509-https.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-ocp4-x509-https", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, securing RH-SSO communication using re-encrypt TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", @@ -85,7 +85,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -107,7 +107,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -387,7 +387,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-ocp4-x509-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-ocp4-x509-postgresql-persistent.json b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-ocp4-x509-postgresql-persistent.json index 8d4c014b7..660a98865 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-ocp4-x509-postgresql-persistent.json +++ b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-ocp4-x509-postgresql-persistent.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-ocp4-x509-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -132,7 +132,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -354,7 +354,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -635,7 +635,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-postgresql-persistent.json b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-postgresql-persistent.json index 838789ce3..729834de8 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-postgresql-persistent.json +++ b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-postgresql-persistent.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 + PostgreSQL (Persistent with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -119,7 +119,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -162,7 +162,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -432,7 +432,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -788,7 +788,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-postgresql.json b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-postgresql.json index c3a4e5b1d..02844e87e 100755 --- a/assets/operator/ocp-s390x/sso/templates/sso74-openj9-postgresql.json +++ b/assets/operator/ocp-s390x/sso/templates/sso74-openj9-postgresql.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-openj9-postgresql", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJ9 + PostgreSQL (Ephemeral with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -122,7 +122,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -143,7 +143,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -167,7 +167,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -439,7 +439,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -766,7 +766,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-openj9-postgresql" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso75-openj9-https.json b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-https.json new file mode 100755 index 000000000..2d49622e2 --- /dev/null +++ b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-https.json @@ -0,0 +1,545 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-https", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 (Ephemeral with passthrough TLS)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, securing RH-SSO communication using passthrough TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", + "objects": [ + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's http port." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-http", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's http service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTP}", + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTPS}", + "tls": { + "termination": "passthrough" + }, + "to": { + "name": "secure-${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "HTTPS_KEYSTORE_DIR", + "value": "/etc/eap-secret-volume" + }, + { + "name": "HTTPS_KEYSTORE", + "value": "${HTTPS_KEYSTORE}" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "value": "${HTTPS_KEYSTORE_TYPE}" + }, + { + "name": "HTTPS_NAME", + "value": "${HTTPS_NAME}" + }, + { + "name": "HTTPS_PASSWORD", + "value": "${HTTPS_PASSWORD}" + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "value": "${JGROUPS_ENCRYPT_SECRET}" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", + "value": "/etc/jgroups-encrypt-secret-volume" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "value": "${JGROUPS_ENCRYPT_KEYSTORE}" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "value": "${JGROUPS_ENCRYPT_NAME}" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "value": "${JGROUPS_ENCRYPT_PASSWORD}" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/eap-secret-volume", + "name": "eap-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/jgroups-encrypt-secret-volume", + "name": "eap-jgroups-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "eap-keystore-volume", + "secret": { + "secretName": "${HTTPS_SECRET}" + } + }, + { + "name": "eap-jgroups-keystore-volume", + "secret": { + "secretName": "${JGROUPS_ENCRYPT_SECRET}" + } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "HOSTNAME_HTTPS", + "displayName": "Custom https Route Hostname", + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "HTTPS_SECRET", + "displayName": "Server Keystore Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "HTTPS_KEYSTORE", + "displayName": "Server Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "keystore.jks" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "displayName": "Server Keystore Type", + "description": "The type of the keystore file (JKS or JCEKS)" + }, + { + "name": "HTTPS_NAME", + "displayName": "Server Certificate Name", + "description": "The name associated with the server certificate (e.g. jboss)" + }, + { + "name": "HTTPS_PASSWORD", + "displayName": "Server Keystore Password", + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "displayName": "JGroups Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "displayName": "JGroups Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "jgroups.jceks" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "displayName": "JGroups Certificate Name", + "description": "The name associated with the server certificate (e.g. secret-key)" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "displayName": "JGroups Keystore Password", + "description": "The password for the keystore and certificate (e.g. password)" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "JGroups cluster password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" + }, + { + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-https" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso75-openj9-ocp4-x509-https.json b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-ocp4-x509-https.json new file mode 100755 index 000000000..0197bbf2b --- /dev/null +++ b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-ocp4-x509-https.json @@ -0,0 +1,393 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-ocp4-x509-https", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 (Ephemeral)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, securing RH-SSO communication using re-encrypt TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", + "objects": [ + { + "apiVersion": "v1", + "kind": "ConfigMap", + "metadata": { + "annotations": { + "description": "ConfigMap providing service ca bundle.", + "service.beta.openshift.io/inject-cabundle": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-service-ca" + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-https-secret" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "tls": { + "termination": "reencrypt" + }, + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "X509_CA_BUNDLE", + "value": "/var/run/configmaps/service-ca/service-ca.crt /var/run/secrets/kubernetes.io/serviceaccount/ca.crt" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/x509/https", + "name": "sso-x509-https-volume", + "readOnly": true + }, + { + "mountPath": "/etc/x509/jgroups", + "name": "sso-x509-jgroups-volume", + "readOnly": true + }, + { + "mountPath": "/var/run/configmaps/service-ca", + "name": "service-ca", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "sso-x509-https-volume", + "secret": { + "secretName": "sso-x509-https-secret" + } + }, + { + "name": "sso-x509-jgroups-volume", + "secret": { + "secretName": "sso-x509-jgroups-secret" + } + }, + { + "configMap": { + "name": "${APPLICATION_NAME}-service-ca" + }, + "name": "service-ca" + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "The password for the JGroups cluster.", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", + "required": true + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server admininistrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-ocp4-x509-https" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-postgresql-persistent-s2i.json b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-ocp4-x509-postgresql-persistent.json similarity index 58% rename from assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-postgresql-persistent-s2i.json rename to assets/operator/ocp-s390x/sso/templates/sso75-openj9-ocp4-x509-postgresql-persistent.json index 00b4c5679..d145b502f 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-postgresql-persistent-s2i.json +++ b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-ocp4-x509-postgresql-persistent.json @@ -1,46 +1,35 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws31-tomcat7-postgresql-persistent-s2i", + "name": "sso75-openj9-ocp4-x509-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "An example JBoss Web Server application with a PostgreSQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + PostgreSQL (with https)", + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat7,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using https.", + "tags": "sso,keycloak,jboss", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.4" + "version": "7.5.0.GA" } }, - "message": "A new persistent JWS application for Apache Tomcat 7 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", "objects": [ { "apiVersion": "v1", - "kind": "Service", + "kind": "ConfigMap", "metadata": { "annotations": { - "description": "The web server's http port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + "description": "ConfigMap providing service ca bundle.", + "service.beta.openshift.io/inject-cabundle": "true" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } + "name": "${APPLICATION_NAME}-service-ca" } }, { @@ -49,12 +38,13 @@ "metadata": { "annotations": { "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-https-secret" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" }, "spec": { "ports": [ @@ -94,26 +84,33 @@ }, { "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", + "kind": "Service", "metadata": { "annotations": { - "description": "Route for application's http service." + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}-ping" }, "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" } } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -123,98 +120,19 @@ "labels": { "application": "${APPLICATION_NAME}" }, - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" }, "spec": { - "host": "${HOSTNAME_HTTPS}", "tls": { - "termination": "passthrough" + "termination": "reencrypt" }, "to": { - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" } } }, { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver31-tomcat7-openshift:1.4", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -242,6 +160,10 @@ "containers": [ { "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, { "name": "DB_SERVICE_PREFIX_MAPPING", "value": "${APPLICATION_NAME}-postgresql=DB" @@ -262,6 +184,10 @@ "name": "DB_DATABASE", "value": "${DB_DATABASE}" }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, { "name": "DB_MIN_POOL_SIZE", "value": "${DB_MIN_POOL_SIZE}" @@ -275,32 +201,58 @@ "value": "${DB_TX_ISOLATION}" }, { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" }, { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" }, { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" + "name": "X509_CA_BUNDLE", + "value": "/var/run/configmaps/service-ca/service-ca.crt /var/run/secrets/kubernetes.io/serviceaccount/ca.crt" }, { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" }, { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" }, { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" } ], "image": "${APPLICATION_NAME}", "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, "name": "${APPLICATION_NAME}", "ports": [ { @@ -317,6 +269,11 @@ "containerPort": 8443, "name": "https", "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" } ], "readinessProbe": { @@ -324,26 +281,53 @@ "command": [ "/bin/bash", "-c", - "curl --noproxy '*' -s -u ${JWS_ADMIN_USERNAME}:${JWS_ADMIN_PASSWORD} 'http://localhost:8080/manager/jmxproxy/?get=Catalina%3Atype%3DServer\u0026att=stateName' |grep -iq 'stateName *= *STARTED'" + "/opt/eap/bin/readinessProbe.sh" ] } }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, "volumeMounts": [ { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", + "mountPath": "/etc/x509/https", + "name": "sso-x509-https-volume", + "readOnly": true + }, + { + "mountPath": "/etc/x509/jgroups", + "name": "sso-x509-jgroups-volume", + "readOnly": true + }, + { + "mountPath": "/var/run/configmaps/service-ca", + "name": "service-ca", "readOnly": true } ] } ], - "terminationGracePeriodSeconds": 60, + "terminationGracePeriodSeconds": 75, "volumes": [ { - "name": "jws-certificate-volume", + "name": "sso-x509-https-volume", + "secret": { + "secretName": "sso-x509-https-secret" + } + }, + { + "name": "sso-x509-jgroups-volume", "secret": { - "secretName": "${JWS_HTTPS_SECRET}" + "secretName": "sso-x509-jgroups-secret" } + }, + { + "configMap": { + "name": "${APPLICATION_NAME}-service-ca" + }, + "name": "service-ca" } ] } @@ -357,7 +341,8 @@ ], "from": { "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, "type": "ImageChange" @@ -369,7 +354,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -423,12 +408,15 @@ } ], "image": "postgresql", + "imagePullPolicy": "Always", "livenessProbe": { - "initialDelaySeconds": 30, + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, "tcpSocket": { "port": 5432 }, - "timeoutSeconds": 1 + "timeoutSeconds": 10 }, "name": "${APPLICATION_NAME}-postgresql", "ports": [ @@ -446,8 +434,10 @@ "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" ] }, - "initialDelaySeconds": 5, - "timeoutSeconds": 1 + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "timeoutSeconds": 10 }, "volumeMounts": [ { @@ -515,43 +505,27 @@ "name": "APPLICATION_NAME", "displayName": "Application Name", "description": "The name for the application.", - "value": "jws-app", + "value": "sso", "required": true }, { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." }, { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "The password for the JGroups cluster.", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", "required": true }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "todolist/todolist-jdbc" - }, { "name": "DB_JNDI", "displayName": "Database JNDI Name", - "description": "Database JNDI name used by application to resolve the datasource, e.g. jboss/datasources/postgresqlDS", - "value": "jboss/datasources/defaultDS" + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" }, { "name": "DB_DATABASE", @@ -560,37 +534,6 @@ "value": "root", "required": true }, - { - "name": "VOLUME_CAPACITY", - "displayName": "Database Volume Capacity", - "description": "Size of persistent storage for database volume.", - "value": "1Gi", - "required": true - }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, { "name": "DB_MIN_POOL_SIZE", "displayName": "Datasource Minimum Pool Size", @@ -629,67 +572,70 @@ "displayName": "Database Password", "description": "Database user password", "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "from": "[a-zA-Z0-9]{32}", "required": true }, { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "name": "VOLUME_CAPACITY", + "displayName": "Database Volume Capacity", + "description": "Size of persistent storage for database volume.", + "value": "1Gi", "required": true }, { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", "required": true }, { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", "generate": "expression", "from": "[a-zA-Z0-9]{8}", "required": true }, { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "from": "[a-zA-Z0-9]{32}", "required": true }, { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." }, { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." }, { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." }, { "name": "POSTGRESQL_IMAGE_STREAM_TAG", "displayName": "PostgreSQL Image Stream Tag", "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", - "value": "9.5", + "value": "10", "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" } ], "labels": { - "jws31": "1.4", - "template": "jws31-tomcat7-postgresql-persistent-s2i" + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso75-openj9-postgresql-persistent.json b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-postgresql-persistent.json new file mode 100755 index 000000000..ae68a8786 --- /dev/null +++ b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-postgresql-persistent.json @@ -0,0 +1,794 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-postgresql-persistent", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 + PostgreSQL (Persistent with passthrough TLS)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", + "objects": [ + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's http port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The database server's port." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "ports": [ + { + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-http", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's http service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTP}", + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTPS}", + "tls": { + "termination": "passthrough" + }, + "to": { + "name": "secure-${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_SERVICE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_JNDI", + "value": "${DB_JNDI}" + }, + { + "name": "DB_USERNAME", + "value": "${DB_USERNAME}" + }, + { + "name": "DB_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "DB_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "HTTPS_KEYSTORE_DIR", + "value": "/etc/eap-secret-volume" + }, + { + "name": "HTTPS_KEYSTORE", + "value": "${HTTPS_KEYSTORE}" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "value": "${HTTPS_KEYSTORE_TYPE}" + }, + { + "name": "HTTPS_NAME", + "value": "${HTTPS_NAME}" + }, + { + "name": "HTTPS_PASSWORD", + "value": "${HTTPS_PASSWORD}" + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "value": "${JGROUPS_ENCRYPT_SECRET}" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", + "value": "/etc/jgroups-encrypt-secret-volume" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "value": "${JGROUPS_ENCRYPT_KEYSTORE}" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "value": "${JGROUPS_ENCRYPT_NAME}" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "value": "${JGROUPS_ENCRYPT_PASSWORD}" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/eap-secret-volume", + "name": "eap-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/jgroups-encrypt-secret-volume", + "name": "eap-jgroups-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "eap-keystore-volume", + "secret": { + "secretName": "${HTTPS_SECRET}" + } + }, + { + "name": "eap-jgroups-keystore-volume", + "secret": { + "secretName": "${JGROUPS_ENCRYPT_SECRET}" + } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "POSTGRESQL_USER", + "value": "${DB_USERNAME}" + }, + { + "name": "POSTGRESQL_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + } + ], + "image": "postgresql", + "imagePullPolicy": "Always", + "livenessProbe": { + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "tcpSocket": { + "port": 5432 + }, + "timeoutSeconds": 10 + }, + "name": "${APPLICATION_NAME}-postgresql", + "ports": [ + { + "containerPort": 5432, + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/sh", + "-i", + "-c", + "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" + ] + }, + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "timeoutSeconds": 10 + }, + "volumeMounts": [ + { + "mountPath": "/var/lib/pgsql/data", + "name": "${APPLICATION_NAME}-postgresql-pvol" + } + ] + } + ], + "terminationGracePeriodSeconds": 60, + "volumes": [ + { + "name": "${APPLICATION_NAME}-postgresql-pvol", + "persistentVolumeClaim": { + "claimName": "${APPLICATION_NAME}-postgresql-claim" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}-postgresql" + ], + "from": { + "kind": "ImageStreamTag", + "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "v1", + "kind": "PersistentVolumeClaim", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql-claim" + }, + "spec": { + "accessModes": [ + "ReadWriteOnce" + ], + "resources": { + "requests": { + "storage": "${VOLUME_CAPACITY}" + } + } + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "HOSTNAME_HTTPS", + "displayName": "Custom https Route Hostname", + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "DB_JNDI", + "displayName": "Database JNDI Name", + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" + }, + { + "name": "DB_DATABASE", + "displayName": "Database Name", + "description": "Database name", + "value": "root", + "required": true + }, + { + "name": "HTTPS_SECRET", + "displayName": "Server Keystore Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "HTTPS_KEYSTORE", + "displayName": "Server Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "keystore.jks" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "displayName": "Server Keystore Type", + "description": "The type of the keystore file (JKS or JCEKS)" + }, + { + "name": "HTTPS_NAME", + "displayName": "Server Certificate Name", + "description": "The name associated with the server certificate (e.g. jboss)" + }, + { + "name": "HTTPS_PASSWORD", + "displayName": "Server Keystore Password", + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "displayName": "PostgreSQL Maximum number of connections", + "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions." + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "displayName": "PostgreSQL Shared Buffers", + "description": "Configures how much memory is dedicated to PostgreSQL for caching data." + }, + { + "name": "DB_USERNAME", + "displayName": "Database Username", + "description": "Database user name", + "generate": "expression", + "from": "user[a-zA-Z0-9]{3}", + "required": true + }, + { + "name": "DB_PASSWORD", + "displayName": "Database Password", + "description": "Database user password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "VOLUME_CAPACITY", + "displayName": "Database Volume Capacity", + "description": "Size of persistent storage for database volume.", + "value": "1Gi", + "required": true + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "displayName": "JGroups Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "displayName": "JGroups Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "jgroups.jceks" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "displayName": "JGroups Certificate Name", + "description": "The name associated with the server certificate (e.g. secret-key)" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "displayName": "JGroups Keystore Password", + "description": "The password for the keystore and certificate (e.g. password)" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "JGroups cluster password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" + }, + { + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" + }, + { + "name": "POSTGRESQL_IMAGE_STREAM_TAG", + "displayName": "PostgreSQL Image Stream Tag", + "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", + "value": "10", + "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-postgresql-persistent" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/sso/templates/sso75-openj9-postgresql.json b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-postgresql.json new file mode 100755 index 000000000..eaf111fb3 --- /dev/null +++ b/assets/operator/ocp-s390x/sso/templates/sso75-openj9-postgresql.json @@ -0,0 +1,772 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-openj9-postgresql", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJ9 image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJ9 + PostgreSQL (Ephemeral with passthrough TLS)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJ9 server based deployment, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", + "objects": [ + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's http port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The database server's port." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "ports": [ + { + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-http", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's http service." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTP}", + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTPS}", + "tls": { + "termination": "passthrough" + }, + "to": { + "name": "secure-${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_SERVICE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_JNDI", + "value": "${DB_JNDI}" + }, + { + "name": "DB_USERNAME", + "value": "${DB_USERNAME}" + }, + { + "name": "DB_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "DB_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "HTTPS_KEYSTORE_DIR", + "value": "/etc/eap-secret-volume" + }, + { + "name": "HTTPS_KEYSTORE", + "value": "${HTTPS_KEYSTORE}" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "value": "${HTTPS_KEYSTORE_TYPE}" + }, + { + "name": "HTTPS_NAME", + "value": "${HTTPS_NAME}" + }, + { + "name": "HTTPS_PASSWORD", + "value": "${HTTPS_PASSWORD}" + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "value": "${JGROUPS_ENCRYPT_SECRET}" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", + "value": "/etc/jgroups-encrypt-secret-volume" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "value": "${JGROUPS_ENCRYPT_KEYSTORE}" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "value": "${JGROUPS_ENCRYPT_NAME}" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "value": "${JGROUPS_ENCRYPT_PASSWORD}" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/eap-secret-volume", + "name": "eap-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/jgroups-encrypt-secret-volume", + "name": "eap-jgroups-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "eap-keystore-volume", + "secret": { + "secretName": "${HTTPS_SECRET}" + } + }, + { + "name": "eap-jgroups-keystore-volume", + "secret": { + "secretName": "${JGROUPS_ENCRYPT_SECRET}" + } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openj9-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database", + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "POSTGRESQL_USER", + "value": "${DB_USERNAME}" + }, + { + "name": "POSTGRESQL_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + } + ], + "image": "postgresql", + "imagePullPolicy": "Always", + "livenessProbe": { + "initialDelaySeconds": 30, + "tcpSocket": { + "port": 5432 + }, + "timeoutSeconds": 1 + }, + "name": "${APPLICATION_NAME}-postgresql", + "ports": [ + { + "containerPort": 5432, + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/sh", + "-i", + "-c", + "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" + ] + }, + "initialDelaySeconds": 5, + "timeoutSeconds": 1 + }, + "volumeMounts": [ + { + "mountPath": "/var/lib/pgsql/data", + "name": "${APPLICATION_NAME}-data" + } + ] + } + ], + "terminationGracePeriodSeconds": 60, + "volumes": [ + { + "emptyDir": { + "medium": "" + }, + "name": "${APPLICATION_NAME}-data" + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}-postgresql" + ], + "from": { + "kind": "ImageStreamTag", + "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "HOSTNAME_HTTPS", + "displayName": "Custom https Route Hostname", + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "DB_JNDI", + "displayName": "Database JNDI Name", + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" + }, + { + "name": "DB_DATABASE", + "displayName": "Database Name", + "description": "Database name", + "value": "root", + "required": true + }, + { + "name": "HTTPS_SECRET", + "displayName": "Server Keystore Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "HTTPS_KEYSTORE", + "displayName": "Server Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "keystore.jks" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "displayName": "Server Keystore Type", + "description": "The type of the keystore file (JKS or JCEKS)" + }, + { + "name": "HTTPS_NAME", + "displayName": "Server Certificate Name", + "description": "The name associated with the server certificate (e.g. jboss)" + }, + { + "name": "HTTPS_PASSWORD", + "displayName": "Server Keystore Password", + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "displayName": "PostgreSQL Maximum number of connections", + "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions." + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "displayName": "PostgreSQL Shared Buffers", + "description": "Configures how much memory is dedicated to PostgreSQL for caching data." + }, + { + "name": "DB_USERNAME", + "displayName": "Database Username", + "description": "Database user name", + "generate": "expression", + "from": "user[a-zA-Z0-9]{3}", + "required": true + }, + { + "name": "DB_PASSWORD", + "displayName": "Database Password", + "description": "Database user password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "displayName": "JGroups Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "displayName": "JGroups Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "jgroups.jceks" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "displayName": "JGroups Certificate Name", + "description": "The name associated with the server certificate (e.g. secret-key)" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "displayName": "JGroups Keystore Password", + "description": "The password for the keystore and certificate (e.g. password)" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "JGroups cluster password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" + }, + { + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" + }, + { + "name": "POSTGRESQL_IMAGE_STREAM_TAG", + "displayName": "PostgreSQL Image Stream Tag", + "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", + "value": "10", + "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-openj9-postgresql" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/webserver/imagestreams/jboss-webserver54-openj9-tomcat9-openshift-ubi8.json b/assets/operator/ocp-s390x/webserver/imagestreams/jboss-webserver56-openj9-tomcat9-openshift-ubi8.json similarity index 63% rename from assets/operator/ocp-s390x/webserver/imagestreams/jboss-webserver54-openj9-tomcat9-openshift-ubi8.json rename to assets/operator/ocp-s390x/webserver/imagestreams/jboss-webserver56-openj9-tomcat9-openshift-ubi8.json index 0f8f56597..2cd3453fa 100755 --- a/assets/operator/ocp-s390x/webserver/imagestreams/jboss-webserver54-openj9-tomcat9-openshift-ubi8.json +++ b/assets/operator/ocp-s390x/webserver/imagestreams/jboss-webserver56-openj9-tomcat9-openshift-ubi8.json @@ -1,13 +1,13 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { - "name": "jboss-webserver54-openj9-tomcat9-openshift-ubi8", + "name": "jboss-webserver56-openj9-tomcat9-openshift-ubi8", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11", "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.0" + "version": "5.6" } }, "spec": { @@ -18,18 +18,18 @@ { "name": "latest", "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 S2I images.", + "description": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 S2I images.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8", "sampleContextDir": "tomcat-websocket-chat", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:11", + "supports": "tomcat9:5.6,tomcat:9,java:11", "tags": "builder,tomcat,tomcat9,java,jboss,hidden", "version": "latest" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openj9-11-tomcat9-openshift-rhel8:latest" + "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:latest" }, "generation": null, "importPolicy": { @@ -40,20 +40,20 @@ } }, { - "name": "1.0", + "name": "5.6.0", "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 S2I images.", + "description": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 S2I images.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8", "sampleContextDir": "tomcat-websocket-chat", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:11", + "supports": "tomcat9:5.6,tomcat:9,java:11", "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "version": "1.0" + "version": "1.2" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openj9-11-tomcat9-openshift-rhel8:1.0" + "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:5.6.0" }, "generation": null, "importPolicy": { diff --git a/assets/operator/ocp-ppc64le/webserver/templates/jws54-openj9-tomcat9-ubi8-basic-s2i.json b/assets/operator/ocp-s390x/webserver/templates/jws56-openj9-tomcat9-ubi8-basic-s2i.json similarity index 85% rename from assets/operator/ocp-ppc64le/webserver/templates/jws54-openj9-tomcat9-ubi8-basic-s2i.json rename to assets/operator/ocp-s390x/webserver/templates/jws56-openj9-tomcat9-ubi8-basic-s2i.json index 242366b6d..acac81f34 100755 --- a/assets/operator/ocp-ppc64le/webserver/templates/jws54-openj9-tomcat9-ubi8-basic-s2i.json +++ b/assets/operator/ocp-s390x/webserver/templates/jws56-openj9-tomcat9-ubi8-basic-s2i.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws54-openj9-tomcat9-ubi8-basic-s2i", + "name": "jws56-openj9-tomcat9-ubi8-basic-s2i", "creationTimestamp": null, "annotations": { "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 (no https)", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 (no https)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 based application, including a build configuration, and an application deployment configuration.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 based application, including a build configuration, and an application deployment configuration.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" + "version": "5.6" } }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}.", + "message": "A new JWS application for Apache Tomcat 9 has been created in your project.", "objects": [ { "apiVersion": "v1", @@ -43,7 +43,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -63,7 +63,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -73,7 +73,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -111,7 +111,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "jboss-webserver54-openj9-tomcat9-openshift-ubi8:1.0", + "name": "jboss-webserver56-openj9-tomcat9-openshift-ubi8:5.6.0", "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, @@ -141,7 +141,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -168,16 +168,6 @@ "spec": { "containers": [ { - "env": [ - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], "image": "${APPLICATION_NAME}", "imagePullPolicy": "Always", "name": "${APPLICATION_NAME}", @@ -260,22 +250,6 @@ "description": "Path within Git project to build; empty for root project directory.", "value": "tomcat-websocket-chat" }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "Github Webhook Secret", @@ -310,7 +284,7 @@ } ], "labels": { - "jws54openj9ubi8": "1.0", - "template": "jws54-openj9-tomcat9-ubi8-basic-s2i" + "jws56openj9ubi8": "5.6.0", + "template": "jws56-openj9-tomcat9-ubi8-basic-s2i" } } \ No newline at end of file diff --git a/assets/operator/ocp-s390x/webserver/templates/jws54-openj9-tomcat9-ubi8-https-s2i.json b/assets/operator/ocp-s390x/webserver/templates/jws56-openj9-tomcat9-ubi8-https-s2i.json similarity index 87% rename from assets/operator/ocp-s390x/webserver/templates/jws54-openj9-tomcat9-ubi8-https-s2i.json rename to assets/operator/ocp-s390x/webserver/templates/jws56-openj9-tomcat9-ubi8-https-s2i.json index e859672c3..c51198b5e 100755 --- a/assets/operator/ocp-s390x/webserver/templates/jws54-openj9-tomcat9-ubi8-https-s2i.json +++ b/assets/operator/ocp-s390x/webserver/templates/jws56-openj9-tomcat9-ubi8-https-s2i.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws54-openj9-tomcat9-ubi8-https-s2i", + "name": "jws56-openj9-tomcat9-ubi8-https-s2i", "creationTimestamp": null, "annotations": { "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 (with https)", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8 (with https)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss,hidden", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 OpenJ9 JDK11 based application, including a build configuration, application deployment configuration, and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 based application, including a build configuration, application deployment configuration, and secure communication using https.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" + "version": "5.6" } }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 9 has been created in your project. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", "objects": [ { "apiVersion": "v1", @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -87,7 +87,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -120,7 +120,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -158,7 +158,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "jboss-webserver54-openj9-tomcat9-openshift-ubi8:1.0", + "name": "jboss-webserver56-openj9-tomcat9-openshift-ubi8:5.6.0", "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, @@ -188,7 +188,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -231,14 +231,6 @@ { "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" } ], "image": "${APPLICATION_NAME}", @@ -372,22 +364,6 @@ "displayName": "Certificate Password", "description": "The certificate password" }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "Github Webhook Secret", @@ -422,7 +398,7 @@ } ], "labels": { - "jws54openj9ubi8": "1.0", - "template": "jws54-openj9-tomcat9-ubi8-https-s2i" + "jws56openj9ubi8": "5.6.0", + "template": "jws56-openj9-tomcat9-ubi8-https-s2i" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/3scale/imagestreams/apicast-gateway.json b/assets/operator/ocp-x86_64/3scale/imagestreams/apicast-gateway.json index 3d606db01..2b0367fbe 100755 --- a/assets/operator/ocp-x86_64/3scale/imagestreams/apicast-gateway.json +++ b/assets/operator/ocp-x86_64/3scale/imagestreams/apicast-gateway.json @@ -24,7 +24,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "2.10.0.GA" + "name": "2.11.1.GA" }, "generation": null, "importPolicy": {}, @@ -231,6 +231,46 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "2.11.0.GA", + "annotations": { + "description": "3scale's APIcast is an NGINX based API gateway used to integrate your internal and external API services with 3scale's API Management Platform. It supports OpenID connect to integrate with external Identity Providers such as Red Hat Single Sign On, for API traffic authentication.", + "iconClass": "icon-3scale", + "openshift.io/display-name": "3scale APIcast API Gateway 2.11.0.GA", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "api,gateway,3scale", + "version": "2.11.0.GA" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "2.11.1.GA", + "annotations": { + "description": "3scale's APIcast is an NGINX based API gateway used to integrate your internal and external API services with 3scale's API Management Platform. It supports OpenID connect to integrate with external Identity Providers such as Red Hat Single Sign On, for API traffic authentication.", + "iconClass": "icon-3scale", + "openshift.io/display-name": "3scale APIcast API Gateway 2.11.1.GA", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "api,gateway,3scale", + "version": "2.11.1.GA" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11.1" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/3scale/templates/3scale-gateway.json b/assets/operator/ocp-x86_64/3scale/templates/3scale-gateway.json index b61f55001..bf3b67258 100755 --- a/assets/operator/ocp-x86_64/3scale/templates/3scale-gateway.json +++ b/assets/operator/ocp-x86_64/3scale/templates/3scale-gateway.json @@ -213,7 +213,7 @@ { "name": "AMP_RELEASE", "description": "AMP release tag.", - "value": "2.10.0", + "value": "2.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-example.json b/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-example.json index e8fdf317e..1b96f4391 100755 --- a/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-example", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -308,7 +308,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-persistent.json index 7a0398aea..e1bb86859 100755 --- a/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-x86_64/cakephp/templates/cakephp-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-persistent", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -325,7 +325,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-example.json b/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-example.json index b5244e9a4..3c5a3829f 100755 --- a/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -281,7 +281,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-persistent.json b/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-persistent.json index 2b0cad268..f33a6637b 100755 --- a/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-x86_64/dancer/templates/dancer-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -298,7 +298,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/ocp-x86_64/django/templates/django-psql-example.json b/assets/operator/ocp-x86_64/django/templates/django-psql-example.json index 51a708aa0..6359561b6 100755 --- a/assets/operator/ocp-x86_64/django/templates/django-psql-example.json +++ b/assets/operator/ocp-x86_64/django/templates/django-psql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/ocp-x86_64/django/templates/django-psql-persistent.json b/assets/operator/ocp-x86_64/django/templates/django-psql-persistent.json index 9fb7eae2a..28f2aa2ac 100755 --- a/assets/operator/ocp-x86_64/django/templates/django-psql-persistent.json +++ b/assets/operator/ocp-x86_64/django/templates/django-psql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/ocp-x86_64/dotnet/imagestreams/dotnet-rhel.json b/assets/operator/ocp-x86_64/dotnet/imagestreams/dotnet-rhel.json index 2f6bf683f..467dc0f0a 100755 --- a/assets/operator/ocp-x86_64/dotnet/imagestreams/dotnet-rhel.json +++ b/assets/operator/ocp-x86_64/dotnet/imagestreams/dotnet-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "dotnet", "creationTimestamp": null, @@ -16,18 +16,64 @@ { "name": "latest", "annotations": { - "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", + "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", "iconClass": "icon-dotnet", "openshift.io/display-name": ".NET (Latest)", "sampleContextDir": "app", - "sampleRef": "dotnet-5.0", + "sampleRef": "dotnet-6.0", "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", "supports": "dotnet", "tags": "builder,.net,dotnet,dotnetcore,hidden" }, "from": { "kind": "ImageStreamTag", - "name": "5.0-ubi8" + "name": "6.0-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0-ubi8", + "annotations": { + "description": "Build and run .NET 6 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnet-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:6.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet60", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0", + "annotations": { + "description": "Build and run .NET 6 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnetcore-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:6.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet60,hidden", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60:6.0" }, "generation": null, "importPolicy": {}, @@ -149,75 +195,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "2.1-ubi8", - "annotations": { - "description": "Build and run .NET Core 2.1 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/build/README.md.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 (UBI 8)", - "sampleContextDir": "app", - "sampleRef": "dotnetcore-2.1", - "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", - "supports": "dotnet:2.1,dotnet", - "tags": "builder,.net,dotnet,dotnetcore,dotnet21", - "version": "2.1" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-21:2.1" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.1-el7", - "annotations": { - "description": "Build and run .NET Core 2.1 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/build/README.md.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 (RHEL 7)", - "sampleContextDir": "app", - "sampleRef": "dotnetcore-2.1", - "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", - "supports": "dotnet:2.1,dotnet", - "tags": "builder,.net,dotnet,dotnetcore,rh-dotnet21", - "version": "2.1" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/dotnet/dotnet-21-rhel7:2.1" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.1", - "annotations": { - "description": "Build and run .NET Core 2.1 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/build/README.md.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 (RHEL 7)", - "sampleContextDir": "app", - "sampleRef": "dotnetcore-2.1", - "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", - "supports": "dotnet:2.1,dotnet", - "tags": "builder,.net,dotnet,dotnetcore,rh-dotnet21,hidden", - "version": "2.1" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/dotnet/dotnet-21-rhel7:2.1" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }, diff --git a/assets/operator/ocp-x86_64/dotnet/imagestreams/dotnet-runtime-rhel.json b/assets/operator/ocp-x86_64/dotnet/imagestreams/dotnet-runtime-rhel.json index 0551aab3d..17360c261 100755 --- a/assets/operator/ocp-x86_64/dotnet/imagestreams/dotnet-runtime-rhel.json +++ b/assets/operator/ocp-x86_64/dotnet/imagestreams/dotnet-runtime-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "dotnet-runtime", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Run .NET applications. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.", + "description": "Run .NET applications. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.", "iconClass": "icon-dotnet", "openshift.io/display-name": ".NET Runtime (Latest)", "supports": "dotnet-runtime", @@ -24,7 +24,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "5.0-ubi8" + "name": "6.0-ubi8" }, "generation": null, "importPolicy": {}, @@ -33,18 +33,18 @@ } }, { - "name": "5.0-ubi8", + "name": "6.0-ubi8", "annotations": { - "description": "Run .NET 5 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.", + "description": "Run .NET 6 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET 5 Runtime (UBI 8)", + "openshift.io/display-name": ".NET 6 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "5.0" + "version": "6.0" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-50-runtime:5.0" + "name": "registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0" }, "generation": null, "importPolicy": {}, @@ -53,18 +53,18 @@ } }, { - "name": "5.0", + "name": "6.0", "annotations": { - "description": "Run .NET 5 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.", + "description": "Run .NET 6 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET 5 Runtime (UBI 8)", + "openshift.io/display-name": ".NET 6 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden", - "version": "5.0" + "version": "6.0" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-50-runtime:5.0" + "name": "registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0" }, "generation": null, "importPolicy": {}, @@ -73,38 +73,18 @@ } }, { - "name": "3.1-ubi8", - "annotations": { - "description": "Run .NET Core 3.1 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 3.1 Runtime (UBI 8)", - "supports": "dotnet-runtime", - "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "3.1" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-31-runtime:3.1" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "3.1-el7", + "name": "5.0-ubi8", "annotations": { - "description": "Run .NET Core 3.1 applications on RHEL 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", + "description": "Run .NET 5 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 3.1 Runtime (RHEL 7)", + "openshift.io/display-name": ".NET 5 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "3.1" + "version": "5.0" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1" + "name": "registry.access.redhat.com/ubi8/dotnet-50-runtime:5.0" }, "generation": null, "importPolicy": {}, @@ -113,18 +93,18 @@ } }, { - "name": "3.1", + "name": "5.0", "annotations": { - "description": "Run .NET Core 3.1 applications on RHEL 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", + "description": "Run .NET 5 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 3.1 Runtime (RHEL 7)", + "openshift.io/display-name": ".NET 5 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden", - "version": "3.1" + "version": "5.0" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1" + "name": "registry.access.redhat.com/ubi8/dotnet-50-runtime:5.0" }, "generation": null, "importPolicy": {}, @@ -133,18 +113,18 @@ } }, { - "name": "2.1-ubi8", + "name": "3.1-ubi8", "annotations": { - "description": "Run .NET Core 2.1 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/runtime/README.md.", + "description": "Run .NET Core 3.1 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 Runtime (UBI 8)", + "openshift.io/display-name": ".NET Core 3.1 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "2.1" + "version": "3.1" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-21-runtime:2.1" + "name": "registry.access.redhat.com/ubi8/dotnet-31-runtime:3.1" }, "generation": null, "importPolicy": {}, @@ -153,18 +133,18 @@ } }, { - "name": "2.1-el7", + "name": "3.1-el7", "annotations": { - "description": "Run .NET Core 2.1 applications on RHEL 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/runtime/README.md.", + "description": "Run .NET Core 3.1 applications on RHEL 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 Runtime (RHEL 7)", + "openshift.io/display-name": ".NET Core 3.1 Runtime (RHEL 7)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "2.1" + "version": "3.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/dotnet/dotnet-21-runtime-rhel7:2.1" + "name": "registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1" }, "generation": null, "importPolicy": {}, @@ -173,18 +153,18 @@ } }, { - "name": "2.1", + "name": "3.1", "annotations": { - "description": "Run .NET Core 2.1 applications on RHEL 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/runtime/README.md.", + "description": "Run .NET Core 3.1 applications on RHEL 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 Runtime (RHEL 7)", + "openshift.io/display-name": ".NET Core 3.1 Runtime (RHEL 7)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden", - "version": "2.1" + "version": "3.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/dotnet/dotnet-21-runtime-rhel7:2.1" + "name": "registry.redhat.io/dotnet/dotnet-31-runtime-rhel7:3.1" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/eap-cd/imagestreams/eap-cd-openshift-rhel8.json b/assets/operator/ocp-x86_64/eap-cd/imagestreams/eap-cd-openshift-rhel8.json deleted file mode 100755 index 708e4d4eb..000000000 --- a/assets/operator/ocp-x86_64/eap-cd/imagestreams/eap-cd-openshift-rhel8.json +++ /dev/null @@ -1,460 +0,0 @@ -{ - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "eap-cd-openshift", - "creationTimestamp": null, - "annotations": { - "openshift.io/display-name": "JBoss EAP continuous delivery", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "20.0" - } - }, - "spec": { - "lookupPolicy": { - "local": false - }, - "tags": [ - { - "name": "latest", - "annotations": { - "description": "The latest available build of JBoss EAP continuous delivery Tech Preview.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "latest" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift-rhel8:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 20.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 20 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "20" - }, - "from": { - "kind": "ImageStreamTag", - "name": "20.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "19", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 19.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 19 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "19" - }, - "from": { - "kind": "ImageStreamTag", - "name": "19.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "18", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 18.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 18 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.3,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "18" - }, - "from": { - "kind": "ImageStreamTag", - "name": "18.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "17", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 17.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 17 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.3,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "17" - }, - "from": { - "kind": "ImageStreamTag", - "name": "17.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "16", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 16.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 16 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.3,javaee:8,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "16" - }, - "from": { - "kind": "ImageStreamTag", - "name": "16.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "15", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 15.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 15 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.3,javaee:8,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "15" - }, - "from": { - "kind": "ImageStreamTag", - "name": "15.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "14", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 14.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 14 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.2,javaee:8,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "14" - }, - "from": { - "kind": "ImageStreamTag", - "name": "14.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "13", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 13.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 13 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.2,javaee:7,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "13" - }, - "from": { - "kind": "ImageStreamTag", - "name": "13.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "12", - "annotations": { - "description": "JBoss EAP continuous delivery Tech Preview version 12.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 12 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "supports": "eap:7.2,javaee:7,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "12" - }, - "from": { - "kind": "ImageStreamTag", - "name": "12.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "12.0", - "annotations": { - "description": "JBoss EAP continuous delivery 12 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 12 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.2,javaee:7,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "12.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:12.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "13.0", - "annotations": { - "description": "JBoss EAP continuous delivery 13 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 13 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.2,javaee:7,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "13.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:13.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "14.0", - "annotations": { - "description": "JBoss EAP continuous delivery 14 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 14 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.2,javaee:8,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "14.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:14.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "15.0", - "annotations": { - "description": "JBoss EAP continuous delivery 15 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 15 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.3,javaee:8,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "15.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:15.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "16.0", - "annotations": { - "description": "JBoss EAP continuous delivery 16 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 16 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.3,javaee:8,java:8", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "16.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:16.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "17.0", - "annotations": { - "description": "JBoss EAP continuous delivery 17 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 17 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.3,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "17.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift-rhel8:17.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "18.0", - "annotations": { - "description": "JBoss EAP continuous delivery 18 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 18 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.3,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "18.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift-rhel8:18.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "19.0", - "annotations": { - "description": "JBoss EAP continuous delivery 19 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 19 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "19.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift-rhel8:19.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20.0", - "annotations": { - "description": "JBoss EAP continuous delivery 20 Tech Preview S2I Image", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 20 (Tech Preview)", - "sampleContextDir": "kitchensink", - "sampleRef": "openshift", - "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "builder,eap,javaee,java,jboss,hidden", - "version": "20.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift-rhel8:20.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - } - ] - }, - "status": { - "dockerImageRepository": "" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap-cd/imagestreams/eap-cd-runtime-openshift-rhel8.json b/assets/operator/ocp-x86_64/eap-cd/imagestreams/eap-cd-runtime-openshift-rhel8.json deleted file mode 100755 index 4df1ef649..000000000 --- a/assets/operator/ocp-x86_64/eap-cd/imagestreams/eap-cd-runtime-openshift-rhel8.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "eap-cd-runtime-openshift", - "creationTimestamp": null, - "annotations": { - "openshift.io/display-name": "JBoss EAP continuous delivery runtime image", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "20.0" - } - }, - "spec": { - "lookupPolicy": { - "local": false - }, - "tags": [ - { - "name": "latest", - "annotations": { - "description": "The latest available build of JBoss EAP continuous delivery runtime image [Tech Preview]", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery (Tech Preview)", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "eap,javaee,java,jboss,hidden", - "version": "latest" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-runtime-openshift-rhel8:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20", - "annotations": { - "description": "JBoss EAP continuous delivery runtime image version 20 [Tech Preview]", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 20 (Tech Preview)", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "eap,javaee,java,jboss,hidden", - "version": "20" - }, - "from": { - "kind": "ImageStreamTag", - "name": "20.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "19", - "annotations": { - "description": "JBoss EAP continuous delivery runtime image version 19 [Tech Preview]", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 19 (Tech Preview)", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "eap,javaee,java,jboss,hidden", - "version": "19" - }, - "from": { - "kind": "ImageStreamTag", - "name": "19.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "18", - "annotations": { - "description": "JBoss EAP continuous delivery runtime image version 18 [Tech Preview]", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 18 (Tech Preview)", - "supports": "eap:7.3,javaee:8,java:11", - "tags": "eap,javaee,java,jboss,hidden", - "version": "18" - }, - "from": { - "kind": "ImageStreamTag", - "name": "18.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "18.0", - "annotations": { - "description": "JBoss EAP continuous delivery 18 runtime image [Tech Preview]", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 18 (Tech Preview)", - "supports": "eap:7.3,javaee:8,java:11", - "tags": "eap,javaee,java,jboss,hidden", - "version": "18.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-runtime-openshift-rhel8:18.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "19.0", - "annotations": { - "description": "JBoss EAP continuous delivery 19 runtime image [Tech Preview]", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 19 (Tech Preview)", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "eap,javaee,java,jboss,hidden", - "version": "19.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-runtime-openshift-rhel8:19.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "20.0", - "annotations": { - "description": "JBoss EAP continuous delivery 20 runtime image [Tech Preview]", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP continuous delivery 20 (Tech Preview)", - "supports": "eap:7.4,javaee:8,java:11", - "tags": "eap,javaee,java,jboss,hidden", - "version": "20.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-runtime-openshift-rhel8:20.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - } - ] - }, - "status": { - "dockerImageRepository": "" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap-cd/templates/eap-cd-basic-s2i.json b/assets/operator/ocp-x86_64/eap-cd/templates/eap-cd-basic-s2i.json deleted file mode 100755 index b4adceb1b..000000000 --- a/assets/operator/ocp-x86_64/eap-cd/templates/eap-cd-basic-s2i.json +++ /dev/null @@ -1,511 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "eap-cd-basic-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Enterprise Application Platform continuous delivery application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP CD", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "eap,javaee,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", - "template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration and secure communication using edge TLS.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "20.0" - } - }, - "message": "A new JBoss EAP CD based application has been created in your project.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The JGroups ping port for clustering.", - "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-ping" - }, - "spec": { - "clusterIP": "None", - "ports": [ - { - "name": "ping", - "port": 8888 - } - ], - "publishNotReadyAddresses": true, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "tls": { - "insecureEdgeTerminationPolicy": "Redirect", - "termination": "edge" - }, - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "MAVEN_ARGS_APPEND", - "value": "${MAVEN_ARGS_APPEND}" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "value": "${GALLEON_PROVISION_LAYERS}" - }, - { - "name": "GALLEON_PROVISION_DEFAULT_FAT_SERVER", - "value": "true" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "eap-cd-openshift:latest", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "incremental": true - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "dockerfile": "FROM eap-cd-runtime-openshift:latest\nCOPY /server $JBOSS_HOME\nUSER root\nRUN chown -R jboss:root $JBOSS_HOME \u0026\u0026 chmod -R ug+rwX $JBOSS_HOME\nUSER jboss\nCMD $JBOSS_HOME/bin/openshift-launch.sh", - "images": [ - { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - }, - "paths": [ - { - "destinationDir": ".", - "sourcePath": "/s2i-output/server/" - } - ] - } - ] - }, - "strategy": { - "dockerStrategy": { - "from": { - "kind": "ImageStreamTag", - "name": "eap-cd-runtime-openshift:latest", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "imageOptimizationPolicy": "SkipLayers" - }, - "type": "Docker" - }, - "triggers": [ - { - "imageChange": { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "JGROUPS_PING_PROTOCOL", - "value": "dns.DNS_PING" - }, - { - "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", - "value": "${APPLICATION_NAME}-ping" - }, - { - "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", - "value": "8888" - }, - { - "name": "MQ_CLUSTER_PASSWORD", - "value": "${MQ_CLUSTER_PASSWORD}" - }, - { - "name": "MQ_QUEUES", - "value": "${MQ_QUEUES}" - }, - { - "name": "MQ_TOPICS", - "value": "${MQ_TOPICS}" - }, - { - "name": "JGROUPS_CLUSTER_PASSWORD", - "value": "${JGROUPS_CLUSTER_PASSWORD}" - }, - { - "name": "AUTO_DEPLOY_EXPLODED", - "value": "${AUTO_DEPLOY_EXPLODED}" - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "value": "${ENABLE_GENERATE_DEFAULT_DATASOURCE}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "livenessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/livenessProbe.sh" - ] - }, - "initialDelaySeconds": 60 - }, - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8888, - "name": "ping", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/readinessProbe.sh" - ] - }, - "initialDelaySeconds": 10 - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - } - } - ], - "terminationGracePeriodSeconds": 75 - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "eap-app", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "openshift" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "kitchensink" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "displayName": "Galleon layers", - "description": "Comma separated list of Galleon layers to provision a server." - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "displayName": "Enable ExampleDS datasource", - "description": "Enable ExampleDS datasource.", - "value": "false" - }, - { - "name": "MQ_QUEUES", - "displayName": "Queues", - "description": "Queue names, separated by commas. These queues will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all queues used by the application *must* be specified here in order to be created automatically on the remote AMQ broker." - }, - { - "name": "MQ_TOPICS", - "displayName": "Topics", - "description": "Topic names, separated by commas. These topics will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all topics used by the application *must* be specified here in order to be created automatically on the remote AMQ broker." - }, - { - "name": "MQ_CLUSTER_PASSWORD", - "displayName": "AMQ cluster password", - "description": "AMQ cluster admin password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "JGROUPS_CLUSTER_PASSWORD", - "displayName": "JGroups Cluster Password", - "description": "JGroups cluster password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "AUTO_DEPLOY_EXPLODED", - "displayName": "Deploy Exploded Archives", - "description": "Controls whether exploded deployment content should be automatically deployed", - "value": "false" - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "MAVEN_ARGS_APPEND", - "displayName": "Maven Additional Arguments", - "description": "Maven additional arguments to use for S2I builds", - "value": "-Dcom.redhat.xpaas.repo.jbossorg" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - }, - { - "name": "MEMORY_LIMIT", - "description": "Container memory limit", - "value": "1Gi" - } - ], - "labels": { - "template": "eap-cd-basic-s2i", - "xpaas": "20.0" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap-cd/templates/eap-cd-starter-s2i.json b/assets/operator/ocp-x86_64/eap-cd/templates/eap-cd-starter-s2i.json deleted file mode 100755 index 59884eb34..000000000 --- a/assets/operator/ocp-x86_64/eap-cd/templates/eap-cd-starter-s2i.json +++ /dev/null @@ -1,425 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "eap-cd-starter-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Enterprise Application Platform continuous delivery application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP CD Starter", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "eap,javaee,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", - "template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration and secure communication using edge TLS.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "20.0" - } - }, - "message": "A new JBoss EAP CD based application has been created in your project.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "tls": { - "insecureEdgeTerminationPolicy": "Redirect", - "termination": "edge" - }, - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "MAVEN_ARGS_APPEND", - "value": "${MAVEN_ARGS_APPEND}" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "value": "${GALLEON_PROVISION_LAYERS}" - }, - { - "name": "GALLEON_PROVISION_DEFAULT_FAT_SERVER", - "value": "true" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "eap-cd-openshift:latest", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "incremental": true - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "dockerfile": "FROM eap-cd-runtime-openshift:latest\nCOPY /server $JBOSS_HOME\nUSER root\nRUN chown -R jboss:root $JBOSS_HOME \u0026\u0026 chmod -R ug+rwX $JBOSS_HOME\nUSER jboss\nCMD $JBOSS_HOME/bin/openshift-launch.sh", - "images": [ - { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - }, - "paths": [ - { - "destinationDir": ".", - "sourcePath": "/s2i-output/server/" - } - ] - } - ] - }, - "strategy": { - "dockerStrategy": { - "from": { - "kind": "ImageStreamTag", - "name": "eap-cd-runtime-openshift:latest", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "imageOptimizationPolicy": "SkipLayers" - }, - "type": "Docker" - }, - "triggers": [ - { - "imageChange": { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "AUTO_DEPLOY_EXPLODED", - "value": "${AUTO_DEPLOY_EXPLODED}" - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "value": "${ENABLE_GENERATE_DEFAULT_DATASOURCE}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "livenessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/livenessProbe.sh" - ] - }, - "initialDelaySeconds": 60 - }, - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/readinessProbe.sh" - ] - }, - "initialDelaySeconds": 10 - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - } - } - ], - "terminationGracePeriodSeconds": 75 - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "eap-app", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-developer/jboss-eap-quickstarts.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "openshift" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "kitchensink" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "displayName": "Galleon layers", - "description": "Comma separated list of Galleon layers to provision a server." - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "displayName": "Enable ExampleDS datasource", - "description": "Enable ExampleDS datasource.", - "value": "false" - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "AUTO_DEPLOY_EXPLODED", - "displayName": "Deploy Exploded Archives", - "description": "Controls whether exploded deployment content should be automatically deployed", - "value": "false" - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "MAVEN_ARGS_APPEND", - "displayName": "Maven Additional Arguments", - "description": "Maven additional arguments to use for S2I builds", - "value": "-Dcom.redhat.xpaas.repo.jbossorg" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - }, - { - "name": "MEMORY_LIMIT", - "description": "Container memory limit", - "value": "1Gi" - } - ], - "labels": { - "template": "eap-cd-starter-s2i", - "xpaas": "20.0" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap/imagestreams/jboss-eap-xp3-openjdk11-openshift-rhel8.json b/assets/operator/ocp-x86_64/eap/imagestreams/jboss-eap-xp3-openjdk11-openshift-rhel8.json new file mode 100755 index 000000000..eb0f4952b --- /dev/null +++ b/assets/operator/ocp-x86_64/eap/imagestreams/jboss-eap-xp3-openjdk11-openshift-rhel8.json @@ -0,0 +1,63 @@ +{ + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "jboss-eap-xp3-openjdk11-openshift", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "JBoss EAP XP 3.0 with OpenJDK 11", + "openshift.io/provider-display-name": "Red Hat", + "version": "3.0" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": { + "description": "JBoss EAP expansion pack 3.0 image for OpenShift to build and run Microservices applications on RHEL8 with OpenJDK11", + "iconClass": "icon-eap", + "openshift.io/display-name": "JBoss EAP XP 3.0 with OpenJDK 11", + "supports": "eap-xp:3,javaee:8,java:11", + "tags": "builder,eap-xp,javaee,java,jboss", + "version": "latest" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "3.0", + "annotations": { + "description": "JBoss EAP expansion pack 3.0 image for OpenShift to build and run Microservices applications on RHEL8 with OpenJDK11", + "iconClass": "icon-eap", + "openshift.io/display-name": "JBoss EAP XP 3.0 with OpenJDK 11", + "supports": "eap-xp:2,javaee:8,java:11", + "tags": "builder,eap-xp,javaee,java,jboss", + "version": "3.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8:3.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap/imagestreams/jboss-eap-xp3-openjdk11-runtime-openshift-rhel8.json b/assets/operator/ocp-x86_64/eap/imagestreams/jboss-eap-xp3-openjdk11-runtime-openshift-rhel8.json new file mode 100755 index 000000000..532a392ea --- /dev/null +++ b/assets/operator/ocp-x86_64/eap/imagestreams/jboss-eap-xp3-openjdk11-runtime-openshift-rhel8.json @@ -0,0 +1,63 @@ +{ + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "jboss-eap-xp3-openjdk11-runtime-openshift", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "JBoss EAP XP 3.0 with OpenJDK11 (Runtime Image)", + "openshift.io/provider-display-name": "Red Hat", + "version": "3.0" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": { + "description": "Runtime image for JBoss EAP expansion pack 3.0 to run Microservices applications on RHEL8 with OpenJDK11.", + "iconClass": "icon-eap", + "openshift.io/display-name": "JBoss EAP XP 3.0 with OpenJDK11 (Runtime Image)", + "supports": "eap-xp:3,javaee:8,java:11", + "tags": "runtime,eap-xp,javaee,java,jboss,hidden", + "version": "latest" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-eap-7/eap-xp3-openjdk11-runtime-openshift-rhel8:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "3.0", + "annotations": { + "description": "Runtime image for JBoss EAP expansion pack 3.0 to run Microservices applications on RHEL8 with OpenJDK11.", + "iconClass": "icon-eap", + "openshift.io/display-name": "JBoss EAP XP 3.0 with OpenJDK11 (Runtime Image)", + "supports": "eap-xp:3,javaee:8,java:11", + "tags": "runtime,eap-xp,javaee,java,jboss,hidden", + "version": "3.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/jboss-eap-7/eap-xp3-openjdk11-runtime-openshift-rhel8:3.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap/templates/eap73-basic-s2i.json b/assets/operator/ocp-x86_64/eap/templates/eap-xp3-basic-s2i.json similarity index 89% rename from assets/operator/ocp-x86_64/eap/templates/eap73-basic-s2i.json rename to assets/operator/ocp-x86_64/eap/templates/eap-xp3-basic-s2i.json index daab46dbd..083bb4f77 100755 --- a/assets/operator/ocp-x86_64/eap/templates/eap73-basic-s2i.json +++ b/assets/operator/ocp-x86_64/eap/templates/eap-xp3-basic-s2i.json @@ -2,21 +2,21 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "eap73-basic-s2i", + "name": "eap-xp3-basic-s2i", "creationTimestamp": null, "annotations": { - "description": "An example JBoss Enterprise Application Platform application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/7.3.x/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-xp3/README.adoc", "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP 7.3 (OpenJDK 8)", + "openshift.io/display-name": "JBoss EAP XP 3.0 basic template", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "eap,javaee,java,jboss", + "tags": "eap,eap-xp,javaee,java,jboss", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", - "template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform based application, including a build configuration, application deployment configuration and secure communication using edge TLS.", + "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/support-url": "https://access.redhat.com", - "version": "7.3" + "version": "1.0" } }, - "message": "A new JBoss EAP based application has been created in your project.", + "message": "A new JBoss EAP XP based application has been created in your project.", "objects": [ { "apiVersion": "v1", @@ -274,6 +274,12 @@ "metadata": { "labels": { "application": "${APPLICATION_NAME}", + "com.company": "Red_Hat", + "com.redhat.component-name": "EAP_XP", + "com.redhat.component-type": "application", + "com.redhat.component-version": "3.0", + "com.redhat.product-name": "Red_Hat_Runtimes", + "com.redhat.product-version": "2021-Q3", "deploymentConfig": "${APPLICATION_NAME}" }, "name": "${APPLICATION_NAME}" @@ -395,21 +401,21 @@ "name": "APPLICATION_NAME", "displayName": "Application Name", "description": "The name for the application.", - "value": "eap-app", + "value": "eap-xp3-basic-app", "required": true }, { "name": "EAP_IMAGE_NAME", - "displayName": "EAP Image Name", - "description": "Name of the EAP image to use, example: jboss-eap73-openshift:7.3", - "value": "jboss-eap73-openshift:7.3", + "displayName": "EAP XP Image Name", + "description": "EAP XP imagestream tag to be used, example: jboss-eap-xp3-openjdk11-openshift:latest", + "value": "jboss-eap-xp3-openjdk11-openshift:latest", "required": true }, { "name": "EAP_RUNTIME_IMAGE_NAME", - "displayName": "EAP Runtime Image Name", - "description": "Name of the EAP image to use, example: jboss-eap73-runtime-openshift:7.3", - "value": "jboss-eap73-runtime-openshift:7.3", + "displayName": "EAP XP Runtime Image Name", + "description": "EAP XP Runtime imagestream tag to be used, example: jboss-eap-xp3-openjdk11-runtime-openshift:latest", + "value": "jboss-eap-xp3-openjdk11-runtime-openshift:latest", "required": true }, { @@ -423,13 +429,13 @@ "name": "SOURCE_REPOSITORY_REF", "displayName": "Git Reference", "description": "Git branch/tag reference", - "value": "7.3.x-openshift" + "value": "xp-3.0.x" }, { "name": "CONTEXT_DIR", "displayName": "Context Directory", "description": "Path within Git project to build; empty for root project directory.", - "value": "kitchensink" + "value": "microprofile-config" }, { "name": "GALLEON_PROVISION_LAYERS", @@ -519,7 +525,7 @@ } ], "labels": { - "template": "eap73-basic-s2i", - "xpaas": "7.3" + "template": "eap-xp3-basic-s2i", + "xpaas": "1.0" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap/templates/eap73-sso-s2i.json b/assets/operator/ocp-x86_64/eap/templates/eap73-sso-s2i.json deleted file mode 100755 index 08b510a6b..000000000 --- a/assets/operator/ocp-x86_64/eap/templates/eap73-sso-s2i.json +++ /dev/null @@ -1,931 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "eap73-sso-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Enterprise Application Platform application Single Sign-On application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/7.3.x/README.adoc", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP 7.3 (OpenJDK 8) + Single Sign-On with passthrough TLS", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "eap,javaee,java,jboss,hidden", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", - "template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform based application, including a build configuration, application deployment configuration, integrated with Red Hat Single Sign-On and secure communication using passthrough TLS.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.3" - } - }, - "message": "A new JBoss EAP application with SSL and SSO support has been created in your project. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The JGroups ping port for clustering.", - "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-ping" - }, - "spec": { - "clusterIP": "None", - "ports": [ - { - "name": "ping", - "port": 8888 - } - ], - "publishNotReadyAddresses": true, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "tls": { - "termination": "passthrough" - }, - "to": { - "name": "secure-${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "images": [ - { - "from": { - "kind": "ImageStreamTag", - "name": "${SSO_IMAGE_NAME}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "paths": [ - { - "destinationDir": "./${CONTEXT_DIR}/extensions/sso-adapters", - "sourcePath": "/opt/rh/rh-sso/client/eap7/." - } - ] - } - ], - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "CUSTOM_INSTALL_DIRECTORIES", - "value": "extensions/*" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - }, - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "MAVEN_ARGS_APPEND", - "value": "${MAVEN_ARGS_APPEND}" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "value": "${GALLEON_PROVISION_LAYERS}" - }, - { - "name": "GALLEON_PROVISION_DEFAULT_FAT_SERVER", - "value": "true" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "${EAP_IMAGE_NAME}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "incremental": true - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "dockerfile": "FROM ${EAP_RUNTIME_IMAGE_NAME}\nCOPY /server $JBOSS_HOME\nUSER root\nRUN chown -R jboss:root $JBOSS_HOME \u0026\u0026 chmod -R ug+rwX $JBOSS_HOME\nUSER jboss\nCMD $JBOSS_HOME/bin/openshift-launch.sh", - "images": [ - { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - }, - "paths": [ - { - "destinationDir": ".", - "sourcePath": "/s2i-output/server/" - } - ] - } - ] - }, - "strategy": { - "dockerStrategy": { - "from": { - "kind": "ImageStreamTag", - "name": "${EAP_RUNTIME_IMAGE_NAME}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "imageOptimizationPolicy": "SkipLayers" - }, - "type": "Docker" - }, - "triggers": [ - { - "imageChange": { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "JGROUPS_PING_PROTOCOL", - "value": "dns.DNS_PING" - }, - { - "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", - "value": "${APPLICATION_NAME}-ping" - }, - { - "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", - "value": "8888" - }, - { - "name": "HOSTNAME_HTTP", - "value": "${HOSTNAME_HTTP}" - }, - { - "name": "HOSTNAME_HTTPS", - "value": "${HOSTNAME_HTTPS}" - }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, - { - "name": "MQ_CLUSTER_PASSWORD", - "value": "${MQ_CLUSTER_PASSWORD}" - }, - { - "name": "MQ_QUEUES", - "value": "${MQ_QUEUES}" - }, - { - "name": "MQ_TOPICS", - "value": "${MQ_TOPICS}" - }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, - { - "name": "JGROUPS_CLUSTER_PASSWORD", - "value": "${JGROUPS_CLUSTER_PASSWORD}" - }, - { - "name": "AUTO_DEPLOY_EXPLODED", - "value": "${AUTO_DEPLOY_EXPLODED}" - }, - { - "name": "SSO_URL", - "value": "${SSO_URL}" - }, - { - "name": "SSO_SERVICE_URL", - "value": "${SSO_SERVICE_URL}" - }, - { - "name": "SSO_REALM", - "value": "${SSO_REALM}" - }, - { - "name": "SSO_USERNAME", - "value": "${SSO_USERNAME}" - }, - { - "name": "SSO_PASSWORD", - "value": "${SSO_PASSWORD}" - }, - { - "name": "SSO_PUBLIC_KEY", - "value": "${SSO_PUBLIC_KEY}" - }, - { - "name": "SSO_BEARER_ONLY", - "value": "${SSO_BEARER_ONLY}" - }, - { - "name": "SSO_SAML_KEYSTORE_SECRET", - "value": "${SSO_SAML_KEYSTORE_SECRET}" - }, - { - "name": "SSO_SAML_KEYSTORE", - "value": "${SSO_SAML_KEYSTORE}" - }, - { - "name": "SSO_SAML_KEYSTORE_DIR", - "value": "/etc/sso-saml-secret-volume" - }, - { - "name": "SSO_SAML_CERTIFICATE_NAME", - "value": "${SSO_SAML_CERTIFICATE_NAME}" - }, - { - "name": "SSO_SAML_KEYSTORE_PASSWORD", - "value": "${SSO_SAML_KEYSTORE_PASSWORD}" - }, - { - "name": "SSO_SECRET", - "value": "${SSO_SECRET}" - }, - { - "name": "SSO_ENABLE_CORS", - "value": "${SSO_ENABLE_CORS}" - }, - { - "name": "SSO_SAML_LOGOUT_PAGE", - "value": "${SSO_SAML_LOGOUT_PAGE}" - }, - { - "name": "SSO_DISABLE_SSL_CERTIFICATE_VALIDATION", - "value": "${SSO_DISABLE_SSL_CERTIFICATE_VALIDATION}" - }, - { - "name": "SSO_TRUSTSTORE", - "value": "${SSO_TRUSTSTORE}" - }, - { - "name": "SSO_TRUSTSTORE_DIR", - "value": "/etc/sso-secret-volume" - }, - { - "name": "SSO_TRUSTSTORE_PASSWORD", - "value": "${SSO_TRUSTSTORE_PASSWORD}" - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "value": "${ENABLE_GENERATE_DEFAULT_DATASOURCE}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "livenessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/livenessProbe.sh" - ] - }, - "initialDelaySeconds": 60 - }, - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" - }, - { - "containerPort": 8888, - "name": "ping", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/readinessProbe.sh" - ] - }, - "initialDelaySeconds": 10 - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - }, - "volumeMounts": [ - { - "mountPath": "/etc/sso-saml-secret-volume", - "name": "sso-saml-keystore-volume", - "readOnly": true - }, - { - "mountPath": "/etc/eap-secret-volume", - "name": "eap-keystore-volume", - "readOnly": true - }, - { - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "name": "eap-jgroups-keystore-volume", - "readOnly": true - }, - { - "mountPath": "/etc/sso-secret-volume", - "name": "sso-truststore-volume", - "readOnly": true - } - ] - } - ], - "terminationGracePeriodSeconds": 75, - "volumes": [ - { - "name": "sso-saml-keystore-volume", - "secret": { - "secretName": "${SSO_SAML_KEYSTORE_SECRET}" - } - }, - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - }, - { - "name": "sso-truststore-volume", - "secret": { - "secretName": "${SSO_TRUSTSTORE_SECRET}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "eap-app", - "required": true - }, - { - "name": "EAP_IMAGE_NAME", - "displayName": "EAP Image Name", - "description": "Name of the EAP image to use, example: jboss-eap73-openshift:7.3", - "value": "jboss-eap73-openshift:7.3", - "required": true - }, - { - "name": "EAP_RUNTIME_IMAGE_NAME", - "displayName": "EAP Runtime Image Name", - "description": "Name of the EAP image to use, example: jboss-eap73-runtime-openshift:7.3", - "value": "jboss-eap73-runtime-openshift:7.3", - "required": true - }, - { - "name": "SSO_IMAGE_NAME", - "displayName": "SSO Image Name", - "description": "Name of the SSO image to use, examples: redhat-sso73-openshift:1.0", - "value": "redhat-sso73-openshift:1.0", - "required": true - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Hostname for https service route (e.g. secure-eap-app-myproject.example.com). Required for SSO-enabled applications. This is added to the white list of redirects in the SSO server.", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/redhat-developer/redhat-sso-quickstarts", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "7.0.x-ose" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory." - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "displayName": "Galleon layers", - "description": "Comma separated list of Galleon layers to provision a server." - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "displayName": "Enable ExampleDS datasource", - "description": "Enable ExampleDS datasource.", - "value": "false" - }, - { - "name": "MQ_QUEUES", - "displayName": "Queues", - "description": "Queue names, separated by commas. These queues will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all queues used by the application *must* be specified here in order to be created automatically on the remote AMQ broker." - }, - { - "name": "MQ_TOPICS", - "displayName": "Topics", - "description": "Topic names, separated by commas. These topics will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all topics used by the application *must* be specified here in order to be created automatically on the remote AMQ broker." - }, - { - "name": "MQ_CLUSTER_PASSWORD", - "displayName": "AMQ cluster password", - "description": "AMQ cluster admin password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "HTTPS_SECRET", - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "value": "eap7-app-secret", - "required": true - }, - { - "name": "HTTPS_KEYSTORE", - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "value": "keystore.jks" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)" - }, - { - "name": "HTTPS_NAME", - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate (e.g. jboss)" - }, - { - "name": "HTTPS_PASSWORD", - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate (e.g. mykeystorepass)" - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "value": "eap7-app-secret" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "value": "jgroups.jceks" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate (e.g. secret-key)" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate (e.g. password)" - }, - { - "name": "JGROUPS_CLUSTER_PASSWORD", - "displayName": "JGroups Cluster Password", - "description": "JGroups cluster password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "AUTO_DEPLOY_EXPLODED", - "displayName": "Deploy Exploded Archives", - "description": "Controls whether exploded deployment content should be automatically deployed", - "value": "false" - }, - { - "name": "SSO_URL", - "displayName": "URL for SSO", - "description": "The URL for the SSO server (e.g. https://secure-sso-myproject.example.com/auth). This is the URL through which the user will be redirected when a login or token is required by the application.", - "required": true - }, - { - "name": "SSO_SERVICE_URL", - "displayName": "URL for SSO (internal service)", - "description": "The URL for the internal SSO service, where secure-sso (the default) is the kubernetes service exposed by the SSO server. This is used to create the application client(s) (see SSO_USERNAME). This can also be the same as SSO_URL.", - "value": "https://secure-sso:8443/auth" - }, - { - "name": "SSO_REALM", - "displayName": "SSO Realm", - "description": "The SSO realm to which the application client(s) should be associated (e.g. demo).", - "required": true - }, - { - "name": "SSO_USERNAME", - "displayName": "SSO Username", - "description": "The username used to access the SSO service. This is used to create the appliction client(s) within the specified SSO realm. This should match the SSO_SERVICE_USERNAME specified through one of the sso70-* templates." - }, - { - "name": "SSO_PASSWORD", - "displayName": "SSO Password", - "description": "The password for the SSO service user." - }, - { - "name": "SSO_PUBLIC_KEY", - "displayName": "SSO Public Key", - "description": "SSO Public Key. Public key is recommended to be passed into the template to avoid man-in-the-middle security vulnerability" - }, - { - "name": "SSO_BEARER_ONLY", - "displayName": "SSO Bearer Only?", - "description": "SSO Client Access Type" - }, - { - "name": "ARTIFACT_DIR", - "displayName": "Artifact Directories", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied.", - "value": "app-jee-jsp/target,service-jee-jaxrs/target,app-profile-jee-jsp/target,app-profile-saml-jee-jsp/target" - }, - { - "name": "SSO_SAML_KEYSTORE_SECRET", - "displayName": "SSO SAML Keystore Secret", - "description": "The name of the secret containing the keystore file", - "value": "eap7-app-secret" - }, - { - "name": "SSO_SAML_KEYSTORE", - "displayName": "SSO SAML Keystore", - "description": "The name of the keystore file within the secret", - "value": "keystore.jks" - }, - { - "name": "SSO_SAML_CERTIFICATE_NAME", - "displayName": "SSO SAML Certificate Name", - "description": "The name associated with the server certificate", - "value": "jboss" - }, - { - "name": "SSO_SAML_KEYSTORE_PASSWORD", - "displayName": "SSO SAML Keystore Password", - "description": "The password for the keystore and certificate", - "value": "mykeystorepass" - }, - { - "name": "SSO_SECRET", - "displayName": "SSO Client Secret", - "description": "The SSO Client Secret for Confidential Access", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "SSO_ENABLE_CORS", - "displayName": "Enable CORS for SSO?", - "description": "Enable CORS for SSO applications", - "value": "false" - }, - { - "name": "SSO_SAML_LOGOUT_PAGE", - "displayName": "SSO SAML Logout Page", - "description": "SSO logout page for SAML applications", - "value": "/" - }, - { - "name": "SSO_DISABLE_SSL_CERTIFICATE_VALIDATION", - "displayName": "Disable SSL Validation in EAP-\u003eSSO communication", - "description": "If true SSL communication between EAP and the SSO Server will be insecure (i.e. certificate validation is disabled with curl)", - "value": "true" - }, - { - "name": "SSO_TRUSTSTORE", - "displayName": "SSO Trust Store", - "description": "The name of the truststore file within the secret (e.g. truststore.jks)" - }, - { - "name": "SSO_TRUSTSTORE_PASSWORD", - "displayName": "SSO Trust Store Password", - "description": "The password for the truststore and certificate (e.g. mykeystorepass)" - }, - { - "name": "SSO_TRUSTSTORE_SECRET", - "displayName": "SSO Trust Store Secret", - "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", - "value": "eap7-app-secret" - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "MAVEN_ARGS_APPEND", - "displayName": "Maven Additional Arguments", - "description": "Maven additional arguments to use for S2I builds" - }, - { - "name": "MEMORY_LIMIT", - "description": "Container memory limit", - "value": "1Gi" - } - ], - "labels": { - "template": "eap73-sso-s2i", - "xpaas": "7.3" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/eap/templates/eap73-third-party-db-s2i.json b/assets/operator/ocp-x86_64/eap/templates/eap73-third-party-db-s2i.json deleted file mode 100755 index e1b1f290c..000000000 --- a/assets/operator/ocp-x86_64/eap/templates/eap73-third-party-db-s2i.json +++ /dev/null @@ -1,769 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "eap73-third-party-db-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Enterprise Application Platform application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/7.3.x/README.adoc.", - "iconClass": "icon-eap", - "openshift.io/display-name": "JBoss EAP 7.3 (OpenJDK 8) with passthrough TLS \u0026 DB driver examples", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "eap,javaee,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", - "template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server based application, including a build configuration, application deployment configuration, using third-party DB drivers and secure communication using passthrough TLS.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.3" - } - }, - "message": "A new EAP based application with SSL support has been created in your project. Please be sure to create the following secrets:\"${CONFIGURATION_NAME}\" containing the datasource configuration details required by the deployed application(s); \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The JGroups ping port for clustering.", - "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-ping" - }, - "spec": { - "clusterIP": "None", - "ports": [ - { - "name": "ping", - "port": 8888 - } - ], - "publishNotReadyAddresses": true, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "tls": { - "termination": "passthrough" - }, - "to": { - "name": "secure-${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-build-artifacts" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "images": [ - { - "from": { - "kind": "ImageStreamTag", - "name": "${EXTENSIONS_IMAGE}", - "namespace": "${EXTENSIONS_IMAGE_NAMESPACE}" - }, - "paths": [ - { - "destinationDir": "./${CONTEXT_DIR}/extensions/extras", - "sourcePath": "${EXTENSIONS_INSTALL_DIR}/." - } - ] - } - ], - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "MAVEN_ARGS_APPEND", - "value": "${MAVEN_ARGS_APPEND}" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "value": "${GALLEON_PROVISION_LAYERS}" - }, - { - "name": "GALLEON_PROVISION_DEFAULT_FAT_SERVER", - "value": "true" - }, - { - "name": "CUSTOM_INSTALL_DIRECTORIES", - "value": "extensions/*" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "${EAP_IMAGE_NAME}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "incremental": true - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "imageChange": { - "from": { - "kind": "ImageStreamTag", - "name": "${EXTENSIONS_IMAGE}", - "namespace": "${EXTENSIONS_IMAGE_NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "dockerfile": "FROM ${EAP_RUNTIME_IMAGE_NAME}\nCOPY /server $JBOSS_HOME\nUSER root\nRUN chown -R jboss:root $JBOSS_HOME \u0026\u0026 chmod -R ug+rwX $JBOSS_HOME\nUSER jboss\nCMD $JBOSS_HOME/bin/openshift-launch.sh", - "images": [ - { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - }, - "paths": [ - { - "destinationDir": ".", - "sourcePath": "/s2i-output/server/" - } - ] - } - ] - }, - "strategy": { - "dockerStrategy": { - "from": { - "kind": "ImageStreamTag", - "name": "${EAP_RUNTIME_IMAGE_NAME}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - }, - "imageOptimizationPolicy": "SkipLayers" - }, - "type": "Docker" - }, - "triggers": [ - { - "imageChange": { - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}-build-artifacts:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "JGROUPS_PING_PROTOCOL", - "value": "dns.DNS_PING" - }, - { - "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", - "value": "${APPLICATION_NAME}-ping" - }, - { - "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", - "value": "8888" - }, - { - "name": "ENV_FILES", - "value": "/etc/eap-environment/*" - }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, - { - "name": "MQ_CLUSTER_PASSWORD", - "value": "${MQ_CLUSTER_PASSWORD}" - }, - { - "name": "MQ_QUEUES", - "value": "${MQ_QUEUES}" - }, - { - "name": "MQ_TOPICS", - "value": "${MQ_TOPICS}" - }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, - { - "name": "JGROUPS_CLUSTER_PASSWORD", - "value": "${JGROUPS_CLUSTER_PASSWORD}" - }, - { - "name": "AUTO_DEPLOY_EXPLODED", - "value": "${AUTO_DEPLOY_EXPLODED}" - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "value": "${ENABLE_GENERATE_DEFAULT_DATASOURCE}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "livenessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/livenessProbe.sh" - ] - }, - "initialDelaySeconds": 60 - }, - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" - }, - { - "containerPort": 8888, - "name": "ping", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/readinessProbe.sh" - ] - }, - "initialDelaySeconds": 10 - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - }, - "volumeMounts": [ - { - "mountPath": "/etc/eap-environment", - "name": "configuration", - "readOnly": true - }, - { - "mountPath": "/etc/eap-secret-volume", - "name": "eap-keystore-volume", - "readOnly": true - }, - { - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "name": "eap-jgroups-keystore-volume", - "readOnly": true - } - ] - } - ], - "terminationGracePeriodSeconds": 75, - "volumes": [ - { - "name": "configuration", - "secret": { - "secretName": "${CONFIGURATION_NAME}" - } - }, - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "eap-app", - "required": true - }, - { - "name": "EAP_IMAGE_NAME", - "displayName": "EAP Image Name", - "description": "Name of the EAP image to use, example: jboss-eap73-openshift:7.3", - "value": "jboss-eap73-openshift:7.3", - "required": true - }, - { - "name": "EAP_RUNTIME_IMAGE_NAME", - "displayName": "EAP Runtime Image Name", - "description": "Name of the EAP image to use, example: jboss-eap73-runtime-openshift:7.3", - "value": "jboss-eap73-runtime-openshift:7.3", - "required": true - }, - { - "name": "CONFIGURATION_NAME", - "displayName": "Configuration Secret Name", - "description": "The name of the secret containing configuration properties for the datasources.", - "value": "eap-app-config", - "required": true - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.3" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "datavirt/hibernate-webapp" - }, - { - "name": "GALLEON_PROVISION_LAYERS", - "displayName": "Galleon layers", - "description": "Comma separated list of Galleon layers to provision a server." - }, - { - "name": "ENABLE_GENERATE_DEFAULT_DATASOURCE", - "displayName": "Enable ExampleDS datasource", - "description": "Enable ExampleDS datasource.", - "value": "false" - }, - { - "name": "EXTENSIONS_IMAGE", - "displayName": "Drivers ImageStreamTag", - "description": "ImageStreamTag definition for the image containing the drivers and configuration, e.g. jboss-datavirt63-driver-openshift:1.1", - "value": "jboss-datavirt63-driver-openshift:1.1", - "required": true - }, - { - "name": "EXTENSIONS_IMAGE_NAMESPACE", - "displayName": "Drivers ImageStream Namespace", - "description": "Namespace within which the ImageStream definition for the image containing the drivers and configuration is located.", - "value": "openshift", - "required": true - }, - { - "name": "EXTENSIONS_INSTALL_DIR", - "displayName": "Drivers Image Install Directory", - "description": "Full path to the directory within the extensions image where the extensions are located (e.g. install.sh, modules/, etc.)", - "value": "/extensions", - "required": true - }, - { - "name": "MQ_QUEUES", - "displayName": "Queue Names", - "description": "Queue names, separated by commas. These queues will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all queues used by the application *must* be specified here in order to be created automatically on the remote AMQ broker." - }, - { - "name": "MQ_TOPICS", - "displayName": "Topic Names", - "description": "Topic names, separated by commas. These topics will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all topics used by the application *must* be specified here in order to be created automatically on the remote AMQ broker." - }, - { - "name": "HTTPS_SECRET", - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "value": "eap-app-secret", - "required": true - }, - { - "name": "HTTPS_KEYSTORE", - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "value": "keystore.jks" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)" - }, - { - "name": "HTTPS_NAME", - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "value": "jboss" - }, - { - "name": "HTTPS_PASSWORD", - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "value": "mykeystorepass" - }, - { - "name": "MQ_CLUSTER_PASSWORD", - "displayName": "Messaging Cluster Admin Password", - "description": "Admin password for Messaging cluster.", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "A secret string used to configure the GitHub webhook.", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "A secret string used to configure the Generic webhook.", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore to be used for securing JGroups communications.", - "value": "eap-app-secret" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the JGroups secret.", - "value": "jgroups.jceks" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "displayName": "JGroups Certificate Name", - "description": "The name associated with the JGroups server certificate", - "value": "secret-key" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "value": "password" - }, - { - "name": "JGROUPS_CLUSTER_PASSWORD", - "displayName": "JGroups Cluster Password", - "description": "Password used by JGroups to authenticate nodes in the cluster.", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "AUTO_DEPLOY_EXPLODED", - "displayName": "Deploy Exploded Archives", - "description": "Controls whether exploded deployment content should be automatically deployed", - "value": "false" - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "MAVEN_ARGS_APPEND", - "displayName": "Maven Additional Arguments", - "description": "Maven additional arguments to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - }, - { - "name": "MEMORY_LIMIT", - "description": "Container memory limit", - "value": "1Gi" - } - ], - "labels": { - "template": "eap73-third-party-db-s2i", - "xpaas": "7.3" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/apicurito-ui-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/apicurito-ui-rhel7.json index 501d3bca1..d163eb1af 100755 --- a/assets/operator/ocp-x86_64/fis/imagestreams/apicurito-ui-rhel7.json +++ b/assets/operator/ocp-x86_64/fis/imagestreams/apicurito-ui-rhel7.json @@ -132,6 +132,23 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Red Hat Apicurito UI image.", + "openshift.io/display-name": "Red Hat Apicurito UI", + "tags": "apicurio,hidden" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-apicurito-rhel8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/fuse-apicurito-generator-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/fuse-apicurito-generator-rhel7.json index 4742c13ba..7ba504063 100755 --- a/assets/operator/ocp-x86_64/fis/imagestreams/fuse-apicurito-generator-rhel7.json +++ b/assets/operator/ocp-x86_64/fis/imagestreams/fuse-apicurito-generator-rhel7.json @@ -132,6 +132,23 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Red Hat Apicurito Generator image.", + "openshift.io/display-name": "Red Hat Apicurito Generator", + "tags": "apicurio,fuse,hidden" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-apicurito-generator-rhel8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-console-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-console-rhel7.json index af5b13203..5676ea941 100755 --- a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-console-rhel7.json +++ b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-console-rhel7.json @@ -193,6 +193,26 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Red Hat Fuse 7.10 Console image.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.10 Console", + "supports": "jboss-fuse:7.10.0,java:8,xpaas:1.2", + "tags": "jboss-fuse,hawtio,java,xpaas,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-console-rhel8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-eap-openshift-java11-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-eap-openshift-java11-rhel7.json new file mode 100755 index 000000000..523eb77f8 --- /dev/null +++ b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-eap-openshift-java11-rhel7.json @@ -0,0 +1,42 @@ +{ + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "fuse7-eap-openshift-java11", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat Fuse 7 EAP Java 11", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.10", + "annotations": { + "description": "Red Hat Fuse 7.10 EAP Java 11 S2I images.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.10 EAP Java 11", + "supports": "jboss-fuse:7.10.0,java:11,xpaas:1.2", + "tags": "builder,jboss-fuse,java,eap,xpaas,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-eap-openshift-jdk11-rhel8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-eap-openshift-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-eap-openshift-rhel7.json index b7b39acaf..c7c539f6c 100755 --- a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-eap-openshift-rhel7.json +++ b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-eap-openshift-rhel7.json @@ -193,6 +193,26 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Red Hat Fuse 7.10 EAP S2I images.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.10 EAP", + "supports": "jboss-fuse:7.10.0,java:8,xpaas:1.2", + "tags": "builder,jboss-fuse,java,eap,xpaas,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-eap-openshift-jdk8-rhel7:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-java-openshift-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-java-openshift-rhel7.json index 5e7cc6894..73fdb6589 100755 --- a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-java-openshift-rhel7.json +++ b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-java-openshift-rhel7.json @@ -193,6 +193,26 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Red Hat Fuse 7.10 Java S2I images.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.10 Java", + "supports": "jboss-fuse:7.10.0,java:8,xpaas:1.2", + "tags": "builder,jboss-fuse,java,xpaas,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-java-openshift-rhel8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-java11-openshift-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-java11-openshift-rhel7.json new file mode 100755 index 000000000..d98b8ade8 --- /dev/null +++ b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-java11-openshift-rhel7.json @@ -0,0 +1,42 @@ +{ + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "fuse7-java11-openshift", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat Fuse 7 Java11", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.10", + "annotations": { + "description": "Red Hat Fuse 7.10 Java11 S2I images.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.10 Java11", + "supports": "jboss-fuse:7.10.0,java:11,xpaas:1.2", + "tags": "builder,jboss-fuse,java,xpaas,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-java-openshift-jdk11-rhel8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-karaf-openshift-jdk11-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-karaf-openshift-jdk11-rhel7.json new file mode 100755 index 000000000..69127996d --- /dev/null +++ b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-karaf-openshift-jdk11-rhel7.json @@ -0,0 +1,42 @@ +{ + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "fuse7-karaf-openshift-jdk11", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat Fuse 7 Karaf Java11", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.10", + "annotations": { + "description": "Red Hat Fuse 7.0 Karaf S2I images Java11.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.0 Karaf Java11", + "supports": "jboss-fuse:7.0.0,java:11,xpaas:1.2", + "tags": "builder,jboss-fuse,java,karaf,xpaas,hidden", + "version": "1.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-karaf-openshift-jdk11-rhel8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-karaf-openshift-rhel7.json b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-karaf-openshift-rhel7.json index 0b6ad53a5..ac46d5fd3 100755 --- a/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-karaf-openshift-rhel7.json +++ b/assets/operator/ocp-x86_64/fis/imagestreams/fuse7-karaf-openshift-rhel7.json @@ -193,6 +193,26 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Red Hat Fuse 7.10 Karaf S2I images.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.10 Karaf", + "supports": "jboss-fuse:7.10.0,java:8,xpaas:1.2", + "tags": "builder,jboss-fuse,java,karaf,xpaas,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-karaf-openshift-rhel8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/fis/templates/apicurito.json b/assets/operator/ocp-x86_64/fis/templates/apicurito.json index eba836da6..24fec3903 100755 --- a/assets/operator/ocp-x86_64/fis/templates/apicurito.json +++ b/assets/operator/ocp-x86_64/fis/templates/apicurito.json @@ -13,7 +13,7 @@ "openshift.io/display-name": "Red Hat Fuse Apicurito", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "fuse,apicurio,openapi,swagger,api", - "version": "1.8" + "version": "1.10" } }, "message": "Apicurito is now deployed to https://${ROUTE_HOSTNAME}.", @@ -66,7 +66,7 @@ "rht.comp": "apicurito-ui", "rht.comp_ver": "${APP_VERSION}", "rht.prod_name": "Red_Hat_Integration", - "rht.prod_ver": "7.8" + "rht.prod_ver": "7.10" } }, "spec": { @@ -223,7 +223,7 @@ "rht.comp": "fuse-apicurito-generator", "rht.comp_ver": "${APP_VERSION}", "rht.prod_name": "Red_Hat_Integration", - "rht.prod_ver": "7.8" + "rht.prod_ver": "7.10" } }, "spec": { @@ -353,7 +353,7 @@ "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "1.8", + "value": "1.10", "required": true }, { diff --git a/assets/operator/ocp-x86_64/fis/templates/fuse78-console.json b/assets/operator/ocp-x86_64/fis/templates/fuse710-console.json similarity index 97% rename from assets/operator/ocp-x86_64/fis/templates/fuse78-console.json rename to assets/operator/ocp-x86_64/fis/templates/fuse710-console.json index 70e41a524..dadbfc92c 100755 --- a/assets/operator/ocp-x86_64/fis/templates/fuse78-console.json +++ b/assets/operator/ocp-x86_64/fis/templates/fuse710-console.json @@ -2,7 +2,7 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "fuse78-console", + "name": "fuse710-console", "creationTimestamp": null, "labels": { "template": "fuse-console" @@ -10,10 +10,10 @@ "annotations": { "description": "The Red Hat Fuse Console eases the discovery and management of Fuse applications deployed on OpenShift.", "iconClass": "icon-rh-integration", - "openshift.io/display-name": "Red Hat Fuse 7.8 Console", + "openshift.io/display-name": "Red Hat Fuse 7.10 Console", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "hawtio,java,fis,jboss-fuse", - "version": "1.8" + "version": "1.10" } }, "objects": [ @@ -132,7 +132,7 @@ "rht.comp": "${APP_NAME}", "rht.comp_ver": "${APP_VERSION}", "rht.prod_name": "Red_Hat_Integration", - "rht.prod_ver": "7.8", + "rht.prod_ver": "7.10", "version": "${APP_VERSION}" } }, @@ -253,14 +253,14 @@ "name": "APP_NAME", "displayName": "Application Name", "description": "The name assigned to the application.", - "value": "fuse78-console", + "value": "fuse710-console", "required": true }, { "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "1.8", + "value": "1.10", "required": true }, { diff --git a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel-rest-3scale.json b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel-rest-3scale.json similarity index 91% rename from assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel-rest-3scale.json rename to assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel-rest-3scale.json index 13ee0a54f..80a063798 100755 --- a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel-rest-3scale.json +++ b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel-rest-3scale.json @@ -2,15 +2,15 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "s2i-fuse78-spring-boot-2-camel-rest-3scale", + "name": "s2i-fuse710-spring-boot-2-camel-rest-3scale", "creationTimestamp": null, "annotations": { "description": "Spring Boot 2, Camel REST DSL and 3Scale QuickStart. This example demonstrates how to use Camel's REST DSL to expose a RESTful API and expose it to 3scale.", "iconClass": "icon-rh-integration", - "openshift.io/display-name": "Red Hat Fuse 7.8 Camel REST DSL and 3Scale", + "openshift.io/display-name": "Red Hat Fuse 7.10 Camel REST DSL and 3Scale", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "quickstart,java,springboot,fis,jboss-fuse,3scale", - "version": "1.8" + "version": "1.10" } }, "objects": [ @@ -148,7 +148,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "fuse7-java-openshift:${BUILDER_VERSION}", + "name": "${BASE_IMAGE_NAME}:${BUILDER_VERSION}", "namespace": "${IMAGE_STREAM_NAMESPACE}" }, "incremental": true @@ -218,7 +218,7 @@ "rht.comp": "${APP_NAME}", "rht.comp_ver": "${APP_VERSION}", "rht.prod_name": "Red_Hat_Integration", - "rht.prod_ver": "7.8", + "rht.prod_ver": "7.10", "version": "${APP_VERSION}" } }, @@ -301,7 +301,7 @@ "name": "APP_NAME", "displayName": "Application Name", "description": "The name assigned to the application.", - "value": "s2i-fuse78-spring-boot-2-camel-rest-3scale", + "value": "s2i-fuse710-spring-boot-2-camel-rest-3scale", "required": true }, { @@ -315,7 +315,7 @@ "name": "GIT_REF", "displayName": "Git Reference", "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", - "value": "spring-boot-camel-rest-3scale-7.8.0.fuse-sb2-780043-redhat-00001" + "value": "spring-boot-camel-rest-3scale-7.10.0.fuse-sb2-7_10_0-00014-redhat-00001" }, { "name": "SERVICE_NAME", @@ -323,23 +323,29 @@ "description": "Exposed service name.", "value": "camel-rest-3scale" }, + { + "name": "BASE_IMAGE_NAME", + "displayName": "Base Image Name, JDK11 or JDK8", + "description": "The base image used. Default is fuse7-java-openshift which is JDK8 based; fuse7-java11-openshift is JDK11 based", + "value": "fuse7-java-openshift" + }, { "name": "BUILDER_VERSION", "displayName": "Builder version", "description": "The version of the FIS S2I builder image to use.", - "value": "1.8" + "value": "1.10" }, { "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "7.8.0.fuse-sb2-780043-redhat-00001" + "value": "7.10.0.fuse-sb2-7_10_0-00014-redhat-00001" }, { "name": "MAVEN_ARGS", "displayName": "Maven Arguments", "description": "Arguments passed to mvn in the build.", - "value": "package -DskipTests -Dfabric8.skip -e -B" + "value": "package -DskipTests -Djkube.skip -e -B" }, { "name": "MAVEN_ARGS_APPEND", @@ -414,6 +420,6 @@ } ], "labels": { - "template": "s2i-fuse78-spring-boot-2-camel-rest-3scale" + "template": "s2i-fuse710-spring-boot-2-camel-rest-3scale" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel-xml.json b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel-xml.json similarity index 91% rename from assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel-xml.json rename to assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel-xml.json index 83c9cb794..5c984d6ae 100755 --- a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel-xml.json +++ b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel-xml.json @@ -2,15 +2,15 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "s2i-fuse78-spring-boot-2-camel-xml", + "name": "s2i-fuse710-spring-boot-2-camel-xml", "creationTimestamp": null, "annotations": { "description": "Spring Boot 2 and Camel Xml QuickStart. This example demonstrates how you can use Apache Camel with Spring Boot 2 on OpenShift. The quickstart uses Spring Boot 2 to configure an application which includes a Camel route (in Spring xml) that triggers a message every 5th second, and routes the message to a log.", "iconClass": "icon-rh-integration", - "openshift.io/display-name": "Red Hat Fuse 7.8 Camel XML DSL with Spring Boot 2", + "openshift.io/display-name": "Red Hat Fuse 7.10 Camel XML DSL with Spring Boot 2", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "quickstart,java,springboot,fis,jboss-fuse", - "version": "1.8" + "version": "1.10" } }, "objects": [ @@ -96,7 +96,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "fuse7-java-openshift:${BUILDER_VERSION}", + "name": "${BASE_IMAGE_NAME}:${BUILDER_VERSION}", "namespace": "${IMAGE_STREAM_NAMESPACE}" }, "incremental": true @@ -166,7 +166,7 @@ "rht.comp": "${APP_NAME}", "rht.comp_ver": "${APP_VERSION}", "rht.prod_name": "Red_Hat_Integration", - "rht.prod_ver": "7.8", + "rht.prod_ver": "7.10", "version": "${APP_VERSION}" } }, @@ -245,7 +245,7 @@ "name": "APP_NAME", "displayName": "Application Name", "description": "The name assigned to the application.", - "value": "s2i-fuse78-spring-boot-2-camel-xml", + "value": "s2i-fuse710-spring-boot-2-camel-xml", "required": true }, { @@ -259,25 +259,31 @@ "name": "GIT_REF", "displayName": "Git Reference", "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", - "value": "spring-boot-camel-xml-7.8.0.fuse-sb2-780041-redhat-00001" + "value": "spring-boot-camel-xml-7.10.0.fuse-sb2-7_10_0-00014-redhat-00001" + }, + { + "name": "BASE_IMAGE_NAME", + "displayName": "Base Image Name, JDK11 or JDK8", + "description": "The base image used. Default is fuse7-java-openshift which is JDK8 based; fuse7-java11-openshift is JDK11 based", + "value": "fuse7-java-openshift" }, { "name": "BUILDER_VERSION", "displayName": "Builder version", "description": "The version of the FIS S2I builder image to use.", - "value": "1.8" + "value": "1.10" }, { "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "7.8.0.fuse-sb2-780041-redhat-00001" + "value": "7.10.0.fuse-sb2-7_10_0-00014-redhat-00001" }, { "name": "MAVEN_ARGS", "displayName": "Maven Arguments", "description": "Arguments passed to mvn in the build.", - "value": "package -DskipTests -Dfabric8.skip -e -B" + "value": "package -DskipTests -Djkube.skip -e -B" }, { "name": "MAVEN_ARGS_APPEND", @@ -352,6 +358,6 @@ } ], "labels": { - "template": "s2i-fuse78-spring-boot-2-camel-xml" + "template": "s2i-fuse710-spring-boot-2-camel-xml" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel.json b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel.json similarity index 91% rename from assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel.json rename to assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel.json index 1eced8cc1..0f72b0090 100755 --- a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse78-spring-boot-2-camel.json +++ b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse710-spring-boot-2-camel.json @@ -2,15 +2,15 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "s2i-fuse78-spring-boot-2-camel", + "name": "s2i-fuse710-spring-boot-2-camel", "creationTimestamp": null, "annotations": { "description": "Spring Boot 2 and Camel QuickStart. This example demonstrates how you can use Apache Camel with Spring Boot 2 on OpenShift. The quickstart uses Spring Boot to configure an application which includes a Camel route that triggers a message every 5th second, and routes the message to a log.", "iconClass": "icon-rh-integration", - "openshift.io/display-name": "Red Hat Fuse 7.8 Camel with Spring Boot 2", + "openshift.io/display-name": "Red Hat Fuse 7.10 Camel with Spring Boot 2", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "quickstart,java,springboot,fis,jboss-fuse", - "version": "1.8" + "version": "1.10" } }, "objects": [ @@ -96,7 +96,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "fuse7-java-openshift:${BUILDER_VERSION}", + "name": "${BASE_IMAGE_NAME}:${BUILDER_VERSION}", "namespace": "${IMAGE_STREAM_NAMESPACE}" }, "incremental": true @@ -166,7 +166,7 @@ "rht.comp": "${APP_NAME}", "rht.comp_ver": "${APP_VERSION}", "rht.prod_name": "Red_Hat_Integration", - "rht.prod_ver": "7.8", + "rht.prod_ver": "7.10", "version": "${APP_VERSION}" } }, @@ -245,7 +245,7 @@ "name": "APP_NAME", "displayName": "Application Name", "description": "The name assigned to the application.", - "value": "s2i-fuse78-spring-boot-2-camel", + "value": "s2i-fuse710-spring-boot-2-camel", "required": true }, { @@ -259,25 +259,31 @@ "name": "GIT_REF", "displayName": "Git Reference", "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", - "value": "spring-boot-camel-7.8.0.fuse-sb2-780031-redhat-00001" + "value": "spring-boot-camel-7.10.0.fuse-sb2-7_10_0-00014-redhat-00001" + }, + { + "name": "BASE_IMAGE_NAME", + "displayName": "Base Image Name, JDK11 or JDK8", + "description": "The base image used. Default is fuse7-java-openshift which is JDK8 based; fuse7-java11-openshift is JDK11 based", + "value": "fuse7-java-openshift" }, { "name": "BUILDER_VERSION", "displayName": "Builder version", "description": "The version of the FIS S2I builder image to use.", - "value": "1.8" + "value": "1.10" }, { "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "7.8.0.fuse-sb2-780031-redhat-00001" + "value": "7.10.0.fuse-sb2-7_10_0-00014-redhat-00001" }, { "name": "MAVEN_ARGS", "displayName": "Maven Arguments", "description": "Arguments passed to mvn in the build.", - "value": "package -DskipTests -Dfabric8.skip -e -B" + "value": "package -DskipTests -Djkube.skip -e -B" }, { "name": "MAVEN_ARGS_APPEND", @@ -352,6 +358,6 @@ } ], "labels": { - "template": "s2i-fuse78-spring-boot-2-camel" + "template": "s2i-fuse710-spring-boot-2-camel" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/golang/imagestreams/golang-rhel.json b/assets/operator/ocp-x86_64/golang/imagestreams/golang-rhel.json index 3cfd1a0f7..f8254727e 100755 --- a/assets/operator/ocp-x86_64/golang/imagestreams/golang-rhel.json +++ b/assets/operator/ocp-x86_64/golang/imagestreams/golang-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "golang", "creationTimestamp": null, @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.14.7-ubi8" + "name": "1.16.7-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,11 +35,11 @@ } }, { - "name": "1.14.7-ubi8", + "name": "1.16.7-ubi8", "annotations": { "description": "Build and run Go applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.14.7 (UBI 8)", + "openshift.io/display-name": "Go 1.16.7 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -47,7 +47,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/go-toolset:1.14.7" + "name": "registry.redhat.io/ubi8/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,11 @@ } }, { - "name": "1.13.4-ubi7", + "name": "1.16.7-ubi7", "annotations": { "description": "Build and run Go applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.13.4 (UBI 7)", + "openshift.io/display-name": "Go 1.16.7 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -68,7 +68,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/go-toolset:1.13.4" + "name": "registry.redhat.io/ubi7/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/httpd/imagestreams/httpd-rhel.json b/assets/operator/ocp-x86_64/httpd/imagestreams/httpd-rhel.json index eab177e10..ba29caaba 100755 --- a/assets/operator/ocp-x86_64/httpd/imagestreams/httpd-rhel.json +++ b/assets/operator/ocp-x86_64/httpd/imagestreams/httpd-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "httpd", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json b/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json index d9d9d2197..f125e8135 100755 --- a/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "httpd-example", "creationTimestamp": null, @@ -41,7 +41,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -65,7 +65,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -122,7 +122,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/java/imagestreams/java-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/java-rhel-x86_64.json index e60982c2e..8760a3a47 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/java-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/java-rhel-x86_64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "java", "creationTimestamp": null, @@ -150,6 +150,28 @@ "type": "Local" } }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:17,java", + "tags": "builder,java,openjdk", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-17:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { @@ -164,7 +186,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "openjdk-11-ubi8" + "name": "openjdk-17-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/java-runtime-ubi.json b/assets/operator/ocp-x86_64/java/imagestreams/java-runtime-ubi.json new file mode 100755 index 000000000..fd9e66c02 --- /dev/null +++ b/assets/operator/ocp-x86_64/java/imagestreams/java-runtime-ubi.json @@ -0,0 +1,102 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "java-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK Runtime", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "openjdk-8-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java:8,openjdk,ubi8", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java:11,openjdk,ubi8", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java:17,openjdk,ubi8", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Java Runtime (Latest)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java", + "tags": "java,openjdk", + "version": "latest" + }, + "from": { + "kind": "ImageStreamTag", + "name": "openjdk-17-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json index 389db83b6..19197533f 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "openjdk-11-rhel7", "creationTimestamp": null, @@ -61,6 +61,28 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11", + "tags": "builder,java,openjdk,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel8-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel8-rhel-x86_64.json index 8961e3a9e..c6cf30eab 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel8-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel8-rhel-x86_64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "openjdk-11-rhel8", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json index 533089a24..7ba737b1a 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "redhat-openjdk18-openshift", "creationTimestamp": null, @@ -215,6 +215,28 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8", + "tags": "builder,java,openjdk,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json index f11b518c0..153c547c1 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ubi8-openjdk-11", "creationTimestamp": null, @@ -38,6 +38,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json new file mode 100755 index 000000000..1adfce208 --- /dev/null +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -0,0 +1,64 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-11-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json index a43f915cc..896bf3cb6 100755 --- a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ubi8-openjdk-8", "creationTimestamp": null, @@ -38,6 +38,27 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.10", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "builder,java,openjdk,ubi8,hidden", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json new file mode 100755 index 000000000..907431810 --- /dev/null +++ b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -0,0 +1,60 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-8-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/java/templates/openjdk-web-basic-s2i.json b/assets/operator/ocp-x86_64/java/templates/openjdk-web-basic-s2i.json index 26ff0aa62..719d671ca 100755 --- a/assets/operator/ocp-x86_64/java/templates/openjdk-web-basic-s2i.json +++ b/assets/operator/ocp-x86_64/java/templates/openjdk-web-basic-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "openjdk-web-basic-s2i", "creationTimestamp": null, @@ -47,7 +47,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -135,7 +135,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-base-rhel.json b/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-base-rhel.json index 63c5d8cf9..9fd029518 100755 --- a/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-base-rhel.json +++ b/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-base-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-base", "creationTimestamp": null diff --git a/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-maven-rhel.json b/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-maven-rhel.json index 205d1f29a..6001705b3 100755 --- a/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-maven-rhel.json +++ b/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-maven-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-maven", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json b/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json index 5122df528..77a0cb014 100755 --- a/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json +++ b/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-agent-nodejs-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-nodejs", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-rhel.json b/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-rhel.json index c33eea6dd..e131286b8 100755 --- a/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-rhel.json +++ b/assets/operator/ocp-x86_64/jenkins/imagestreams/jenkins-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json index e41ac805f..d14157583 100755 --- a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json +++ b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -356,6 +356,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral.json b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral.json index 7ed8adf1b..b04448e8e 100755 --- a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -324,6 +324,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent-monitored.json b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent-monitored.json index 0da638332..a995d54dd 100755 --- a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent-monitored.json +++ b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via Prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -390,6 +390,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent.json b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent.json index ab747d40a..d2a17d748 100755 --- a/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/ocp-x86_64/jenkins/templates/jenkins-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -358,6 +358,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/ocp-x86_64/mariadb/imagestreams/mariadb-rhel.json b/assets/operator/ocp-x86_64/mariadb/imagestreams/mariadb-rhel.json index 09e5ef6d1..2e8909b57 100755 --- a/assets/operator/ocp-x86_64/mariadb/imagestreams/mariadb-rhel.json +++ b/assets/operator/ocp-x86_64/mariadb/imagestreams/mariadb-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mariadb", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json index b3cc99ff1..411af8bb4 100755 --- a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-ephemeral", "creationTimestamp": null, @@ -58,7 +58,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json index 9af30abbe..856a37b6c 100755 --- a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/mysql/imagestreams/mysql-rhel.json b/assets/operator/ocp-x86_64/mysql/imagestreams/mysql-rhel.json index 14ceb6a0f..11181fbea 100755 --- a/assets/operator/ocp-x86_64/mysql/imagestreams/mysql-rhel.json +++ b/assets/operator/ocp-x86_64/mysql/imagestreams/mysql-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mysql", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json index e6fceb378..3ef5f630d 100755 --- a/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-ephemeral", "creationTimestamp": null, @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json b/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json index 6e36f9871..61d5eaf1b 100755 --- a/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/nginx/imagestreams/nginx-rhel.json b/assets/operator/ocp-x86_64/nginx/imagestreams/nginx-rhel.json index 8e161e6c1..6dd541818 100755 --- a/assets/operator/ocp-x86_64/nginx/imagestreams/nginx-rhel.json +++ b/assets/operator/ocp-x86_64/nginx/imagestreams/nginx-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nginx", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.18-ubi8" + "name": "1.20-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "1.18-ubi8", + "name": "1.20-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-118:latest" + "name": "registry.redhat.io/ubi8/nginx-120:latest" }, "generation": null, "importPolicy": {}, @@ -57,20 +57,20 @@ } }, { - "name": "1.18-ubi7", + "name": "1.20-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nginx-118:latest" + "name": "registry.redhat.io/ubi7/nginx-120:latest" }, "generation": null, "importPolicy": {}, @@ -79,20 +79,20 @@ } }, { - "name": "1.16-el8", + "name": "1.18-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (RHEL 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/nginx-116:latest" + "name": "registry.redhat.io/ubi8/nginx-118:latest" }, "generation": null, "importPolicy": {}, @@ -101,42 +101,20 @@ } }, { - "name": "1.16-el7", + "name": "1.18-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (RHEL 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nginx-116-rhel7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "1.16", - "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", - "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx,hidden", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nginx-116-rhel7:latest" + "name": "registry.redhat.io/ubi7/nginx-118:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json b/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json index 9586e7adf..ad203770f 100755 --- a/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "nginx-example", "creationTimestamp": null, @@ -40,7 +40,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -57,7 +57,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -124,7 +124,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16-el8 by default).", - "value": "1.16-el8", + "description": "Version of NGINX image to be used (1.20-el8 by default).", + "value": "1.20-el8", "required": true }, { diff --git a/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json b/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json index f212ede43..7c36c7f1c 100755 --- a/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nodejs", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", + "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", "iconClass": "icon-nodejs", "openshift.io/display-name": "Node.js (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "14-ubi8" + "name": "16-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,19 +35,19 @@ } }, { - "name": "14-ubi8", + "name": "16-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14:latest" + "name": "registry.redhat.io/ubi8/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -56,19 +56,19 @@ } }, { - "name": "14-ubi8-minimal", + "name": "16-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" + "name": "registry.redhat.io/ubi8/nodejs-16-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +77,19 @@ } }, { - "name": "14-ubi7", + "name": "14-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 7)", + "openshift.io/display-name": "Node.js 14 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs,hidden", + "tags": "builder,nodejs", "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nodejs-14:latest" + "name": "registry.redhat.io/ubi8/nodejs-14:latest" }, "generation": null, "importPolicy": {}, @@ -98,40 +98,19 @@ } }, { - "name": "12-ubi8", + "name": "14-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 8)", + "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "12" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nodejs-12:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "12-ubi7", - "annotations": { - "description": "Build and run Node.js 12 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs,hidden", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/nodejs-12:latest" + "name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -140,19 +119,19 @@ } }, { - "name": "12", + "name": "14-ubi7", "annotations": { - "description": "Build and run Node.js 12 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12", + "openshift.io/display-name": "Node.js 14 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs,hidden", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/nodejs-12-rhel7:latest" + "name": "registry.redhat.io/ubi7/nodejs-14:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/nodejs/templates/nodejs-postgresql-example.json b/assets/operator/ocp-x86_64/nodejs/templates/nodejs-postgresql-example.json index 03caa5562..57ff1338d 100755 --- a/assets/operator/ocp-x86_64/nodejs/templates/nodejs-postgresql-example.json +++ b/assets/operator/ocp-x86_64/nodejs/templates/nodejs-postgresql-example.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/nodejs/templates/nodejs-postgresql-persistent.json b/assets/operator/ocp-x86_64/nodejs/templates/nodejs-postgresql-persistent.json index c21a5254b..5c625dee3 100755 --- a/assets/operator/ocp-x86_64/nodejs/templates/nodejs-postgresql-persistent.json +++ b/assets/operator/ocp-x86_64/nodejs/templates/nodejs-postgresql-persistent.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/perl/imagestreams/perl-rhel.json b/assets/operator/ocp-x86_64/perl/imagestreams/perl-rhel.json index e4fd38d2e..2ce2e295f 100755 --- a/assets/operator/ocp-x86_64/perl/imagestreams/perl-rhel.json +++ b/assets/operator/ocp-x86_64/perl/imagestreams/perl-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "perl", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json b/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json index d45a515ca..8d89200be 100755 --- a/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json +++ b/assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "php", "creationTimestamp": null, @@ -56,28 +56,6 @@ "type": "Local" } }, - { - "name": "7.3-ubi8", - "annotations": { - "description": "Build and run PHP 7.3 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.", - "iconClass": "icon-php", - "openshift.io/display-name": "PHP 7.3 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/cakephp-ex.git", - "supports": "php:7.3,php", - "tags": "builder,php", - "version": "7.3" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/php-73:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, { "name": "7.3-ubi7", "annotations": { diff --git a/assets/operator/ocp-x86_64/postgresql/imagestreams/postgresql-rhel.json b/assets/operator/ocp-x86_64/postgresql/imagestreams/postgresql-rhel.json index 3d1c15733..570b11ee0 100755 --- a/assets/operator/ocp-x86_64/postgresql/imagestreams/postgresql-rhel.json +++ b/assets/operator/ocp-x86_64/postgresql/imagestreams/postgresql-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "postgresql", "creationTimestamp": null, @@ -52,6 +52,26 @@ "type": "Local" } }, + { + "name": "13-el7", + "annotations": { + "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "iconClass": "icon-postgresql", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,postgresql", + "version": "13" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "12-el8", "annotations": { @@ -191,26 +211,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "9.6-el8", - "annotations": { - "description": "Provides a PostgreSQL 9.6 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 9.6 (RHEL 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql", - "version": "9.6" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-96:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }, diff --git a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json index b61755011..1a7d47325 100755 --- a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-ephemeral", "creationTimestamp": null, @@ -64,7 +64,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json index e3f752ca1..623bc36dd 100755 --- a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-persistent", "creationTimestamp": null, @@ -81,7 +81,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/python/imagestreams/python-rhel.json b/assets/operator/ocp-x86_64/python/imagestreams/python-rhel.json index 57b9036c4..390b4d49d 100755 --- a/assets/operator/ocp-x86_64/python/imagestreams/python-rhel.json +++ b/assets/operator/ocp-x86_64/python/imagestreams/python-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "python", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json b/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json index e03d3a6c1..6408ab5bc 100755 --- a/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-pgsql-persistent", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -341,7 +341,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/rails/templates/rails-postgresql-example.json b/assets/operator/ocp-x86_64/rails/templates/rails-postgresql-example.json index 9d4366f7f..a6aa97190 100755 --- a/assets/operator/ocp-x86_64/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-x86_64/rails/templates/rails-postgresql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-postgresql-example", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -324,7 +324,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/ocp-x86_64/redis/imagestreams/redis-rhel.json b/assets/operator/ocp-x86_64/redis/imagestreams/redis-rhel.json index 1d5654e0c..0d1901baf 100755 --- a/assets/operator/ocp-x86_64/redis/imagestreams/redis-rhel.json +++ b/assets/operator/ocp-x86_64/redis/imagestreams/redis-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "redis", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Provides a Redis database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Redis available on OpenShift, including major version updates.", + "description": "Provides a Redis database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Redis available on OpenShift, including major version updates.", "iconClass": "icon-redis", "openshift.io/display-name": "Redis (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -24,7 +24,47 @@ }, "from": { "kind": "ImageStreamTag", - "name": "5-el8" + "name": "6-el8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6-el8", + "annotations": { + "description": "Provides a Redis 6 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.", + "iconClass": "icon-redis", + "openshift.io/display-name": "Redis 6 (RHEL 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "redis", + "version": "6" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhel8/redis-6:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6-el7", + "annotations": { + "description": "Provides a Redis 6 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md.", + "iconClass": "icon-redis", + "openshift.io/display-name": "Redis 6 (RHEL 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "redis", + "version": "6" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhscl/redis-6-rhel7:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json b/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json index e9af758bd..104f1f03c 100755 --- a/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-ephemeral", "creationTimestamp": null, @@ -60,7 +60,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json b/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json index 68ee70a6c..d1f4ed9d6 100755 --- a/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-persistent", "creationTimestamp": null, @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/ocp-x86_64/rhdm/imagestreams/rhdm-decisioncentral-rhel8.json b/assets/operator/ocp-x86_64/rhdm/imagestreams/rhdm-decisioncentral-rhel8.json index 878a54e61..b0945b444 100755 --- a/assets/operator/ocp-x86_64/rhdm/imagestreams/rhdm-decisioncentral-rhel8.json +++ b/assets/operator/ocp-x86_64/rhdm/imagestreams/rhdm-decisioncentral-rhel8.json @@ -15,17 +15,17 @@ }, "tags": [ { - "name": "7.11.0", + "name": "7.11.1", "annotations": { "description": "Red Hat Decision Manager 7.11 - Decision Central image.", "iconClass": "icon-jboss", "supports": "rhdm:7.11", "tags": "rhdm", - "version": "7.11.0" + "version": "7.11.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.11.0" + "name": "registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8:7.11.1" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/rhdm/imagestreams/rhdm-kieserver-rhel8.json b/assets/operator/ocp-x86_64/rhdm/imagestreams/rhdm-kieserver-rhel8.json index 412abab23..7793264cd 100755 --- a/assets/operator/ocp-x86_64/rhdm/imagestreams/rhdm-kieserver-rhel8.json +++ b/assets/operator/ocp-x86_64/rhdm/imagestreams/rhdm-kieserver-rhel8.json @@ -15,17 +15,17 @@ }, "tags": [ { - "name": "7.11.0", + "name": "7.11.1", "annotations": { "description": "Red Hat Decision Manager 7.11 - KIE Server image.", "iconClass": "icon-jboss", "supports": "rhdm:7.11", "tags": "rhdm", - "version": "7.11.0" + "version": "7.11.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.11.0" + "name": "registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8:7.11.1" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-authoring-ha.json b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-authoring-ha.json index 17bcdd741..9e62df2ff 100755 --- a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-authoring-ha.json +++ b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-authoring-ha.json @@ -1824,8 +1824,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-authoring.json b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-authoring.json index 86c508247..a41d471df 100755 --- a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-authoring.json +++ b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-authoring.json @@ -1224,8 +1224,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-kieserver.json b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-kieserver.json index 803b15fbe..982e30e12 100755 --- a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-kieserver.json +++ b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-kieserver.json @@ -657,8 +657,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-prod-immutable-kieserver-amq.json b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-prod-immutable-kieserver-amq.json index e113bdb44..e194cee45 100755 --- a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-prod-immutable-kieserver-amq.json +++ b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-prod-immutable-kieserver-amq.json @@ -1203,8 +1203,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-prod-immutable-kieserver.json b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-prod-immutable-kieserver.json index 7d13b275e..444774ca0 100755 --- a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-prod-immutable-kieserver.json +++ b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-prod-immutable-kieserver.json @@ -706,8 +706,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-trial-ephemeral.json b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-trial-ephemeral.json index 6f9a73480..712ec5b26 100755 --- a/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-trial-ephemeral.json +++ b/assets/operator/ocp-x86_64/rhdm/templates/rhdm711-trial-ephemeral.json @@ -989,8 +989,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-businesscentral-monitoring-rhel8.json b/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-businesscentral-monitoring-rhel8.json index 68067861e..d3e143f4c 100755 --- a/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-businesscentral-monitoring-rhel8.json +++ b/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-businesscentral-monitoring-rhel8.json @@ -15,17 +15,17 @@ }, "tags": [ { - "name": "7.11.0", + "name": "7.11.1", "annotations": { "description": "Red Hat Process Automation Manager 7.11 - Business Central Monitoring image.", "iconClass": "icon-jboss", "supports": "rhpam:7.11", "tags": "rhpam", - "version": "7.11.0" + "version": "7.11.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.11.0" + "name": "registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8:7.11.1" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-businesscentral-rhel8.json b/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-businesscentral-rhel8.json index 0eefadfee..6a9e817df 100755 --- a/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-businesscentral-rhel8.json +++ b/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-businesscentral-rhel8.json @@ -15,17 +15,17 @@ }, "tags": [ { - "name": "7.11.0", + "name": "7.11.1", "annotations": { "description": "Red Hat Process Automation Manager 7.11 - Business Central image.", "iconClass": "icon-jboss", "supports": "rhpam:7.11", "tags": "rhpam", - "version": "7.11.0" + "version": "7.11.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.11.0" + "name": "registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8:7.11.1" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-kieserver-rhel8.json b/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-kieserver-rhel8.json index bf04b800c..89f57c1d8 100755 --- a/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-kieserver-rhel8.json +++ b/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-kieserver-rhel8.json @@ -15,17 +15,17 @@ }, "tags": [ { - "name": "7.11.0", + "name": "7.11.1", "annotations": { "description": "Red Hat Process Automation Manager 7.11 - KIE Server image.", "iconClass": "icon-jboss", "supports": "rhpam:7.11", "tags": "rhpam", - "version": "7.11.0" + "version": "7.11.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.11.0" + "name": "registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8:7.11.1" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-smartrouter-rhel8.json b/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-smartrouter-rhel8.json index b8c834783..8980a8805 100755 --- a/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-smartrouter-rhel8.json +++ b/assets/operator/ocp-x86_64/rhpam/imagestreams/rhpam-smartrouter-rhel8.json @@ -15,17 +15,17 @@ }, "tags": [ { - "name": "7.11.0", + "name": "7.11.1", "annotations": { "description": "Red Hat Process Automation Manager 7.11 - Smart Router image.", "iconClass": "icon-jboss", "supports": "rhpam:7.11", "tags": "rhpam", - "version": "7.11.0" + "version": "7.11.1" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.11.0" + "name": "registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8:7.11.1" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-authoring-ha.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-authoring-ha.json index 00732a6ff..f9cac3844 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-authoring-ha.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-authoring-ha.json @@ -2087,8 +2087,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-authoring.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-authoring.json index b88b18966..6a0a2c986 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-authoring.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-authoring.json @@ -1316,8 +1316,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-externaldb.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-externaldb.json index da0e32c6e..9a8cea668 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-externaldb.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-externaldb.json @@ -834,8 +834,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { @@ -937,8 +937,8 @@ { "name": "EXTENSIONS_IMAGE", "displayName": "Drivers Extension Image", - "description": "ImageStreamTag definition for the image containing the drivers and configuration. For example, custom-driver-image:7.11.0.", - "value": "custom-driver-extension:7.11.0", + "description": "ImageStreamTag definition for the image containing the drivers and configuration. For example, custom-driver-image:7.11.1.", + "value": "custom-driver-extension:7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-mysql.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-mysql.json index 0f4ba69f2..1c87651eb 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-mysql.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-mysql.json @@ -892,8 +892,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-postgresql.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-postgresql.json index df1001bff..0e348ba62 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-postgresql.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-kieserver-postgresql.json @@ -891,8 +891,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-managed.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-managed.json index 84a26cbd1..613ee7d62 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-managed.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-managed.json @@ -1381,8 +1381,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-kieserver-amq.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-kieserver-amq.json index cc646d58f..ff0e1aa6d 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-kieserver-amq.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-kieserver-amq.json @@ -1457,8 +1457,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-kieserver.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-kieserver.json index da7b8cfd7..8be633e78 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-kieserver.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-kieserver.json @@ -936,8 +936,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-monitor.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-monitor.json index 164595838..c30f8d235 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-monitor.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod-immutable-monitor.json @@ -962,8 +962,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0" + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1" }, { "name": "SMART_ROUTER_HOSTNAME_HTTP", diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod.json index ef4e6b9e7..80dc3eda0 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-prod.json @@ -2391,8 +2391,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-trial-ephemeral.json b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-trial-ephemeral.json index 2a79a0af2..caf236a63 100755 --- a/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-trial-ephemeral.json +++ b/assets/operator/ocp-x86_64/rhpam/templates/rhpam711-trial-ephemeral.json @@ -989,8 +989,8 @@ { "name": "IMAGE_STREAM_TAG", "displayName": "ImageStream Tag", - "description": "A named pointer to an image in an image stream. Default is \"7.11.0\".", - "value": "7.11.0", + "description": "A named pointer to an image in an image stream. Default is \"7.11.1\".", + "value": "7.11.1", "required": true }, { diff --git a/assets/operator/ocp-x86_64/ruby/imagestreams/ruby-rhel.json b/assets/operator/ocp-x86_64/ruby/imagestreams/ruby-rhel.json index aa1bcfd00..ed2eb1c22 100755 --- a/assets/operator/ocp-x86_64/ruby/imagestreams/ruby-rhel.json +++ b/assets/operator/ocp-x86_64/ruby/imagestreams/ruby-rhel.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ruby", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/2.7/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", + "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/3.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", "iconClass": "icon-ruby", "openshift.io/display-name": "Ruby (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "2.7-ubi8" + "name": "3.0-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "2.7-ubi8", + "name": "3.0-ubi8", "annotations": { - "description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.", + "description": "Build and run Ruby 3.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Ruby 2.7 (UBI 8)", + "openshift.io/display-name": "Ruby 3.0 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/ruby-ex.git", - "supports": "ruby:2.7,ruby", + "supports": "ruby:3.0,ruby", "tags": "builder,ruby", - "version": "2.7" + "version": "3.0" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/ruby-27:latest" + "name": "registry.redhat.io/ubi8/ruby-30:latest" }, "generation": null, "importPolicy": {}, @@ -78,6 +78,28 @@ "type": "Local" } }, + { + "name": "2.7-ubi8", + "annotations": { + "description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.", + "iconClass": "icon-ruby", + "openshift.io/display-name": "Ruby 2.7 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/ruby-ex.git", + "supports": "ruby:2.7,ruby", + "tags": "builder,ruby", + "version": "2.7" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/ruby-27:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "2.7-ubi7", "annotations": { diff --git a/assets/operator/ocp-x86_64/sso/imagestreams/sso74-openshift-rhel8.json b/assets/operator/ocp-x86_64/sso/imagestreams/sso74-openshift-rhel8.json index cc949a22e..28017a733 100755 --- a/assets/operator/ocp-x86_64/sso/imagestreams/sso74-openshift-rhel8.json +++ b/assets/operator/ocp-x86_64/sso/imagestreams/sso74-openshift-rhel8.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "sso74-openshift-rhel8", "creationTimestamp": null, @@ -8,7 +8,7 @@ "description": "Red Hat Single Sign-On 7.4 on OpenJDK", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJDK", "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "spec": { diff --git a/assets/operator/ocp-x86_64/sso/imagestreams/sso75-openshift-rhel8.json b/assets/operator/ocp-x86_64/sso/imagestreams/sso75-openshift-rhel8.json new file mode 100755 index 000000000..e3ccd9adf --- /dev/null +++ b/assets/operator/ocp-x86_64/sso/imagestreams/sso75-openshift-rhel8.json @@ -0,0 +1,57 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "sso75-openshift-rhel8", + "creationTimestamp": null, + "annotations": { + "description": "Red Hat Single Sign-On 7.5 on OpenJDK", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "7.5.0.GA" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "ImageStreamTag", + "name": "7.5" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "" + } + }, + { + "name": "7.5", + "annotations": { + "description": "Red Hat Single Sign-On 7.5 on OpenJDK image", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK", + "supports": "sso:7.5", + "tags": "sso,keycloak,redhat,hidden", + "version": "1.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rh-sso-7/sso75-openshift-rhel8:7.5" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso74-https.json b/assets/operator/ocp-x86_64/sso/templates/sso74-https.json index 8497cac22..fdce924e2 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso74-https.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso74-https.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-https", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJDK (Ephemeral with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJDK server based deployment, securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -93,7 +93,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -113,7 +113,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -136,7 +136,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -539,7 +539,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso74-ocp4-x509-https.json b/assets/operator/ocp-x86_64/sso/templates/sso74-ocp4-x509-https.json index c29628e00..ba2c582c5 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso74-ocp4-x509-https.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso74-ocp4-x509-https.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-ocp4-x509-https", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJDK (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJDK server based deployment, securing RH-SSO communication using re-encrypt TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", @@ -85,7 +85,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -107,7 +107,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -387,7 +387,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-ocp4-x509-https" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso74-ocp4-x509-postgresql-persistent.json b/assets/operator/ocp-x86_64/sso/templates/sso74-ocp4-x509-postgresql-persistent.json index 5ff34431d..2b4e11926 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso74-ocp4-x509-postgresql-persistent.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso74-ocp4-x509-postgresql-persistent.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-ocp4-x509-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJDK + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJDK server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -132,7 +132,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -354,7 +354,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -635,7 +635,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso74-postgresql-persistent.json b/assets/operator/ocp-x86_64/sso/templates/sso74-postgresql-persistent.json index 30a0fe3d4..ff5ba02a5 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso74-postgresql-persistent.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso74-postgresql-persistent.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJDK + PostgreSQL (Persistent with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJDK server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -119,7 +119,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -162,7 +162,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -432,7 +432,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -788,7 +788,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso74-postgresql.json b/assets/operator/ocp-x86_64/sso/templates/sso74-postgresql.json index d54429352..2dbda12b5 100755 --- a/assets/operator/ocp-x86_64/sso/templates/sso74-postgresql.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso74-postgresql.json @@ -1,11 +1,11 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "sso74-postgresql", "creationTimestamp": null, "annotations": { - "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-dev/docs.", + "description": "An example application based on RH-SSO 7.4 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso74-cpaas-dev/docs.", "iconClass": "icon-sso", "openshift.io/display-name": "Red Hat Single Sign-On 7.4 on OpenJDK + PostgreSQL (Ephemeral with passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -13,7 +13,7 @@ "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.4 on OpenJDK server based deployment, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "7.4.7.GA" + "version": "7.4.10.GA" } }, "message": "A new RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", @@ -122,7 +122,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -143,7 +143,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -167,7 +167,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -439,7 +439,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -766,7 +766,7 @@ } ], "labels": { - "rhsso": "7.4.7.GA", + "rhsso": "7.4.10.GA", "template": "sso74-postgresql" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso75-https.json b/assets/operator/ocp-x86_64/sso/templates/sso75-https.json new file mode 100755 index 000000000..8d8cbb49d --- /dev/null +++ b/assets/operator/ocp-x86_64/sso/templates/sso75-https.json @@ -0,0 +1,545 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-https", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK (Ephemeral with passthrough TLS)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJDK server based deployment, securing RH-SSO communication using passthrough TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", + "objects": [ + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's http port." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-http", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's http service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTP}", + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTPS}", + "tls": { + "termination": "passthrough" + }, + "to": { + "name": "secure-${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "HTTPS_KEYSTORE_DIR", + "value": "/etc/eap-secret-volume" + }, + { + "name": "HTTPS_KEYSTORE", + "value": "${HTTPS_KEYSTORE}" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "value": "${HTTPS_KEYSTORE_TYPE}" + }, + { + "name": "HTTPS_NAME", + "value": "${HTTPS_NAME}" + }, + { + "name": "HTTPS_PASSWORD", + "value": "${HTTPS_PASSWORD}" + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "value": "${JGROUPS_ENCRYPT_SECRET}" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", + "value": "/etc/jgroups-encrypt-secret-volume" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "value": "${JGROUPS_ENCRYPT_KEYSTORE}" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "value": "${JGROUPS_ENCRYPT_NAME}" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "value": "${JGROUPS_ENCRYPT_PASSWORD}" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/eap-secret-volume", + "name": "eap-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/jgroups-encrypt-secret-volume", + "name": "eap-jgroups-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "eap-keystore-volume", + "secret": { + "secretName": "${HTTPS_SECRET}" + } + }, + { + "name": "eap-jgroups-keystore-volume", + "secret": { + "secretName": "${JGROUPS_ENCRYPT_SECRET}" + } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "HOSTNAME_HTTPS", + "displayName": "Custom https Route Hostname", + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "HTTPS_SECRET", + "displayName": "Server Keystore Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "HTTPS_KEYSTORE", + "displayName": "Server Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "keystore.jks" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "displayName": "Server Keystore Type", + "description": "The type of the keystore file (JKS or JCEKS)" + }, + { + "name": "HTTPS_NAME", + "displayName": "Server Certificate Name", + "description": "The name associated with the server certificate (e.g. jboss)" + }, + { + "name": "HTTPS_PASSWORD", + "displayName": "Server Keystore Password", + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "displayName": "JGroups Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "displayName": "JGroups Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "jgroups.jceks" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "displayName": "JGroups Certificate Name", + "description": "The name associated with the server certificate (e.g. secret-key)" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "displayName": "JGroups Keystore Password", + "description": "The password for the keystore and certificate (e.g. password)" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "JGroups cluster password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" + }, + { + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-https" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso75-ocp4-x509-https.json b/assets/operator/ocp-x86_64/sso/templates/sso75-ocp4-x509-https.json new file mode 100755 index 000000000..fbff735b3 --- /dev/null +++ b/assets/operator/ocp-x86_64/sso/templates/sso75-ocp4-x509-https.json @@ -0,0 +1,393 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-ocp4-x509-https", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK (Ephemeral)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJDK server based deployment, securing RH-SSO communication using re-encrypt TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", + "objects": [ + { + "apiVersion": "v1", + "kind": "ConfigMap", + "metadata": { + "annotations": { + "description": "ConfigMap providing service ca bundle.", + "service.beta.openshift.io/inject-cabundle": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-service-ca" + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-https-secret" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "tls": { + "termination": "reencrypt" + }, + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "X509_CA_BUNDLE", + "value": "/var/run/configmaps/service-ca/service-ca.crt /var/run/secrets/kubernetes.io/serviceaccount/ca.crt" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/x509/https", + "name": "sso-x509-https-volume", + "readOnly": true + }, + { + "mountPath": "/etc/x509/jgroups", + "name": "sso-x509-jgroups-volume", + "readOnly": true + }, + { + "mountPath": "/var/run/configmaps/service-ca", + "name": "service-ca", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "sso-x509-https-volume", + "secret": { + "secretName": "sso-x509-https-secret" + } + }, + { + "name": "sso-x509-jgroups-volume", + "secret": { + "secretName": "sso-x509-jgroups-secret" + } + }, + { + "configMap": { + "name": "${APPLICATION_NAME}-service-ca" + }, + "name": "service-ca" + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "The password for the JGroups cluster.", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", + "required": true + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server admininistrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-ocp4-x509-https" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-postgresql-s2i.json b/assets/operator/ocp-x86_64/sso/templates/sso75-ocp4-x509-postgresql-persistent.json similarity index 57% rename from assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-postgresql-s2i.json rename to assets/operator/ocp-x86_64/sso/templates/sso75-ocp4-x509-postgresql-persistent.json index 2f03320c1..386d3a105 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-postgresql-s2i.json +++ b/assets/operator/ocp-x86_64/sso/templates/sso75-ocp4-x509-postgresql-persistent.json @@ -1,43 +1,35 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws31-tomcat7-postgresql-s2i", + "name": "sso75-ocp4-x509-postgresql-persistent", "creationTimestamp": null, "annotations": { - "description": "Application template for JWS PostgreSQL applications built using S2I.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + PostgreSQL (Ephemeral with https)", + "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat7,java,jboss,hidden", - "version": "1.4" + "tags": "sso,keycloak,jboss", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJDK server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" } }, - "message": "A new JWS application for Apache Tomcat 7 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.", "objects": [ { "apiVersion": "v1", - "kind": "Service", + "kind": "ConfigMap", "metadata": { "annotations": { - "description": "The web server's http port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + "description": "ConfigMap providing service ca bundle.", + "service.beta.openshift.io/inject-cabundle": "true" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } + "name": "${APPLICATION_NAME}-service-ca" } }, { @@ -46,12 +38,13 @@ "metadata": { "annotations": { "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-https-secret" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" }, "spec": { "ports": [ @@ -91,26 +84,33 @@ }, { "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", + "kind": "Service", "metadata": { "annotations": { - "description": "Route for application's http service." + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret" }, "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}-ping" }, "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" } } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -120,98 +120,19 @@ "labels": { "application": "${APPLICATION_NAME}" }, - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" }, "spec": { - "host": "${HOSTNAME_HTTPS}", "tls": { - "termination": "passthrough" + "termination": "reencrypt" }, "to": { - "name": "secure-${APPLICATION_NAME}" + "name": "${APPLICATION_NAME}" } } }, { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver31-tomcat7-openshift:1.4", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -239,6 +160,10 @@ "containers": [ { "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, { "name": "DB_SERVICE_PREFIX_MAPPING", "value": "${APPLICATION_NAME}-postgresql=DB" @@ -259,6 +184,10 @@ "name": "DB_DATABASE", "value": "${DB_DATABASE}" }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, { "name": "DB_MIN_POOL_SIZE", "value": "${DB_MIN_POOL_SIZE}" @@ -272,32 +201,58 @@ "value": "${DB_TX_ISOLATION}" }, { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" }, { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" + "name": "X509_CA_BUNDLE", + "value": "/var/run/configmaps/service-ca/service-ca.crt /var/run/secrets/kubernetes.io/serviceaccount/ca.crt" }, { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" }, { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" }, { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" }, { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" } ], "image": "${APPLICATION_NAME}", "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, "name": "${APPLICATION_NAME}", "ports": [ { @@ -314,6 +269,11 @@ "containerPort": 8443, "name": "https", "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" } ], "readinessProbe": { @@ -321,26 +281,53 @@ "command": [ "/bin/bash", "-c", - "curl --noproxy '*' -s -u ${JWS_ADMIN_USERNAME}:${JWS_ADMIN_PASSWORD} 'http://localhost:8080/manager/jmxproxy/?get=Catalina%3Atype%3DServer\u0026att=stateName' |grep -iq 'stateName *= *STARTED'" + "/opt/eap/bin/readinessProbe.sh" ] } }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, "volumeMounts": [ { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", + "mountPath": "/etc/x509/https", + "name": "sso-x509-https-volume", + "readOnly": true + }, + { + "mountPath": "/etc/x509/jgroups", + "name": "sso-x509-jgroups-volume", + "readOnly": true + }, + { + "mountPath": "/var/run/configmaps/service-ca", + "name": "service-ca", "readOnly": true } ] } ], - "terminationGracePeriodSeconds": 60, + "terminationGracePeriodSeconds": 75, "volumes": [ { - "name": "jws-certificate-volume", + "name": "sso-x509-https-volume", + "secret": { + "secretName": "sso-x509-https-secret" + } + }, + { + "name": "sso-x509-jgroups-volume", "secret": { - "secretName": "${JWS_HTTPS_SECRET}" + "secretName": "sso-x509-jgroups-secret" } + }, + { + "configMap": { + "name": "${APPLICATION_NAME}-service-ca" + }, + "name": "service-ca" } ] } @@ -354,7 +341,8 @@ ], "from": { "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" + "name": "sso75-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, "type": "ImageChange" @@ -366,7 +354,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -420,12 +408,15 @@ } ], "image": "postgresql", + "imagePullPolicy": "Always", "livenessProbe": { - "initialDelaySeconds": 30, + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, "tcpSocket": { "port": 5432 }, - "timeoutSeconds": 1 + "timeoutSeconds": 10 }, "name": "${APPLICATION_NAME}-postgresql", "ports": [ @@ -443,13 +434,15 @@ "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" ] }, - "initialDelaySeconds": 5, - "timeoutSeconds": 1 + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "timeoutSeconds": 10 }, "volumeMounts": [ { "mountPath": "/var/lib/pgsql/data", - "name": "${APPLICATION_NAME}-data" + "name": "${APPLICATION_NAME}-postgresql-pvol" } ] } @@ -457,10 +450,10 @@ "terminationGracePeriodSeconds": 60, "volumes": [ { - "emptyDir": { - "medium": "" - }, - "name": "${APPLICATION_NAME}-data" + "name": "${APPLICATION_NAME}-postgresql-pvol", + "persistentVolumeClaim": { + "claimName": "${APPLICATION_NAME}-postgresql-claim" + } } ] } @@ -485,6 +478,26 @@ } ] } + }, + { + "apiVersion": "v1", + "kind": "PersistentVolumeClaim", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql-claim" + }, + "spec": { + "accessModes": [ + "ReadWriteOnce" + ], + "resources": { + "requests": { + "storage": "${VOLUME_CAPACITY}" + } + } + } } ], "parameters": [ @@ -492,43 +505,27 @@ "name": "APPLICATION_NAME", "displayName": "Application Name", "description": "The name for the application.", - "value": "jws-app", + "value": "sso", "required": true }, { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." }, { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "The password for the JGroups cluster.", + "generate": "expression", + "from": "[a-zA-Z0-9]{32}", "required": true }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "todolist/todolist-jdbc" - }, { "name": "DB_JNDI", "displayName": "Database JNDI Name", - "description": "Database JNDI name used by application to resolve the datasource, e.g. jboss/datasources/postgresqlDS", - "value": "jboss/datasources/defaultDS" + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" }, { "name": "DB_DATABASE", @@ -537,30 +534,6 @@ "value": "root", "required": true }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, { "name": "DB_MIN_POOL_SIZE", "displayName": "Datasource Minimum Pool Size", @@ -599,67 +572,70 @@ "displayName": "Database Password", "description": "Database user password", "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "from": "[a-zA-Z0-9]{32}", "required": true }, { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "name": "VOLUME_CAPACITY", + "displayName": "Database Volume Capacity", + "description": "Size of persistent storage for database volume.", + "value": "1Gi", "required": true }, { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", "required": true }, { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", "generate": "expression", "from": "[a-zA-Z0-9]{8}", "required": true }, { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", "generate": "expression", - "from": "[a-zA-Z0-9]{8}", + "from": "[a-zA-Z0-9]{32}", "required": true }, { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." }, { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." }, { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." }, { "name": "POSTGRESQL_IMAGE_STREAM_TAG", "displayName": "PostgreSQL Image Stream Tag", "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", - "value": "9.5", + "value": "10", "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" } ], "labels": { - "jws31": "1.4", - "template": "jws31-tomcat7-postgresql-s2i" + "rhsso": "7.5.0.GA", + "template": "sso75-ocp4-x509-postgresql-persistent" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso75-postgresql-persistent.json b/assets/operator/ocp-x86_64/sso/templates/sso75-postgresql-persistent.json new file mode 100755 index 000000000..4bc8ae34d --- /dev/null +++ b/assets/operator/ocp-x86_64/sso/templates/sso75-postgresql-persistent.json @@ -0,0 +1,794 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-postgresql-persistent", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK + PostgreSQL (Persistent with passthrough TLS)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJDK server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using passthrough TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", + "objects": [ + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's http port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The database server's port." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "ports": [ + { + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-http", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's http service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTP}", + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTPS}", + "tls": { + "termination": "passthrough" + }, + "to": { + "name": "secure-${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_SERVICE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_JNDI", + "value": "${DB_JNDI}" + }, + { + "name": "DB_USERNAME", + "value": "${DB_USERNAME}" + }, + { + "name": "DB_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "DB_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "HTTPS_KEYSTORE_DIR", + "value": "/etc/eap-secret-volume" + }, + { + "name": "HTTPS_KEYSTORE", + "value": "${HTTPS_KEYSTORE}" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "value": "${HTTPS_KEYSTORE_TYPE}" + }, + { + "name": "HTTPS_NAME", + "value": "${HTTPS_NAME}" + }, + { + "name": "HTTPS_PASSWORD", + "value": "${HTTPS_PASSWORD}" + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "value": "${JGROUPS_ENCRYPT_SECRET}" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", + "value": "/etc/jgroups-encrypt-secret-volume" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "value": "${JGROUPS_ENCRYPT_KEYSTORE}" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "value": "${JGROUPS_ENCRYPT_NAME}" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "value": "${JGROUPS_ENCRYPT_PASSWORD}" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/eap-secret-volume", + "name": "eap-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/jgroups-encrypt-secret-volume", + "name": "eap-jgroups-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "eap-keystore-volume", + "secret": { + "secretName": "${HTTPS_SECRET}" + } + }, + { + "name": "eap-jgroups-keystore-volume", + "secret": { + "secretName": "${JGROUPS_ENCRYPT_SECRET}" + } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "POSTGRESQL_USER", + "value": "${DB_USERNAME}" + }, + { + "name": "POSTGRESQL_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + } + ], + "image": "postgresql", + "imagePullPolicy": "Always", + "livenessProbe": { + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "tcpSocket": { + "port": 5432 + }, + "timeoutSeconds": 10 + }, + "name": "${APPLICATION_NAME}-postgresql", + "ports": [ + { + "containerPort": 5432, + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/sh", + "-i", + "-c", + "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" + ] + }, + "failureThreshold": 3, + "initialDelaySeconds": 90, + "successThreshold:": 1, + "timeoutSeconds": 10 + }, + "volumeMounts": [ + { + "mountPath": "/var/lib/pgsql/data", + "name": "${APPLICATION_NAME}-postgresql-pvol" + } + ] + } + ], + "terminationGracePeriodSeconds": 60, + "volumes": [ + { + "name": "${APPLICATION_NAME}-postgresql-pvol", + "persistentVolumeClaim": { + "claimName": "${APPLICATION_NAME}-postgresql-claim" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}-postgresql" + ], + "from": { + "kind": "ImageStreamTag", + "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "v1", + "kind": "PersistentVolumeClaim", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-postgresql-claim" + }, + "spec": { + "accessModes": [ + "ReadWriteOnce" + ], + "resources": { + "requests": { + "storage": "${VOLUME_CAPACITY}" + } + } + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "HOSTNAME_HTTPS", + "displayName": "Custom https Route Hostname", + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "DB_JNDI", + "displayName": "Database JNDI Name", + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" + }, + { + "name": "DB_DATABASE", + "displayName": "Database Name", + "description": "Database name", + "value": "root", + "required": true + }, + { + "name": "HTTPS_SECRET", + "displayName": "Server Keystore Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "HTTPS_KEYSTORE", + "displayName": "Server Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "keystore.jks" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "displayName": "Server Keystore Type", + "description": "The type of the keystore file (JKS or JCEKS)" + }, + { + "name": "HTTPS_NAME", + "displayName": "Server Certificate Name", + "description": "The name associated with the server certificate (e.g. jboss)" + }, + { + "name": "HTTPS_PASSWORD", + "displayName": "Server Keystore Password", + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "displayName": "PostgreSQL Maximum number of connections", + "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions." + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "displayName": "PostgreSQL Shared Buffers", + "description": "Configures how much memory is dedicated to PostgreSQL for caching data." + }, + { + "name": "DB_USERNAME", + "displayName": "Database Username", + "description": "Database user name", + "generate": "expression", + "from": "user[a-zA-Z0-9]{3}", + "required": true + }, + { + "name": "DB_PASSWORD", + "displayName": "Database Password", + "description": "Database user password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "VOLUME_CAPACITY", + "displayName": "Database Volume Capacity", + "description": "Size of persistent storage for database volume.", + "value": "1Gi", + "required": true + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "displayName": "JGroups Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "displayName": "JGroups Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "jgroups.jceks" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "displayName": "JGroups Certificate Name", + "description": "The name associated with the server certificate (e.g. secret-key)" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "displayName": "JGroups Keystore Password", + "description": "The password for the keystore and certificate (e.g. password)" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "JGroups cluster password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" + }, + { + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" + }, + { + "name": "POSTGRESQL_IMAGE_STREAM_TAG", + "displayName": "PostgreSQL Image Stream Tag", + "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", + "value": "10", + "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-postgresql-persistent" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/sso/templates/sso75-postgresql.json b/assets/operator/ocp-x86_64/sso/templates/sso75-postgresql.json new file mode 100755 index 000000000..39670b8f7 --- /dev/null +++ b/assets/operator/ocp-x86_64/sso/templates/sso75-postgresql.json @@ -0,0 +1,772 @@ +{ + "kind": "Template", + "apiVersion": "template.openshift.io/v1", + "metadata": { + "name": "sso75-postgresql", + "creationTimestamp": null, + "annotations": { + "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.", + "iconClass": "icon-sso", + "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK + PostgreSQL (Ephemeral with passthrough TLS)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "sso,keycloak,jboss,hidden", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.5 on OpenJDK server based deployment, deployment configuration for PostgreSQL using ephemeral (temporary) storage, and securing RH-SSO communication using passthrough TLS.", + "template.openshift.io/support-url": "https://access.redhat.com", + "version": "7.5.0.GA" + } + }, + "message": "A new RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.", + "objects": [ + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's http port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "ports": [ + { + "port": 8443, + "targetPort": 8443 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The database server's port." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "ports": [ + { + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + } + } + }, + { + "apiVersion": "v1", + "kind": "Service", + "metadata": { + "annotations": { + "description": "The JGroups ping port for clustering.", + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true" + }, + "labels": { + "application": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}-ping" + }, + "spec": { + "clusterIP": "None", + "ports": [ + { + "name": "ping", + "port": 8888 + } + ], + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-http", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's http service." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTP}", + "to": { + "name": "${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "route.openshift.io/v1", + "id": "${APPLICATION_NAME}-https", + "kind": "Route", + "metadata": { + "annotations": { + "description": "Route for application's https service." + }, + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "secure-${APPLICATION_NAME}" + }, + "spec": { + "host": "${HOSTNAME_HTTPS}", + "tls": { + "termination": "passthrough" + }, + "to": { + "name": "secure-${APPLICATION_NAME}" + } + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "server", + "deploymentConfig": "${APPLICATION_NAME}" + }, + "name": "${APPLICATION_NAME}" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "SSO_HOSTNAME", + "value": "${SSO_HOSTNAME}" + }, + { + "name": "DB_SERVICE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_JNDI", + "value": "${DB_JNDI}" + }, + { + "name": "DB_USERNAME", + "value": "${DB_USERNAME}" + }, + { + "name": "DB_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "DB_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "TX_DATABASE_PREFIX_MAPPING", + "value": "${APPLICATION_NAME}-postgresql=DB" + }, + { + "name": "DB_MIN_POOL_SIZE", + "value": "${DB_MIN_POOL_SIZE}" + }, + { + "name": "DB_MAX_POOL_SIZE", + "value": "${DB_MAX_POOL_SIZE}" + }, + { + "name": "DB_TX_ISOLATION", + "value": "${DB_TX_ISOLATION}" + }, + { + "name": "JGROUPS_PING_PROTOCOL", + "value": "openshift.DNS_PING" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_NAME", + "value": "${APPLICATION_NAME}-ping" + }, + { + "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", + "value": "8888" + }, + { + "name": "HTTPS_KEYSTORE_DIR", + "value": "/etc/eap-secret-volume" + }, + { + "name": "HTTPS_KEYSTORE", + "value": "${HTTPS_KEYSTORE}" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "value": "${HTTPS_KEYSTORE_TYPE}" + }, + { + "name": "HTTPS_NAME", + "value": "${HTTPS_NAME}" + }, + { + "name": "HTTPS_PASSWORD", + "value": "${HTTPS_PASSWORD}" + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "value": "${JGROUPS_ENCRYPT_SECRET}" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", + "value": "/etc/jgroups-encrypt-secret-volume" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "value": "${JGROUPS_ENCRYPT_KEYSTORE}" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "value": "${JGROUPS_ENCRYPT_NAME}" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "value": "${JGROUPS_ENCRYPT_PASSWORD}" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "value": "${JGROUPS_CLUSTER_PASSWORD}" + }, + { + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" + }, + { + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" + }, + { + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, + { + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" + }, + { + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" + }, + { + "name": "SSO_TRUSTSTORE", + "value": "${SSO_TRUSTSTORE}" + }, + { + "name": "SSO_TRUSTSTORE_DIR", + "value": "/etc/sso-secret-volume" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "value": "${SSO_TRUSTSTORE_PASSWORD}" + } + ], + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "name": "${APPLICATION_NAME}", + "ports": [ + { + "containerPort": 8778, + "name": "jolokia", + "protocol": "TCP" + }, + { + "containerPort": 8080, + "name": "http", + "protocol": "TCP" + }, + { + "containerPort": 8443, + "name": "https", + "protocol": "TCP" + }, + { + "containerPort": 8888, + "name": "ping", + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "mountPath": "/etc/eap-secret-volume", + "name": "eap-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/jgroups-encrypt-secret-volume", + "name": "eap-jgroups-keystore-volume", + "readOnly": true + }, + { + "mountPath": "/etc/sso-secret-volume", + "name": "sso-truststore-volume", + "readOnly": true + } + ] + } + ], + "terminationGracePeriodSeconds": 75, + "volumes": [ + { + "name": "eap-keystore-volume", + "secret": { + "secretName": "${HTTPS_SECRET}" + } + }, + { + "name": "eap-jgroups-keystore-volume", + "secret": { + "secretName": "${JGROUPS_ENCRYPT_SECRET}" + } + }, + { + "name": "sso-truststore-volume", + "secret": { + "secretName": "${SSO_TRUSTSTORE_SECRET}" + } + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "name": "sso75-openshift-rhel8:7.5", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + }, + { + "apiVersion": "apps.openshift.io/v1", + "kind": "DeploymentConfig", + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "replicas": 1, + "selector": { + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "strategy": { + "type": "Recreate" + }, + "template": { + "metadata": { + "labels": { + "application": "${APPLICATION_NAME}", + "component": "database", + "deploymentConfig": "${APPLICATION_NAME}-postgresql" + }, + "name": "${APPLICATION_NAME}-postgresql" + }, + "spec": { + "containers": [ + { + "env": [ + { + "name": "POSTGRESQL_USER", + "value": "${DB_USERNAME}" + }, + { + "name": "POSTGRESQL_PASSWORD", + "value": "${DB_PASSWORD}" + }, + { + "name": "POSTGRESQL_DATABASE", + "value": "${DB_DATABASE}" + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_MAX_PREPARED_TRANSACTIONS", + "value": "${POSTGRESQL_MAX_CONNECTIONS}" + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "value": "${POSTGRESQL_SHARED_BUFFERS}" + } + ], + "image": "postgresql", + "imagePullPolicy": "Always", + "livenessProbe": { + "initialDelaySeconds": 30, + "tcpSocket": { + "port": 5432 + }, + "timeoutSeconds": 1 + }, + "name": "${APPLICATION_NAME}-postgresql", + "ports": [ + { + "containerPort": 5432, + "protocol": "TCP" + } + ], + "readinessProbe": { + "exec": { + "command": [ + "/bin/sh", + "-i", + "-c", + "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" + ] + }, + "initialDelaySeconds": 5, + "timeoutSeconds": 1 + }, + "volumeMounts": [ + { + "mountPath": "/var/lib/pgsql/data", + "name": "${APPLICATION_NAME}-data" + } + ] + } + ], + "terminationGracePeriodSeconds": 60, + "volumes": [ + { + "emptyDir": { + "medium": "" + }, + "name": "${APPLICATION_NAME}-data" + } + ] + } + }, + "triggers": [ + { + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}-postgresql" + ], + "from": { + "kind": "ImageStreamTag", + "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}", + "namespace": "${IMAGE_STREAM_NAMESPACE}" + } + }, + "type": "ImageChange" + }, + { + "type": "ConfigChange" + } + ] + } + } + ], + "parameters": [ + { + "name": "APPLICATION_NAME", + "displayName": "Application Name", + "description": "The name for the application.", + "value": "sso", + "required": true + }, + { + "name": "HOSTNAME_HTTP", + "displayName": "Custom http Route Hostname", + "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "HOSTNAME_HTTPS", + "displayName": "Custom https Route Hostname", + "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e.\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" + }, + { + "name": "SSO_HOSTNAME", + "displayName": "Custom RH-SSO Server Hostname", + "description": "Custom hostname for the RH-SSO server." + }, + { + "name": "DB_JNDI", + "displayName": "Database JNDI Name", + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "value": "java:jboss/datasources/KeycloakDS" + }, + { + "name": "DB_DATABASE", + "displayName": "Database Name", + "description": "Database name", + "value": "root", + "required": true + }, + { + "name": "HTTPS_SECRET", + "displayName": "Server Keystore Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "HTTPS_KEYSTORE", + "displayName": "Server Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "keystore.jks" + }, + { + "name": "HTTPS_KEYSTORE_TYPE", + "displayName": "Server Keystore Type", + "description": "The type of the keystore file (JKS or JCEKS)" + }, + { + "name": "HTTPS_NAME", + "displayName": "Server Certificate Name", + "description": "The name associated with the server certificate (e.g. jboss)" + }, + { + "name": "HTTPS_PASSWORD", + "displayName": "Server Keystore Password", + "description": "The password for the keystore and certificate (e.g. mykeystorepass)" + }, + { + "name": "DB_MIN_POOL_SIZE", + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource." + }, + { + "name": "DB_MAX_POOL_SIZE", + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource." + }, + { + "name": "DB_TX_ISOLATION", + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource." + }, + { + "name": "POSTGRESQL_MAX_CONNECTIONS", + "displayName": "PostgreSQL Maximum number of connections", + "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions." + }, + { + "name": "POSTGRESQL_SHARED_BUFFERS", + "displayName": "PostgreSQL Shared Buffers", + "description": "Configures how much memory is dedicated to PostgreSQL for caching data." + }, + { + "name": "DB_USERNAME", + "displayName": "Database Username", + "description": "Database user name", + "generate": "expression", + "from": "user[a-zA-Z0-9]{3}", + "required": true + }, + { + "name": "DB_PASSWORD", + "displayName": "Database Password", + "description": "Database user password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "JGROUPS_ENCRYPT_SECRET", + "displayName": "JGroups Secret Name", + "description": "The name of the secret containing the keystore file", + "value": "sso-app-secret" + }, + { + "name": "JGROUPS_ENCRYPT_KEYSTORE", + "displayName": "JGroups Keystore Filename", + "description": "The name of the keystore file within the secret", + "value": "jgroups.jceks" + }, + { + "name": "JGROUPS_ENCRYPT_NAME", + "displayName": "JGroups Certificate Name", + "description": "The name associated with the server certificate (e.g. secret-key)" + }, + { + "name": "JGROUPS_ENCRYPT_PASSWORD", + "displayName": "JGroups Keystore Password", + "description": "The password for the keystore and certificate (e.g. password)" + }, + { + "name": "JGROUPS_CLUSTER_PASSWORD", + "displayName": "JGroups Cluster Password", + "description": "JGroups cluster password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "IMAGE_STREAM_NAMESPACE", + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "value": "openshift", + "required": true + }, + { + "name": "SSO_ADMIN_USERNAME", + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_ADMIN_PASSWORD", + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "generate": "expression", + "from": "[a-zA-Z0-9]{8}", + "required": true + }, + { + "name": "SSO_REALM", + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm)." + }, + { + "name": "SSO_SERVICE_USERNAME", + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm." + }, + { + "name": "SSO_SERVICE_PASSWORD", + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user." + }, + { + "name": "SSO_TRUSTSTORE", + "displayName": "RH-SSO Trust Store", + "description": "The name of the truststore file within the secret (e.g. truststore.jks)" + }, + { + "name": "SSO_TRUSTSTORE_PASSWORD", + "displayName": "RH-SSO Trust Store Password", + "description": "The password for the truststore and certificate (e.g. mykeystorepass)" + }, + { + "name": "SSO_TRUSTSTORE_SECRET", + "displayName": "RH-SSO Trust Store Secret", + "description": "The name of the secret containing the truststore file (e.g. truststore-secret). Used for volume secretName", + "value": "sso-app-secret" + }, + { + "name": "POSTGRESQL_IMAGE_STREAM_TAG", + "displayName": "PostgreSQL Image Stream Tag", + "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", + "value": "10", + "required": true + }, + { + "name": "MEMORY_LIMIT", + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "value": "1Gi" + } + ], + "labels": { + "rhsso": "7.5.0.GA", + "template": "sso75-postgresql" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver31-tomcat7-openshift-rhel7.json b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver31-tomcat7-openshift-rhel7.json index 66648a157..213b19d5d 100755 --- a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver31-tomcat7-openshift-rhel7.json +++ b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver31-tomcat7-openshift-rhel7.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jboss-webserver31-tomcat7-openshift", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver31-tomcat8-openshift-rhel7.json b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver31-tomcat8-openshift-rhel7.json index 9686c945d..e29a9480e 100755 --- a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver31-tomcat8-openshift-rhel7.json +++ b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver31-tomcat8-openshift-rhel7.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jboss-webserver31-tomcat8-openshift", "creationTimestamp": null, diff --git a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk11-tomcat9-openshift-rhel7.json b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk11-tomcat9-openshift-rhel7.json deleted file mode 100755 index 493b6f7bc..000000000 --- a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk11-tomcat9-openshift-rhel7.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "jboss-webserver54-openjdk11-tomcat9-openshift-rhel7", - "creationTimestamp": null, - "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on RHEL7", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.0" - } - }, - "spec": { - "lookupPolicy": { - "local": false - }, - "tags": [ - { - "name": "latest", - "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on RHEL7 S2I images.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on RHEL7", - "sampleContextDir": "tomcat-websocket-chat", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:11", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "version": "latest" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openjdk11-tomcat9-openshift-rhel7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "1.0", - "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on RHEL7 S2I images.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on RHEL7", - "sampleContextDir": "tomcat-websocket-chat", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:11", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "version": "1.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openjdk11-tomcat9-openshift-rhel7:1.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - } - ] - }, - "status": { - "dockerImageRepository": "" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk8-tomcat9-openshift-rhel7.json b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk8-tomcat9-openshift-rhel7.json deleted file mode 100755 index 3bf8ecdab..000000000 --- a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk8-tomcat9-openshift-rhel7.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "jboss-webserver54-openjdk8-tomcat9-openshift-rhel7", - "creationTimestamp": null, - "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on RHEL7", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.0" - } - }, - "spec": { - "lookupPolicy": { - "local": false - }, - "tags": [ - { - "name": "latest", - "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on RHEL7 S2I images.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on RHEL7", - "sampleContextDir": "tomcat-websocket-chat", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:8", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "version": "latest" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openjdk8-tomcat9-openshift-rhel7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "1.0", - "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on RHEL7 S2I images.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on RHEL7", - "sampleContextDir": "tomcat-websocket-chat", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:8", - "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "version": "1.0" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openjdk8-tomcat9-openshift-rhel7:1.0" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - } - ] - }, - "status": { - "dockerImageRepository": "" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk11-tomcat9-openshift-ubi8.json b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver56-openjdk11-tomcat9-openshift-ubi8.json similarity index 62% rename from assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk11-tomcat9-openshift-ubi8.json rename to assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver56-openjdk11-tomcat9-openshift-ubi8.json index 3ce7f7639..201747878 100755 --- a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk11-tomcat9-openshift-ubi8.json +++ b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver56-openjdk11-tomcat9-openshift-ubi8.json @@ -1,13 +1,13 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { - "name": "jboss-webserver54-openjdk11-tomcat9-openshift-ubi8", + "name": "jboss-webserver56-openjdk11-tomcat9-openshift-ubi8", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8", "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.0" + "version": "5.6" } }, "spec": { @@ -18,18 +18,18 @@ { "name": "latest", "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", + "description": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8", "sampleContextDir": "tomcat-websocket-chat", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:11", + "supports": "tomcat9:5.6,tomcat:9,java:11", "tags": "builder,tomcat,tomcat9,java,jboss,hidden", "version": "latest" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openjdk11-tomcat9-openshift-rhel8:latest" + "name": "registry.redhat.io/jboss-webserver-5/jws56-openjdk11-openshift-rhel8:latest" }, "generation": null, "importPolicy": {}, @@ -38,20 +38,20 @@ } }, { - "name": "1.0", + "name": "5.6.0", "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", + "description": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8 S2I images.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8", "sampleContextDir": "tomcat-websocket-chat", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:11", + "supports": "tomcat9:5.6,tomcat:9,java:11", "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "version": "1.0" + "version": "1.2" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openjdk11-tomcat9-openshift-rhel8:1.0" + "name": "registry.redhat.io/jboss-webserver-5/jws56-openjdk11-openshift-rhel8:5.6.0" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk8-tomcat9-openshift-ubi8.json b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver56-openjdk8-tomcat9-openshift-ubi8.json similarity index 62% rename from assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk8-tomcat9-openshift-ubi8.json rename to assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver56-openjdk8-tomcat9-openshift-ubi8.json index 5353e9db8..78f3912b9 100755 --- a/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver54-openjdk8-tomcat9-openshift-ubi8.json +++ b/assets/operator/ocp-x86_64/webserver/imagestreams/jboss-webserver56-openjdk8-tomcat9-openshift-ubi8.json @@ -1,13 +1,13 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { - "name": "jboss-webserver54-openjdk8-tomcat9-openshift-ubi8", + "name": "jboss-webserver56-openjdk8-tomcat9-openshift-ubi8", "creationTimestamp": null, "annotations": { - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8", "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.0" + "version": "5.6" } }, "spec": { @@ -18,18 +18,18 @@ { "name": "latest", "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", + "description": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8", "sampleContextDir": "tomcat-websocket-chat", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:8", + "supports": "tomcat9:5.6,tomcat:9,java:8", "tags": "builder,tomcat,tomcat9,java,jboss,hidden", "version": "latest" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openjdk8-tomcat9-openshift-rhel8:latest" + "name": "registry.redhat.io/jboss-webserver-5/jws56-openjdk8-openshift-rhel8:latest" }, "generation": null, "importPolicy": {}, @@ -38,20 +38,20 @@ } }, { - "name": "1.0", + "name": "5.6.0", "annotations": { - "description": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", + "description": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8 S2I images.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on UBI8", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8", "sampleContextDir": "tomcat-websocket-chat", "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "supports": "tomcat9:5.4,tomcat:9,java:8", + "supports": "tomcat9:5.6,tomcat:9,java:8", "tags": "builder,tomcat,tomcat9,java,jboss,hidden", - "version": "1.0" + "version": "1.2" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/jboss-webserver-5/webserver54-openjdk8-tomcat9-openshift-rhel8:1.0" + "name": "registry.redhat.io/jboss-webserver-5/jws56-openjdk8-openshift-rhel8:5.6.0" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-basic-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-basic-s2i.json index 19b3f95d4..cad5eba27 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-basic-s2i.json +++ b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-basic-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jws31-tomcat7-basic-s2i", "creationTimestamp": null, @@ -40,7 +40,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -60,7 +60,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-https-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-https-s2i.json index eb3674f5f..d2bb84052 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-https-s2i.json +++ b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-https-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jws31-tomcat7-https-s2i", "creationTimestamp": null, @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -87,7 +87,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -120,7 +120,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -188,7 +188,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-mysql-persistent-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-mysql-persistent-s2i.json deleted file mode 100755 index 120dc0623..000000000 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-mysql-persistent-s2i.json +++ /dev/null @@ -1,718 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "jws31-tomcat7-mysql-persistent-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Web Server application with a MySQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Apache Tomcat 7 + MySQL (with https)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat7,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using https.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.4" - } - }, - "message": "A new persistent JWS application for Apache Tomcat 7 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The database server's port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "ports": [ - { - "port": 3306, - "targetPort": 3306 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "tls": { - "termination": "passthrough" - }, - "to": { - "name": "secure-${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver31-tomcat7-openshift:1.4", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "DB_SERVICE_PREFIX_MAPPING", - "value": "${APPLICATION_NAME}-mysql=DB" - }, - { - "name": "DB_JNDI", - "value": "${DB_JNDI}" - }, - { - "name": "DB_USERNAME", - "value": "${DB_USERNAME}" - }, - { - "name": "DB_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "DB_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "DB_MIN_POOL_SIZE", - "value": "${DB_MIN_POOL_SIZE}" - }, - { - "name": "DB_MAX_POOL_SIZE", - "value": "${DB_MAX_POOL_SIZE}" - }, - { - "name": "DB_TX_ISOLATION", - "value": "${DB_TX_ISOLATION}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "curl --noproxy '*' -s -u ${JWS_ADMIN_USERNAME}:${JWS_ADMIN_PASSWORD} 'http://localhost:8080/manager/jmxproxy/?get=Catalina%3Atype%3DServer\u0026att=stateName' |grep -iq 'stateName *= *STARTED'" - ] - } - }, - "volumeMounts": [ - { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", - "readOnly": true - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "MYSQL_USER", - "value": "${DB_USERNAME}" - }, - { - "name": "MYSQL_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "MYSQL_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "value": "${MYSQL_LOWER_CASE_TABLE_NAMES}" - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "value": "${MYSQL_MAX_CONNECTIONS}" - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "value": "${MYSQL_FT_MIN_WORD_LEN}" - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "value": "${MYSQL_FT_MAX_WORD_LEN}" - }, - { - "name": "MYSQL_AIO", - "value": "${MYSQL_AIO}" - } - ], - "image": "mysql", - "livenessProbe": { - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 3306 - }, - "timeoutSeconds": 1 - }, - "name": "${APPLICATION_NAME}-mysql", - "ports": [ - { - "containerPort": 3306, - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/sh", - "-i", - "-c", - "MYSQL_PWD=\"$MYSQL_PASSWORD\" mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE -e 'SELECT 1'" - ] - }, - "initialDelaySeconds": 5, - "timeoutSeconds": 1 - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/mysql/data", - "name": "${APPLICATION_NAME}-mysql-pvol" - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "name": "${APPLICATION_NAME}-mysql-pvol", - "persistentVolumeClaim": { - "claimName": "${APPLICATION_NAME}-mysql-claim" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_IMAGE_STREAM_TAG}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "PersistentVolumeClaim", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql-claim" - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "${VOLUME_CAPACITY}" - } - } - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "jws-app", - "required": true - }, - { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "todolist/todolist-jdbc" - }, - { - "name": "DB_JNDI", - "displayName": "Database JNDI Name", - "description": "Database JNDI name used by application to resolve the datasource, e.g. jboss/datasources/mysqlDS", - "value": "jboss/datasources/defaultDS" - }, - { - "name": "DB_DATABASE", - "displayName": "Database Name", - "description": "Database name", - "value": "root", - "required": true - }, - { - "name": "VOLUME_CAPACITY", - "displayName": "Database Volume Capacity", - "description": "Size of persistent storage for database volume.", - "value": "1Gi", - "required": true - }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, - { - "name": "DB_MIN_POOL_SIZE", - "displayName": "Datasource Minimum Pool Size", - "description": "Sets xa-pool/min-pool-size for the configured datasource." - }, - { - "name": "DB_MAX_POOL_SIZE", - "displayName": "Datasource Maximum Pool Size", - "description": "Sets xa-pool/max-pool-size for the configured datasource." - }, - { - "name": "DB_TX_ISOLATION", - "displayName": "Datasource Transaction Isolation", - "description": "Sets transaction-isolation for the configured datasource." - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "displayName": "MySQL Lower Case Table Names", - "description": "Sets how the table names are stored and compared." - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "displayName": "MySQL Maximum number of connections", - "description": "The maximum permitted number of simultaneous client connections." - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "displayName": "MySQL FullText Minimum Word Length", - "description": "The minimum length of the word to be included in a FULLTEXT index." - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "displayName": "MySQL FullText Maximum Word Length", - "description": "The maximum length of the word to be included in a FULLTEXT index." - }, - { - "name": "MYSQL_AIO", - "displayName": "MySQL AIO", - "description": "Controls the innodb_use_native_aio setting value if the native AIO is broken." - }, - { - "name": "DB_USERNAME", - "displayName": "Database Username", - "description": "Database user name", - "generate": "expression", - "from": "user[a-zA-Z0-9]{3}", - "required": true - }, - { - "name": "DB_PASSWORD", - "displayName": "Database Password", - "description": "Database user password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - }, - { - "name": "MYSQL_IMAGE_STREAM_TAG", - "displayName": "MySQL Image Stream Tag", - "description": "The tag to use for the \"mysql\" image stream. Typically, this aligns with the major.minor version of MySQL.", - "value": "5.7", - "required": true - } - ], - "labels": { - "jws31": "1.4", - "template": "jws31-tomcat7-mysql-persistent-s2i" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-mysql-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-mysql-s2i.json deleted file mode 100755 index 6b12ec0ac..000000000 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat7-mysql-s2i.json +++ /dev/null @@ -1,688 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "jws31-tomcat7-mysql-s2i", - "creationTimestamp": null, - "annotations": { - "description": "Application template for JWS MySQL applications built using S2I.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + MySQL (Ephemeral with https)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat7,java,jboss,hidden", - "version": "1.4" - } - }, - "message": "A new JWS application for Apache Tomcat 7 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The database server's port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "ports": [ - { - "port": 3306, - "targetPort": 3306 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "tls": { - "termination": "passthrough" - }, - "to": { - "name": "secure-${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver31-tomcat7-openshift:1.4", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "DB_SERVICE_PREFIX_MAPPING", - "value": "${APPLICATION_NAME}-mysql=DB" - }, - { - "name": "DB_JNDI", - "value": "${DB_JNDI}" - }, - { - "name": "DB_USERNAME", - "value": "${DB_USERNAME}" - }, - { - "name": "DB_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "DB_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "DB_MIN_POOL_SIZE", - "value": "${DB_MIN_POOL_SIZE}" - }, - { - "name": "DB_MAX_POOL_SIZE", - "value": "${DB_MAX_POOL_SIZE}" - }, - { - "name": "DB_TX_ISOLATION", - "value": "${DB_TX_ISOLATION}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "curl --noproxy '*' -s -u ${JWS_ADMIN_USERNAME}:${JWS_ADMIN_PASSWORD} 'http://localhost:8080/manager/jmxproxy/?get=Catalina%3Atype%3DServer\u0026att=stateName' |grep -iq 'stateName *= *STARTED'" - ] - } - }, - "volumeMounts": [ - { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", - "readOnly": true - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "MYSQL_USER", - "value": "${DB_USERNAME}" - }, - { - "name": "MYSQL_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "MYSQL_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "value": "${MYSQL_LOWER_CASE_TABLE_NAMES}" - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "value": "${MYSQL_MAX_CONNECTIONS}" - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "value": "${MYSQL_FT_MIN_WORD_LEN}" - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "value": "${MYSQL_FT_MAX_WORD_LEN}" - }, - { - "name": "MYSQL_AIO", - "value": "${MYSQL_AIO}" - } - ], - "image": "mysql", - "livenessProbe": { - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 3306 - }, - "timeoutSeconds": 1 - }, - "name": "${APPLICATION_NAME}-mysql", - "ports": [ - { - "containerPort": 3306, - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/sh", - "-i", - "-c", - "MYSQL_PWD=\"$MYSQL_PASSWORD\" mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE -e 'SELECT 1'" - ] - }, - "initialDelaySeconds": 5, - "timeoutSeconds": 1 - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/mysql/data", - "name": "${APPLICATION_NAME}-data" - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "emptyDir": { - "medium": "" - }, - "name": "${APPLICATION_NAME}-data" - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_IMAGE_STREAM_TAG}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "jws-app", - "required": true - }, - { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "todolist/todolist-jdbc" - }, - { - "name": "DB_JNDI", - "displayName": "Database JNDI Name", - "description": "Database JNDI name used by application to resolve the datasource, e.g. jboss/datasources/mysqlDS", - "value": "jboss/datasources/defaultDS" - }, - { - "name": "DB_DATABASE", - "displayName": "Database Name", - "description": "Database name", - "value": "root", - "required": true - }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, - { - "name": "DB_MIN_POOL_SIZE", - "displayName": "Datasource Minimum Pool Size", - "description": "Sets xa-pool/min-pool-size for the configured datasource." - }, - { - "name": "DB_MAX_POOL_SIZE", - "displayName": "Datasource Maximum Pool Size", - "description": "Sets xa-pool/max-pool-size for the configured datasource." - }, - { - "name": "DB_TX_ISOLATION", - "displayName": "Datasource Transaction Isolation", - "description": "Sets transaction-isolation for the configured datasource." - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "displayName": "MySQL Lower Case Table Names", - "description": "Sets how the table names are stored and compared." - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "displayName": "MySQL Maximum number of connections", - "description": "The maximum permitted number of simultaneous client connections." - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "displayName": "MySQL FullText Minimum Word Length", - "description": "The minimum length of the word to be included in a FULLTEXT index." - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "displayName": "MySQL FullText Maximum Word Length", - "description": "The maximum length of the word to be included in a FULLTEXT index." - }, - { - "name": "MYSQL_AIO", - "displayName": "MySQL AIO", - "description": "Controls the innodb_use_native_aio setting value if the native AIO is broken." - }, - { - "name": "DB_USERNAME", - "displayName": "Database Username", - "description": "Database user name", - "generate": "expression", - "from": "user[a-zA-Z0-9]{3}", - "required": true - }, - { - "name": "DB_PASSWORD", - "displayName": "Database Password", - "description": "Database user password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - }, - { - "name": "MYSQL_IMAGE_STREAM_TAG", - "displayName": "MySQL Image Stream Tag", - "description": "The tag to use for the \"mysql\" image stream. Typically, this aligns with the major.minor version of MySQL.", - "value": "5.7", - "required": true - } - ], - "labels": { - "jws31": "1.4", - "template": "jws31-tomcat7-mysql-s2i" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-basic-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-basic-s2i.json index 49a7f652f..ad5e8a440 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-basic-s2i.json +++ b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-basic-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jws31-tomcat8-basic-s2i", "creationTimestamp": null, @@ -43,7 +43,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -63,7 +63,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -73,7 +73,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -141,7 +141,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-https-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-https-s2i.json index b36bbbc92..8e81c798e 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-https-s2i.json +++ b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-https-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jws31-tomcat8-https-s2i", "creationTimestamp": null, @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -87,7 +87,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -120,7 +120,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -188,7 +188,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-mysql-persistent-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-mysql-persistent-s2i.json deleted file mode 100755 index b18311ca6..000000000 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-mysql-persistent-s2i.json +++ /dev/null @@ -1,718 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "jws31-tomcat8-mysql-persistent-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Web Server application with a MySQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MySQL (with https)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat8,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using https.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.4" - } - }, - "message": "A new persistent JWS application for Apache Tomcat 8 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The database server's port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "ports": [ - { - "port": 3306, - "targetPort": 3306 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "tls": { - "termination": "passthrough" - }, - "to": { - "name": "secure-${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver31-tomcat8-openshift:1.4", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "DB_SERVICE_PREFIX_MAPPING", - "value": "${APPLICATION_NAME}-mysql=DB" - }, - { - "name": "DB_JNDI", - "value": "${DB_JNDI}" - }, - { - "name": "DB_USERNAME", - "value": "${DB_USERNAME}" - }, - { - "name": "DB_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "DB_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "DB_MIN_POOL_SIZE", - "value": "${DB_MIN_POOL_SIZE}" - }, - { - "name": "DB_MAX_POOL_SIZE", - "value": "${DB_MAX_POOL_SIZE}" - }, - { - "name": "DB_TX_ISOLATION", - "value": "${DB_TX_ISOLATION}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "curl --noproxy '*' -s -u ${JWS_ADMIN_USERNAME}:${JWS_ADMIN_PASSWORD} 'http://localhost:8080/manager/jmxproxy/?get=Catalina%3Atype%3DServer\u0026att=stateName' |grep -iq 'stateName *= *STARTED'" - ] - } - }, - "volumeMounts": [ - { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", - "readOnly": true - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "MYSQL_USER", - "value": "${DB_USERNAME}" - }, - { - "name": "MYSQL_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "MYSQL_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "value": "${MYSQL_LOWER_CASE_TABLE_NAMES}" - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "value": "${MYSQL_MAX_CONNECTIONS}" - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "value": "${MYSQL_FT_MIN_WORD_LEN}" - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "value": "${MYSQL_FT_MAX_WORD_LEN}" - }, - { - "name": "MYSQL_AIO", - "value": "${MYSQL_AIO}" - } - ], - "image": "mysql", - "livenessProbe": { - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 3306 - }, - "timeoutSeconds": 1 - }, - "name": "${APPLICATION_NAME}-mysql", - "ports": [ - { - "containerPort": 3306, - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/sh", - "-i", - "-c", - "MYSQL_PWD=\"$MYSQL_PASSWORD\" mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE -e 'SELECT 1'" - ] - }, - "initialDelaySeconds": 5, - "timeoutSeconds": 1 - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/mysql/data", - "name": "${APPLICATION_NAME}-mysql-pvol" - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "name": "${APPLICATION_NAME}-mysql-pvol", - "persistentVolumeClaim": { - "claimName": "${APPLICATION_NAME}-mysql-claim" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_IMAGE_STREAM_TAG}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "PersistentVolumeClaim", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql-claim" - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "${VOLUME_CAPACITY}" - } - } - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "jws-app", - "required": true - }, - { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "todolist/todolist-jdbc" - }, - { - "name": "DB_JNDI", - "displayName": "Database JNDI Name", - "description": "Database JNDI name used by application to resolve the datasource, e.g. jboss/datasources/mysqlDS", - "value": "jboss/datasources/defaultDS" - }, - { - "name": "DB_DATABASE", - "displayName": "Database Name", - "description": "Database name", - "value": "root", - "required": true - }, - { - "name": "VOLUME_CAPACITY", - "displayName": "Database Volume Capacity", - "description": "Size of persistent storage for database volume.", - "value": "1Gi", - "required": true - }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, - { - "name": "DB_MIN_POOL_SIZE", - "displayName": "Datasource Minimum Pool Size", - "description": "Sets xa-pool/min-pool-size for the configured datasource." - }, - { - "name": "DB_MAX_POOL_SIZE", - "displayName": "Datasource Maximum Pool Size", - "description": "Sets xa-pool/max-pool-size for the configured datasource." - }, - { - "name": "DB_TX_ISOLATION", - "displayName": "Datasource Transaction Isolation", - "description": "Sets transaction-isolation for the configured datasource." - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "displayName": "MySQL Lower Case Table Names", - "description": "Sets how the table names are stored and compared." - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "displayName": "MySQL Maximum number of connections", - "description": "The maximum permitted number of simultaneous client connections." - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "displayName": "MySQL FullText Minimum Word Length", - "description": "The minimum length of the word to be included in a FULLTEXT index." - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "displayName": "MySQL FullText Maximum Word Length", - "description": "The maximum length of the word to be included in a FULLTEXT index." - }, - { - "name": "MYSQL_AIO", - "displayName": "MySQL AIO", - "description": "Controls the innodb_use_native_aio setting value if the native AIO is broken." - }, - { - "name": "DB_USERNAME", - "displayName": "Database Username", - "description": "Database user name", - "generate": "expression", - "from": "user[a-zA-Z0-9]{3}", - "required": true - }, - { - "name": "DB_PASSWORD", - "displayName": "Database Password", - "description": "Database user password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - }, - { - "name": "MYSQL_IMAGE_STREAM_TAG", - "displayName": "MySQL Image Stream Tag", - "description": "The tag to use for the \"mysql\" image stream. Typically, this aligns with the major.minor version of MySQL.", - "value": "5.7", - "required": true - } - ], - "labels": { - "jws31": "1.4", - "template": "jws31-tomcat8-mysql-persistent-s2i" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-mysql-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-mysql-s2i.json deleted file mode 100755 index b280a3098..000000000 --- a/assets/operator/ocp-x86_64/webserver/templates/jws31-tomcat8-mysql-s2i.json +++ /dev/null @@ -1,688 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "jws31-tomcat8-mysql-s2i", - "creationTimestamp": null, - "annotations": { - "description": "Application template for JWS MySQL applications built using S2I.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MySQL (Ephemeral with https)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat8,java,jboss,hidden", - "version": "1.4" - } - }, - "message": "A new JWS application for Apache Tomcat 8 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The database server's port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "ports": [ - { - "port": 3306, - "targetPort": 3306 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "tls": { - "termination": "passthrough" - }, - "to": { - "name": "secure-${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver31-tomcat8-openshift:1.4", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "DB_SERVICE_PREFIX_MAPPING", - "value": "${APPLICATION_NAME}-mysql=DB" - }, - { - "name": "DB_JNDI", - "value": "${DB_JNDI}" - }, - { - "name": "DB_USERNAME", - "value": "${DB_USERNAME}" - }, - { - "name": "DB_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "DB_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "DB_MIN_POOL_SIZE", - "value": "${DB_MIN_POOL_SIZE}" - }, - { - "name": "DB_MAX_POOL_SIZE", - "value": "${DB_MAX_POOL_SIZE}" - }, - { - "name": "DB_TX_ISOLATION", - "value": "${DB_TX_ISOLATION}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "curl --noproxy '*' -s -u ${JWS_ADMIN_USERNAME}:${JWS_ADMIN_PASSWORD} 'http://localhost:8080/manager/jmxproxy/?get=Catalina%3Atype%3DServer\u0026att=stateName' |grep -iq 'stateName *= *STARTED'" - ] - } - }, - "volumeMounts": [ - { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", - "readOnly": true - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, - "name": "${APPLICATION_NAME}-mysql" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "MYSQL_USER", - "value": "${DB_USERNAME}" - }, - { - "name": "MYSQL_PASSWORD", - "value": "${DB_PASSWORD}" - }, - { - "name": "MYSQL_DATABASE", - "value": "${DB_DATABASE}" - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "value": "${MYSQL_LOWER_CASE_TABLE_NAMES}" - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "value": "${MYSQL_MAX_CONNECTIONS}" - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "value": "${MYSQL_FT_MIN_WORD_LEN}" - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "value": "${MYSQL_FT_MAX_WORD_LEN}" - }, - { - "name": "MYSQL_AIO", - "value": "${MYSQL_AIO}" - } - ], - "image": "mysql", - "livenessProbe": { - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 3306 - }, - "timeoutSeconds": 1 - }, - "name": "${APPLICATION_NAME}-mysql", - "ports": [ - { - "containerPort": 3306, - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/sh", - "-i", - "-c", - "MYSQL_PWD=\"$MYSQL_PASSWORD\" mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE -e 'SELECT 1'" - ] - }, - "initialDelaySeconds": 5, - "timeoutSeconds": 1 - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/mysql/data", - "name": "${APPLICATION_NAME}-data" - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "emptyDir": { - "medium": "" - }, - "name": "${APPLICATION_NAME}-data" - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-mysql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "mysql:${MYSQL_IMAGE_STREAM_TAG}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "jws-app", - "required": true - }, - { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "todolist/todolist-jdbc" - }, - { - "name": "DB_JNDI", - "displayName": "Database JNDI Name", - "description": "Database JNDI name used by application to resolve the datasource, e.g. jboss/datasources/mysqlDS", - "value": "jboss/datasources/defaultDS" - }, - { - "name": "DB_DATABASE", - "displayName": "Database Name", - "description": "Database name", - "value": "root", - "required": true - }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, - { - "name": "DB_MIN_POOL_SIZE", - "displayName": "Datasource Minimum Pool Size", - "description": "Sets xa-pool/min-pool-size for the configured datasource." - }, - { - "name": "DB_MAX_POOL_SIZE", - "displayName": "Datasource Maximum Pool Size", - "description": "Sets xa-pool/max-pool-size for the configured datasource." - }, - { - "name": "DB_TX_ISOLATION", - "displayName": "Datasource Transaction Isolation", - "description": "Sets transaction-isolation for the configured datasource." - }, - { - "name": "MYSQL_LOWER_CASE_TABLE_NAMES", - "displayName": "MySQL Lower Case Table Names", - "description": "Sets how the table names are stored and compared." - }, - { - "name": "MYSQL_MAX_CONNECTIONS", - "displayName": "MySQL Maximum number of connections", - "description": "The maximum permitted number of simultaneous client connections." - }, - { - "name": "MYSQL_FT_MIN_WORD_LEN", - "displayName": "MySQL FullText Minimum Word Length", - "description": "The minimum length of the word to be included in a FULLTEXT index." - }, - { - "name": "MYSQL_FT_MAX_WORD_LEN", - "displayName": "MySQL FullText Maximum Word Length", - "description": "The maximum length of the word to be included in a FULLTEXT index." - }, - { - "name": "MYSQL_AIO", - "displayName": "MySQL AIO", - "description": "Controls the innodb_use_native_aio setting value if the native AIO is broken." - }, - { - "name": "DB_USERNAME", - "displayName": "Database Username", - "description": "Database user name", - "generate": "expression", - "from": "user[a-zA-Z0-9]{3}", - "required": true - }, - { - "name": "DB_PASSWORD", - "displayName": "Database Password", - "description": "Database user password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - }, - { - "name": "MYSQL_IMAGE_STREAM_TAG", - "displayName": "MySQL Image Stream Tag", - "description": "The tag to use for the \"mysql\" image stream. Typically, this aligns with the major.minor version of MySQL.", - "value": "5.7", - "required": true - } - ], - "labels": { - "jws31": "1.4", - "template": "jws31-tomcat8-mysql-s2i" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-rhel7-basic-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-rhel7-basic-s2i.json deleted file mode 100755 index ccf74bfc0..000000000 --- a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-rhel7-basic-s2i.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "jws54-openjdk11-tomcat9-rhel7-basic-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on RHEL7 (no https)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat9,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" - } - }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver54-openjdk11-tomcat9-openshift-rhel7:1.0", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "curl --noproxy '*' -is 'http://localhost:8080/health' | grep -iq '\"status\": \"UP\"'" - ] - } - } - } - ], - "terminationGracePeriodSeconds": 60 - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "jws-app", - "required": true - }, - { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "tomcat-websocket-chat" - }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - } - ], - "labels": { - "jws54jdk11el7": "1.0", - "template": "jws54-openjdk11-tomcat9-rhel7-basic-s2i" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-rhel7-https-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-rhel7-https-s2i.json deleted file mode 100755 index cf607211a..000000000 --- a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-rhel7-https-s2i.json +++ /dev/null @@ -1,428 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "jws54-openjdk11-tomcat9-rhel7-https-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on RHEL7 (with https)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat9,java,jboss,hidden", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" - } - }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "tls": { - "termination": "passthrough" - }, - "to": { - "name": "secure-${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver54-openjdk11-tomcat9-openshift-rhel7:1.0", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "curl --noproxy '*' -is 'http://localhost:8080/health' | grep -iq '\"status\": \"UP\"'" - ] - } - }, - "volumeMounts": [ - { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", - "readOnly": true - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "jws-app", - "required": true - }, - { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "tomcat-websocket-chat" - }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - } - ], - "labels": { - "jws54jdk11el7": "1.0", - "template": "jws54-openjdk11-tomcat9-rhel7-https-s2i" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-rhel7-basic-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-rhel7-basic-s2i.json deleted file mode 100755 index c8d5e606f..000000000 --- a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-rhel7-basic-s2i.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "jws54-openjdk8-tomcat9-rhel7-basic-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on RHEL7 (no https)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat9,java,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" - } - }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver54-openjdk8-tomcat9-openshift-rhel7:1.0", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "curl --noproxy '*' -is 'http://localhost:8080/health' | grep -iq '\"status\": \"UP\"'" - ] - } - } - } - ], - "terminationGracePeriodSeconds": 60 - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "jws-app", - "required": true - }, - { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "tomcat-websocket-chat" - }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - } - ], - "labels": { - "jws54jdk8el7": "1.0", - "template": "jws54-openjdk8-tomcat9-rhel7-basic-s2i" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-rhel7-https-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-rhel7-https-s2i.json deleted file mode 100755 index 644dfa414..000000000 --- a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-rhel7-https-s2i.json +++ /dev/null @@ -1,428 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "jws54-openjdk8-tomcat9-rhel7-https-s2i", - "creationTimestamp": null, - "annotations": { - "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on RHEL7 (with https)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "tomcat,tomcat9,java,jboss,hidden", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" - } - }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's http port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-http", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's http service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTP}", - "to": { - "name": "${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "kind": "Route", - "metadata": { - "annotations": { - "description": "Route for application's https service." - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "secure-${APPLICATION_NAME}" - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "tls": { - "termination": "passthrough" - }, - "to": { - "name": "secure-${APPLICATION_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "MAVEN_MIRROR_URL", - "value": "${MAVEN_MIRROR_URL}" - }, - { - "name": "ARTIFACT_DIR", - "value": "${ARTIFACT_DIR}" - } - ], - "forcePull": true, - "from": { - "kind": "ImageStreamTag", - "name": "jboss-webserver54-openjdk8-tomcat9-openshift-rhel7:1.0", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - }, - { - "imageChange": {}, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" - }, - { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" - }, - { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "curl --noproxy '*' -is 'http://localhost:8080/health' | grep -iq '\"status\": \"UP\"'" - ] - } - }, - "volumeMounts": [ - { - "mountPath": "/etc/jws-secret-volume", - "name": "jws-certificate-volume", - "readOnly": true - } - ] - } - ], - "terminationGracePeriodSeconds": 60, - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${APPLICATION_NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "APPLICATION_NAME", - "displayName": "Application Name", - "description": "The name for the application.", - "value": "jws-app", - "required": true - }, - { - "name": "HOSTNAME_HTTP", - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: \u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "HOSTNAME_HTTPS", - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure-\u003capplication-name\u003e-\u003cproject\u003e.\u003cdefault-domain-suffix\u003e" - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "Git source URI for application", - "value": "https://github.com/jboss-openshift/openshift-quickstarts.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_REF", - "displayName": "Git Reference", - "description": "Git branch/tag reference", - "value": "1.2" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Path within Git project to build; empty for root project directory.", - "value": "tomcat-websocket-chat" - }, - { - "name": "JWS_HTTPS_SECRET", - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "value": "jws-app-secret", - "required": true - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "value": "server.crt" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "value": "server.key" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "displayName": "Certificate Password", - "description": "The certificate password" - }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GITHUB_WEBHOOK_SECRET", - "displayName": "Github Webhook Secret", - "description": "GitHub trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "GENERIC_WEBHOOK_SECRET", - "displayName": "Generic Webhook Secret", - "description": "Generic build trigger secret", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "IMAGE_STREAM_NAMESPACE", - "displayName": "ImageStream Namespace", - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "value": "openshift", - "required": true - }, - { - "name": "MAVEN_MIRROR_URL", - "displayName": "Maven mirror URL", - "description": "Maven mirror to use for S2I builds" - }, - { - "name": "ARTIFACT_DIR", - "description": "List of directories from which archives will be copied into the deployment folder. If unspecified, all archives in /target will be copied." - } - ], - "labels": { - "jws54jdk8el7": "1.0", - "template": "jws54-openjdk8-tomcat9-rhel7-https-s2i" - } -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-ubi8-basic-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk11-tomcat9-ubi8-basic-s2i.json similarity index 84% rename from assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-ubi8-basic-s2i.json rename to assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk11-tomcat9-ubi8-basic-s2i.json index 4d0b8f0a4..2cf91363b 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-ubi8-basic-s2i.json +++ b/assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk11-tomcat9-ubi8-basic-s2i.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws54-openjdk11-tomcat9-ubi8-basic-s2i", + "name": "jws56-openjdk11-tomcat9-ubi8-basic-s2i", "creationTimestamp": null, "annotations": { "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on UBI8 (no https)", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8 (no https)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.6 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" + "version": "5.6" } }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}.", + "message": "A new JWS application for Apache Tomcat 9 has been created in your project.", "objects": [ { "apiVersion": "v1", @@ -43,7 +43,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -63,7 +63,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -73,7 +73,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -111,7 +111,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "jboss-webserver54-openjdk11-tomcat9-openshift-ubi8:1.0", + "name": "jboss-webserver56-openjdk11-tomcat9-openshift-ubi8:5.6.0", "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, @@ -141,7 +141,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -168,16 +168,6 @@ "spec": { "containers": [ { - "env": [ - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], "image": "${APPLICATION_NAME}", "imagePullPolicy": "Always", "name": "${APPLICATION_NAME}", @@ -260,22 +250,6 @@ "description": "Path within Git project to build; empty for root project directory.", "value": "tomcat-websocket-chat" }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "Github Webhook Secret", @@ -310,7 +284,7 @@ } ], "labels": { - "jws54jdk11ubi8": "1.0", - "template": "jws54-openjdk11-tomcat9-ubi8-basic-s2i" + "jws56jdk11ubi8": "5.6.0", + "template": "jws56-openjdk11-tomcat9-ubi8-basic-s2i" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-ubi8-https-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk11-tomcat9-ubi8-https-s2i.json similarity index 87% rename from assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-ubi8-https-s2i.json rename to assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk11-tomcat9-ubi8-https-s2i.json index bf3bd909c..4ee8b0335 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk11-tomcat9-ubi8-https-s2i.json +++ b/assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk11-tomcat9-ubi8-https-s2i.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws54-openjdk11-tomcat9-ubi8-https-s2i", + "name": "jws56-openjdk11-tomcat9-ubi8-https-s2i", "creationTimestamp": null, "annotations": { "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK11 on UBI8 (with https)", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8 (with https)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss,hidden", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.6 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" + "version": "5.6" } }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 9 has been created in your project. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", "objects": [ { "apiVersion": "v1", @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -87,7 +87,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -120,7 +120,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -158,7 +158,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "jboss-webserver54-openjdk11-tomcat9-openshift-ubi8:1.0", + "name": "jboss-webserver56-openjdk11-tomcat9-openshift-ubi8:5.6.0", "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, @@ -188,7 +188,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -231,14 +231,6 @@ { "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" } ], "image": "${APPLICATION_NAME}", @@ -372,22 +364,6 @@ "displayName": "Certificate Password", "description": "The certificate password" }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "Github Webhook Secret", @@ -422,7 +398,7 @@ } ], "labels": { - "jws54jdk11ubi8": "1.0", - "template": "jws54-openjdk11-tomcat9-ubi8-https-s2i" + "jws56jdk11ubi8": "5.6.0", + "template": "jws56-openjdk11-tomcat9-ubi8-https-s2i" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-ubi8-basic-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk8-tomcat9-ubi8-basic-s2i.json similarity index 84% rename from assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-ubi8-basic-s2i.json rename to assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk8-tomcat9-ubi8-basic-s2i.json index b4f242671..17840ce95 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-ubi8-basic-s2i.json +++ b/assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk8-tomcat9-ubi8-basic-s2i.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws54-openjdk8-tomcat9-ubi8-basic-s2i", + "name": "jws56-openjdk8-tomcat9-ubi8-basic-s2i", "creationTimestamp": null, "annotations": { "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on UBI8 (no https)", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8 (no https)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.5 Apache Tomcat 9 based application, including a build configuration, and an application deployment configuration.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" + "version": "5.6" } }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}.", + "message": "A new JWS application for Apache Tomcat 9 has been created in your project.", "objects": [ { "apiVersion": "v1", @@ -43,7 +43,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -63,7 +63,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -73,7 +73,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -111,7 +111,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "jboss-webserver54-openjdk8-tomcat9-openshift-ubi8:1.0", + "name": "jboss-webserver56-openjdk8-tomcat9-openshift-ubi8:5.6.0", "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, @@ -141,7 +141,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -168,16 +168,6 @@ "spec": { "containers": [ { - "env": [ - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" - } - ], "image": "${APPLICATION_NAME}", "imagePullPolicy": "Always", "name": "${APPLICATION_NAME}", @@ -260,22 +250,6 @@ "description": "Path within Git project to build; empty for root project directory.", "value": "tomcat-websocket-chat" }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "Github Webhook Secret", @@ -310,7 +284,7 @@ } ], "labels": { - "jws54jdk8ubi8": "1.0", - "template": "jws54-openjdk8-tomcat9-ubi8-basic-s2i" + "jws56jdk8ubi8": "5.6.0", + "template": "jws56-openjdk8-tomcat9-ubi8-basic-s2i" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-ubi8-https-s2i.json b/assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk8-tomcat9-ubi8-https-s2i.json similarity index 87% rename from assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-ubi8-https-s2i.json rename to assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk8-tomcat9-ubi8-https-s2i.json index 09b9e5d96..3caf4be11 100755 --- a/assets/operator/ocp-x86_64/webserver/templates/jws54-openjdk8-tomcat9-ubi8-https-s2i.json +++ b/assets/operator/ocp-x86_64/webserver/templates/jws56-openjdk8-tomcat9-ubi8-https-s2i.json @@ -1,22 +1,22 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { - "name": "jws54-openjdk8-tomcat9-ubi8-https-s2i", + "name": "jws56-openjdk8-tomcat9-ubi8-https-s2i", "creationTimestamp": null, "annotations": { "description": "An example JBoss Web Server application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "iconClass": "icon-rh-tomcat", - "openshift.io/display-name": "JBoss Web Server 5.4 Apache Tomcat 9 OpenJDK8 on UBI8 (with https)", + "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8 (with https)", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat9,java,jboss,hidden", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.4 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 5.6 Apache Tomcat 9 based application, including a build configuration, application deployment configuration, and secure communication using https.", "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.0" + "version": "5.6" } }, - "message": "A new JWS application for Apache Tomcat 9 has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 9 has been created in your project. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", "objects": [ { "apiVersion": "v1", @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -87,7 +87,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-https", "kind": "Route", "metadata": { @@ -110,7 +110,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -120,7 +120,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -158,7 +158,7 @@ "forcePull": true, "from": { "kind": "ImageStreamTag", - "name": "jboss-webserver54-openjdk8-tomcat9-openshift-ubi8:1.0", + "name": "jboss-webserver56-openjdk8-tomcat9-openshift-ubi8:5.6.0", "namespace": "${IMAGE_STREAM_NAMESPACE}" } }, @@ -188,7 +188,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { @@ -231,14 +231,6 @@ { "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, - { - "name": "JWS_ADMIN_USERNAME", - "value": "${JWS_ADMIN_USERNAME}" - }, - { - "name": "JWS_ADMIN_PASSWORD", - "value": "${JWS_ADMIN_PASSWORD}" } ], "image": "${APPLICATION_NAME}", @@ -372,22 +364,6 @@ "displayName": "Certificate Password", "description": "The certificate password" }, - { - "name": "JWS_ADMIN_USERNAME", - "displayName": "JWS Admin Username", - "description": "JWS Admin User", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, - { - "name": "JWS_ADMIN_PASSWORD", - "displayName": "JWS Admin Password", - "description": "JWS Admin Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}", - "required": true - }, { "name": "GITHUB_WEBHOOK_SECRET", "displayName": "Github Webhook Secret", @@ -422,7 +398,7 @@ } ], "labels": { - "jws54jdk8ubi8": "1.0", - "template": "jws54-openjdk8-tomcat9-ubi8-https-s2i" + "jws56jdk8ubi8": "5.6.0", + "template": "jws56-openjdk8-tomcat9-ubi8-https-s2i" } } \ No newline at end of file diff --git a/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json b/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json index e8fdf317e..1b96f4391 100755 --- a/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-example", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -308,7 +308,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json b/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json index 7a0398aea..e1bb86859 100755 --- a/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/okd-x86_64/cakephp/templates/cakephp-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "cakephp-mysql-persistent", "creationTimestamp": null, @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -69,7 +69,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -79,7 +79,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -139,7 +139,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -325,7 +325,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", - "value": "7.3-ubi8", + "description": "Version of PHP image to be used (7.3-ubi7, 7.4-ubi8, or latest).", + "value": "7.4-ubi8", "required": true }, { diff --git a/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json b/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json index b5244e9a4..3c5a3829f 100755 --- a/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -281,7 +281,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json b/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json index 2b0cad268..f33a6637b 100755 --- a/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/okd-x86_64/dancer/templates/dancer-mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "dancer-mysql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -298,7 +298,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PERL_VERSION", "displayName": "Version of Perl Image", - "description": "Version of Perl image to be used (5.26-el7, 5.26-ubi8, or latest).", - "value": "5.26-ubi8", + "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", + "value": "5.30-ubi8", "required": true }, { diff --git a/assets/operator/okd-x86_64/django/templates/django-psql-example.json b/assets/operator/okd-x86_64/django/templates/django-psql-example.json index 51a708aa0..6359561b6 100755 --- a/assets/operator/okd-x86_64/django/templates/django-psql-example.json +++ b/assets/operator/okd-x86_64/django/templates/django-psql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-example", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -423,8 +423,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/okd-x86_64/django/templates/django-psql-persistent.json b/assets/operator/okd-x86_64/django/templates/django-psql-persistent.json index 9fb7eae2a..28f2aa2ac 100755 --- a/assets/operator/okd-x86_64/django/templates/django-psql-persistent.json +++ b/assets/operator/okd-x86_64/django/templates/django-psql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "django-psql-persistent", "creationTimestamp": null, @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -138,7 +138,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -442,8 +442,8 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi7, 3.8-ubi8, or latest).", - "value": "3.8-ubi8", + "description": "Version of Python image to be used (3.6-ubi8, 3.8-ubi8, 3.9-ubi8, or latest).", + "value": "3.9-ubi8", "required": true }, { diff --git a/assets/operator/okd-x86_64/dotnet/imagestreams/dotnet-centos.json b/assets/operator/okd-x86_64/dotnet/imagestreams/dotnet-centos.json index 8cd5d5a22..8845cdc63 100755 --- a/assets/operator/okd-x86_64/dotnet/imagestreams/dotnet-centos.json +++ b/assets/operator/okd-x86_64/dotnet/imagestreams/dotnet-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "dotnet", "creationTimestamp": null, @@ -16,18 +16,64 @@ { "name": "latest", "annotations": { - "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", + "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", "iconClass": "icon-dotnet", "openshift.io/display-name": ".NET (Latest)", "sampleContextDir": "app", - "sampleRef": "dotnet-5.0", + "sampleRef": "dotnet-6.0", "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", "supports": "dotnet", "tags": "builder,.net,dotnet,dotnetcore,hidden" }, "from": { "kind": "ImageStreamTag", - "name": "5.0-ubi8" + "name": "6.0-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0-ubi8", + "annotations": { + "description": "Build and run .NET 6 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnet-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:6.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet60", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60:6.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "6.0", + "annotations": { + "description": "Build and run .NET 6 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 6 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnetcore-6.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:6.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet60,hidden", + "version": "6.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-60:6.0" }, "generation": null, "importPolicy": {}, @@ -149,75 +195,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "2.1-ubi8", - "annotations": { - "description": "Build and run .NET Core 2.1 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/build/README.md.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 (UBI 8)", - "sampleContextDir": "app", - "sampleRef": "dotnetcore-2.1", - "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", - "supports": "dotnet:2.1,dotnet", - "tags": "builder,.net,dotnet,dotnetcore,dotnet21", - "version": "2.1" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-21:2.1" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.1-el7", - "annotations": { - "description": "Build and run .NET Core 2.1 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/build/README.md.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 (CentOS 7)", - "sampleContextDir": "app", - "sampleRef": "dotnetcore-2.1", - "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", - "supports": "dotnet:2.1,dotnet", - "tags": "builder,.net,dotnet,dotnetcore,rh-dotnet21", - "version": "2.1" - }, - "from": { - "kind": "DockerImage", - "name": "registry.centos.org/dotnet/dotnet-21-centos7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "2.1", - "annotations": { - "description": "Build and run .NET Core 2.1 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/build/README.md.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 (CentOS 7)", - "sampleContextDir": "app", - "sampleRef": "dotnetcore-2.1", - "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", - "supports": "dotnet:2.1,dotnet", - "tags": "builder,.net,dotnet,dotnetcore,rh-dotnet21,hidden", - "version": "2.1" - }, - "from": { - "kind": "DockerImage", - "name": "registry.centos.org/dotnet/dotnet-21-centos7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }, diff --git a/assets/operator/okd-x86_64/dotnet/imagestreams/dotnet-runtime-centos.json b/assets/operator/okd-x86_64/dotnet/imagestreams/dotnet-runtime-centos.json index 39085ee1e..f5ddad9a3 100755 --- a/assets/operator/okd-x86_64/dotnet/imagestreams/dotnet-runtime-centos.json +++ b/assets/operator/okd-x86_64/dotnet/imagestreams/dotnet-runtime-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "dotnet-runtime", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Run .NET applications. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.", + "description": "Run .NET applications. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core Runtime available on OpenShift, including major versions updates.", "iconClass": "icon-dotnet", "openshift.io/display-name": ".NET Runtime (Latest)", "supports": "dotnet-runtime", @@ -24,7 +24,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "5.0-ubi8" + "name": "6.0-ubi8" }, "generation": null, "importPolicy": {}, @@ -33,18 +33,18 @@ } }, { - "name": "5.0-ubi8", + "name": "6.0-ubi8", "annotations": { - "description": "Run .NET 5 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.", + "description": "Run .NET 6 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET 5 Runtime (UBI 8)", + "openshift.io/display-name": ".NET 6 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "5.0" + "version": "6.0" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-50-runtime:5.0" + "name": "registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0" }, "generation": null, "importPolicy": {}, @@ -53,18 +53,18 @@ } }, { - "name": "5.0", + "name": "6.0", "annotations": { - "description": "Run .NET 5 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.", + "description": "Run .NET 6 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET 5 Runtime (UBI 8)", + "openshift.io/display-name": ".NET 6 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden", - "version": "5.0" + "version": "6.0" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-50-runtime:5.0" + "name": "registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0" }, "generation": null, "importPolicy": {}, @@ -73,38 +73,18 @@ } }, { - "name": "3.1-ubi8", - "annotations": { - "description": "Run .NET Core 3.1 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 3.1 Runtime (UBI 8)", - "supports": "dotnet-runtime", - "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "3.1" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-31-runtime:3.1" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "3.1-el7", + "name": "5.0-ubi8", "annotations": { - "description": "Run .NET Core 3.1 applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", + "description": "Run .NET 5 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 3.1 Runtime (CentOS 7)", + "openshift.io/display-name": ".NET 5 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "3.1" + "version": "5.0" }, "from": { "kind": "DockerImage", - "name": "registry.centos.org/dotnet/dotnet-31-runtime-centos7:latest" + "name": "registry.access.redhat.com/ubi8/dotnet-50-runtime:5.0" }, "generation": null, "importPolicy": {}, @@ -113,18 +93,18 @@ } }, { - "name": "3.1", + "name": "5.0", "annotations": { - "description": "Run .NET Core 3.1 applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", + "description": "Run .NET 5 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/5.0/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 3.1 Runtime (CentOS 7)", + "openshift.io/display-name": ".NET 5 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden", - "version": "3.1" + "version": "5.0" }, "from": { "kind": "DockerImage", - "name": "registry.centos.org/dotnet/dotnet-31-runtime-centos7:latest" + "name": "registry.access.redhat.com/ubi8/dotnet-50-runtime:5.0" }, "generation": null, "importPolicy": {}, @@ -133,18 +113,18 @@ } }, { - "name": "2.1-ubi8", + "name": "3.1-ubi8", "annotations": { - "description": "Run .NET Core 2.1 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/runtime/README.md.", + "description": "Run .NET Core 3.1 applications on UBI 8. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 Runtime (UBI 8)", + "openshift.io/display-name": ".NET Core 3.1 Runtime (UBI 8)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "2.1" + "version": "3.1" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/dotnet-21-runtime:2.1" + "name": "registry.access.redhat.com/ubi8/dotnet-31-runtime:3.1" }, "generation": null, "importPolicy": {}, @@ -153,18 +133,18 @@ } }, { - "name": "2.1-el7", + "name": "3.1-el7", "annotations": { - "description": "Run .NET Core 2.1 applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/runtime/README.md.", + "description": "Run .NET Core 3.1 applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 Runtime (CentOS 7)", + "openshift.io/display-name": ".NET Core 3.1 Runtime (CentOS 7)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime", - "version": "2.1" + "version": "3.1" }, "from": { "kind": "DockerImage", - "name": "registry.centos.org/dotnet/dotnet-21-runtime-centos7:latest" + "name": "registry.centos.org/dotnet/dotnet-31-runtime-centos7:latest" }, "generation": null, "importPolicy": {}, @@ -173,18 +153,18 @@ } }, { - "name": "2.1", + "name": "3.1", "annotations": { - "description": "Run .NET Core 2.1 applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/2.1/runtime/README.md.", + "description": "Run .NET Core 3.1 applications on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/3.1/runtime/README.md.", "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core 2.1 Runtime (CentOS 7)", + "openshift.io/display-name": ".NET Core 3.1 Runtime (CentOS 7)", "supports": "dotnet-runtime", "tags": "runtime,.net-runtime,dotnet-runtime,dotnetcore-runtime,hidden", - "version": "2.1" + "version": "3.1" }, "from": { "kind": "DockerImage", - "name": "registry.centos.org/dotnet/dotnet-21-runtime-centos7:latest" + "name": "registry.centos.org/dotnet/dotnet-31-runtime-centos7:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/golang/imagestreams/golang-centos.json b/assets/operator/okd-x86_64/golang/imagestreams/golang-centos.json index 52e751f8a..d45726c99 100755 --- a/assets/operator/okd-x86_64/golang/imagestreams/golang-centos.json +++ b/assets/operator/okd-x86_64/golang/imagestreams/golang-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "golang", "creationTimestamp": null, @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.13.4-ubi8" + "name": "1.16.7-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,11 +35,11 @@ } }, { - "name": "1.13.4-ubi8", + "name": "1.16.7-ubi8", "annotations": { "description": "Build and run Go applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.13.4 (UBI 8)", + "openshift.io/display-name": "Go 1.16.7 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -47,7 +47,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/go-toolset:1.13.4" + "name": "registry.access.redhat.com/ubi8/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, @@ -56,11 +56,11 @@ } }, { - "name": "1.13.4-ubi7", + "name": "1.16.7-ubi7", "annotations": { "description": "Build and run Go applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.", "iconClass": "icon-go-gopher", - "openshift.io/display-name": "Go 1.13.4 (UBI 7)", + "openshift.io/display-name": "Go 1.16.7 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/golang-ex.git", "supports": "golang", @@ -68,7 +68,7 @@ }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi7/go-toolset:1.13.4" + "name": "registry.access.redhat.com/ubi7/go-toolset:1.16.7" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/httpd/imagestreams/httpd-centos.json b/assets/operator/okd-x86_64/httpd/imagestreams/httpd-centos.json index dc90d1446..202170744 100755 --- a/assets/operator/okd-x86_64/httpd/imagestreams/httpd-centos.json +++ b/assets/operator/okd-x86_64/httpd/imagestreams/httpd-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "httpd", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/httpd/templates/httpd-example.json b/assets/operator/okd-x86_64/httpd/templates/httpd-example.json index d9d9d2197..f125e8135 100755 --- a/assets/operator/okd-x86_64/httpd/templates/httpd-example.json +++ b/assets/operator/okd-x86_64/httpd/templates/httpd-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "httpd-example", "creationTimestamp": null, @@ -41,7 +41,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -55,7 +55,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -65,7 +65,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -122,7 +122,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/java/imagestreams/java-runtime-ubi.json b/assets/operator/okd-x86_64/java/imagestreams/java-runtime-ubi.json new file mode 100755 index 000000000..fd9e66c02 --- /dev/null +++ b/assets/operator/okd-x86_64/java/imagestreams/java-runtime-ubi.json @@ -0,0 +1,102 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "java-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK Runtime", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "openjdk-8-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java:8,openjdk,ubi8", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "tags": "java:11,openjdk,ubi8", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Run Java applications using OpenJDK 17 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java:17,openjdk,ubi8", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17-runtime:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Java Runtime (Latest)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java", + "tags": "java,openjdk", + "version": "latest" + }, + "from": { + "kind": "ImageStreamTag", + "name": "openjdk-17-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/okd-x86_64/java/imagestreams/java-ubi.json b/assets/operator/okd-x86_64/java/imagestreams/java-ubi.json index 62fdd796a..ff551cd74 100755 --- a/assets/operator/okd-x86_64/java/imagestreams/java-ubi.json +++ b/assets/operator/okd-x86_64/java/imagestreams/java-ubi.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "java", "creationTimestamp": null, @@ -102,6 +102,28 @@ "type": "Local" } }, + { + "name": "openjdk-17-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:17,java", + "tags": "builder,java,openjdk", + "version": "17" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-17:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "latest", "annotations": { @@ -116,7 +138,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "openjdk-11-ubi8" + "name": "openjdk-17-ubi8" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json new file mode 100755 index 000000000..1adfce208 --- /dev/null +++ b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-11-runtime-ubi.json @@ -0,0 +1,64 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-11-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 11 upon RHEL8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 Runtime (UBI8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json new file mode 100755 index 000000000..907431810 --- /dev/null +++ b/assets/operator/okd-x86_64/java/imagestreams/ubi8-openjdk-8-runtime-ubi.json @@ -0,0 +1,60 @@ +{ + "kind": "ImageStream", + "apiVersion": "image.openshift.io/v1", + "metadata": { + "name": "ubi8-openjdk-8-runtime", + "creationTimestamp": null, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "openshift.io/provider-display-name": "Red Hat, Inc." + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "1.9", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.9" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.9" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.10", + "annotations": { + "description": "Run Java applications using OpenJDK 1.8 upon UBI8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 1.8 Runtime (UBI8)", + "tags": "java,openjdk,ubi8", + "version": "1.10" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/openjdk-8-runtime:1.10" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/okd-x86_64/java/templates/openjdk-web-basic-s2i.json b/assets/operator/okd-x86_64/java/templates/openjdk-web-basic-s2i.json index c0928eeb3..067eac0e4 100755 --- a/assets/operator/okd-x86_64/java/templates/openjdk-web-basic-s2i.json +++ b/assets/operator/okd-x86_64/java/templates/openjdk-web-basic-s2i.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "openjdk-web-basic-s2i", "creationTimestamp": null, @@ -47,7 +47,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "id": "${APPLICATION_NAME}-http", "kind": "Route", "metadata": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "labels": { @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "labels": { @@ -135,7 +135,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "labels": { diff --git a/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-base-centos.json b/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-base-centos.json index bfb106235..2895165aa 100755 --- a/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-base-centos.json +++ b/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-base-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-base", "creationTimestamp": null diff --git a/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-maven-centos.json b/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-maven-centos.json index df2e41541..a0def42b1 100755 --- a/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-maven-centos.json +++ b/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-maven-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-maven", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-nodejs-centos.json b/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-nodejs-centos.json index 4e0ff9966..a53a5fd94 100755 --- a/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-nodejs-centos.json +++ b/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-agent-nodejs-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins-agent-nodejs", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-centos.json b/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-centos.json index d12566ebe..ca270dc00 100755 --- a/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-centos.json +++ b/assets/operator/okd-x86_64/jenkins/imagestreams/jenkins-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "jenkins", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json b/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json index e41ac805f..d14157583 100755 --- a/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json +++ b/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -356,6 +356,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json b/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json index 7ed8adf1b..b04448e8e 100755 --- a/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json +++ b/assets/operator/okd-x86_64/jenkins/templates/jenkins-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-ephemeral", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -49,7 +49,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -209,7 +209,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -324,6 +324,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent-monitored.json b/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent-monitored.json index 0da638332..a995d54dd 100755 --- a/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent-monitored.json +++ b/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent-monitored.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent-monitored", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service (monitored via Prometheus) has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -390,6 +390,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json b/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json index ab747d40a..d2a17d748 100755 --- a/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json +++ b/assets/operator/okd-x86_64/jenkins/templates/jenkins-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "jenkins-persistent", "creationTimestamp": null, @@ -18,7 +18,7 @@ "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", "objects": [ { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -230,7 +230,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "authorization.openshift.io/v1", "groupNames": null, "kind": "RoleBinding", "metadata": { @@ -358,6 +358,24 @@ "displayName": "Allows use of Jenkins Update Center repository with invalid SSL certificate", "description": "Whether to allow use of a Jenkins Update Center that uses invalid certificate (self-signed, unknown CA). If any value other than 'false', certificate check is bypassed. By default, certificate check is enforced.", "value": "false" + }, + { + "name": "AGENT_BASE_IMAGE", + "displayName": "Image used for the 'jnlp' container of the sample 'java-sidecar' and 'nodejs-sidecar' PodTemplates", + "description": "Setting this value overrides the image used for the 'jnlp' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'jenkins-agent-base:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-base:latest" + }, + { + "name": "JAVA_BUILDER_IMAGE", + "displayName": "Image used for the 'java' container of the sample 'java-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'java-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'java:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/java:latest" + }, + { + "name": "NODEJS_BUILDER_IMAGE", + "displayName": "Image used for the 'nodejs' container of the sample 'nodejs-builder' PodTemplate", + "description": "Setting this value overrides the image used for the 'nodejs-builder' container in the sample kubernetes plug-in PodTemplates provided with this image. Otherwise, the image from the 'nodejs:latest' ImageStreamTag in the 'openshift' namespace is used.", + "value": "image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest" } ], "labels": { diff --git a/assets/operator/okd-x86_64/mariadb/imagestreams/mariadb-centos.json b/assets/operator/okd-x86_64/mariadb/imagestreams/mariadb-centos.json index 480e168e1..684e77b5d 100755 --- a/assets/operator/okd-x86_64/mariadb/imagestreams/mariadb-centos.json +++ b/assets/operator/okd-x86_64/mariadb/imagestreams/mariadb-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mariadb", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Provides a MariaDB database on CentOS. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", + "description": "Provides a MariaDB database on CentOS. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", "iconClass": "icon-mariadb", "openshift.io/display-name": "MariaDB (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -24,7 +24,27 @@ }, "from": { "kind": "ImageStreamTag", - "name": "10.3-el8" + "name": "10.5-el7" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "10.5-el7", + "annotations": { + "description": "Provides a MariaDB 10.5 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "iconClass": "icon-mariadb", + "openshift.io/display-name": "MariaDB 10.5 (CentOS 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,mariadb", + "version": "10.5" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/centos7/mariadb-105-centos7:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json b/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json index b3cc99ff1..411af8bb4 100755 --- a/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-ephemeral", "creationTimestamp": null, @@ -58,7 +58,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json b/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json index 9af30abbe..856a37b6c 100755 --- a/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mariadb-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/mysql/imagestreams/mysql-centos.json b/assets/operator/okd-x86_64/mysql/imagestreams/mysql-centos.json index 528112c74..8c4db58d5 100755 --- a/assets/operator/okd-x86_64/mysql/imagestreams/mysql-centos.json +++ b/assets/operator/okd-x86_64/mysql/imagestreams/mysql-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "mysql", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json b/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json index e6fceb378..3ef5f630d 100755 --- a/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-ephemeral", "creationTimestamp": null, @@ -66,7 +66,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json b/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json index 6e36f9871..61d5eaf1b 100755 --- a/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json +++ b/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "mysql-persistent", "creationTimestamp": null, @@ -75,7 +75,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/nginx/imagestreams/nginx-centos.json b/assets/operator/okd-x86_64/nginx/imagestreams/nginx-centos.json index 3f6d5b82f..cc597ed2e 100755 --- a/assets/operator/okd-x86_64/nginx/imagestreams/nginx-centos.json +++ b/assets/operator/okd-x86_64/nginx/imagestreams/nginx-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nginx", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Nginx available on OpenShift, including major version updates.", "iconClass": "icon-nginx", "openshift.io/display-name": "Nginx HTTP server and a reverse proxy (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "1.18-ubi8" + "name": "1.20-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "1.18-ubi8", + "name": "1.20-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nginx-118:latest" + "name": "registry.access.redhat.com/ubi8/nginx-120:latest" }, "generation": null, "importPolicy": {}, @@ -57,16 +57,16 @@ } }, { - "name": "1.18-ubi7", + "name": "1.20-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.18" + "version": "1.20" }, "from": { "kind": "DockerImage", @@ -79,20 +79,20 @@ } }, { - "name": "1.16-el8", + "name": "1.18-ubi8", "annotations": { - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (CentOS 8)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "docker.io/centos/nginx-116-centos8:latest" + "name": "registry.access.redhat.com/ubi8/nginx-118:latest" }, "generation": null, "importPolicy": {}, @@ -101,42 +101,20 @@ } }, { - "name": "1.16-el7", + "name": "1.18-ubi7", "annotations": { - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", + "description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.18/README.md.", "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16 (CentOS 7)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.18 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nginx-ex.git", "supports": "nginx", "tags": "builder,nginx", - "version": "1.16" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/centos7/nginx-116-centos7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "1.16", - "annotations": { - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.16/README.md.", - "iconClass": "icon-nginx", - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.16", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git", - "supports": "nginx", - "tags": "builder,nginx,hidden", - "version": "1.16" + "version": "1.18" }, "from": { "kind": "DockerImage", - "name": "quay.io/centos7/nginx-116-centos7:latest" + "name": "registry.access.redhat.com/ubi7/nginx-118:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/nginx/templates/nginx-example.json b/assets/operator/okd-x86_64/nginx/templates/nginx-example.json index 9586e7adf..ad203770f 100755 --- a/assets/operator/okd-x86_64/nginx/templates/nginx-example.json +++ b/assets/operator/okd-x86_64/nginx/templates/nginx-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "nginx-example", "creationTimestamp": null, @@ -40,7 +40,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "annotations": { @@ -57,7 +57,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -67,7 +67,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -124,7 +124,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16-el8 by default).", - "value": "1.16-el8", + "description": "Version of NGINX image to be used (1.20-el8 by default).", + "value": "1.20-el8", "required": true }, { diff --git a/assets/operator/okd-x86_64/nodejs/imagestreams/nodejs-centos.json b/assets/operator/okd-x86_64/nodejs/imagestreams/nodejs-centos.json index ab98b19fc..78dcf41cc 100755 --- a/assets/operator/okd-x86_64/nodejs/imagestreams/nodejs-centos.json +++ b/assets/operator/okd-x86_64/nodejs/imagestreams/nodejs-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "nodejs", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", + "description": "Build and run Node.js applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Node.js available on OpenShift, including major version updates.", "iconClass": "icon-nodejs", "openshift.io/display-name": "Node.js (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "14-ubi8" + "name": "16-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,19 +35,19 @@ } }, { - "name": "14-ubi8", + "name": "16-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8)", + "openshift.io/display-name": "Node.js 16 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-14:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-16:latest" }, "generation": null, "importPolicy": {}, @@ -56,19 +56,19 @@ } }, { - "name": "14-ubi8-minimal", + "name": "16-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 16 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", + "openshift.io/display-name": "Node.js 16 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "14" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-14-minimal:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-16-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -77,19 +77,19 @@ } }, { - "name": "14-ubi7", + "name": "14-ubi8", "annotations": { - "description": "Build and run Node.js 14 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 14 (UBI 7)", + "openshift.io/display-name": "Node.js 14 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs,hidden", + "tags": "builder,nodejs", "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi7/nodejs-14:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-14:latest" }, "generation": null, "importPolicy": {}, @@ -98,40 +98,19 @@ } }, { - "name": "12-ubi8", + "name": "14-ubi8-minimal", "annotations": { - "description": "Build and run Node.js 12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14-minimal/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 8)", + "openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs", - "version": "12" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nodejs-12:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "12-ubi7", - "annotations": { - "description": "Build and run Node.js 12 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", - "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12 (UBI 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", - "tags": "builder,nodejs,hidden", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi7/nodejs-12:latest" + "name": "registry.access.redhat.com/ubi8/nodejs-14-minimal:latest" }, "generation": null, "importPolicy": {}, @@ -140,19 +119,19 @@ } }, { - "name": "12", + "name": "14-ubi7", "annotations": { - "description": "Build and run Node.js 12 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.", + "description": "Build and run Node.js 14 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.", "iconClass": "icon-nodejs", - "openshift.io/display-name": "Node.js 12", + "openshift.io/display-name": "Node.js 14 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/nodejs-ex.git", "tags": "builder,nodejs,hidden", - "version": "12" + "version": "14" }, "from": { "kind": "DockerImage", - "name": "quay.io/centos7/nodejs-12-centos7:latest" + "name": "registry.access.redhat.com/ubi7/nodejs-14:latest" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/okd-x86_64/nodejs/templates/nodejs-postgresql-example.json b/assets/operator/okd-x86_64/nodejs/templates/nodejs-postgresql-example.json index 03caa5562..57ff1338d 100755 --- a/assets/operator/okd-x86_64/nodejs/templates/nodejs-postgresql-example.json +++ b/assets/operator/okd-x86_64/nodejs/templates/nodejs-postgresql-example.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -285,7 +285,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/nodejs/templates/nodejs-postgresql-persistent.json b/assets/operator/okd-x86_64/nodejs/templates/nodejs-postgresql-persistent.json index c21a5254b..5c625dee3 100755 --- a/assets/operator/okd-x86_64/nodejs/templates/nodejs-postgresql-persistent.json +++ b/assets/operator/okd-x86_64/nodejs/templates/nodejs-postgresql-persistent.json @@ -54,7 +54,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -68,7 +68,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -78,7 +78,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -142,7 +142,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -302,7 +302,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/perl/imagestreams/perl-centos.json b/assets/operator/okd-x86_64/perl/imagestreams/perl-centos.json index 05da61d1d..3cd701b31 100755 --- a/assets/operator/okd-x86_64/perl/imagestreams/perl-centos.json +++ b/assets/operator/okd-x86_64/perl/imagestreams/perl-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "perl", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/php/imagestreams/php-centos.json b/assets/operator/okd-x86_64/php/imagestreams/php-centos.json index 257abeb14..9c6db22df 100755 --- a/assets/operator/okd-x86_64/php/imagestreams/php-centos.json +++ b/assets/operator/okd-x86_64/php/imagestreams/php-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "php", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/postgresql/imagestreams/postgresql-centos.json b/assets/operator/okd-x86_64/postgresql/imagestreams/postgresql-centos.json index 0df37097c..7ec2a81ff 100755 --- a/assets/operator/okd-x86_64/postgresql/imagestreams/postgresql-centos.json +++ b/assets/operator/okd-x86_64/postgresql/imagestreams/postgresql-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "postgresql", "creationTimestamp": null, @@ -32,6 +32,26 @@ "type": "Local" } }, + { + "name": "13-el7", + "annotations": { + "description": "Provides a PostgreSQL 13 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "iconClass": "icon-postgresql", + "openshift.io/display-name": "PostgreSQL 13 (CentOS 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,postgresql", + "version": "13" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/centos7/postgresql-13-centos7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "12-el8", "annotations": { @@ -52,6 +72,26 @@ "type": "Local" } }, + { + "name": "13-el7", + "annotations": { + "description": "Provides a PostgreSQL 13 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", + "iconClass": "icon-postgresql", + "openshift.io/display-name": "PostgreSQL 13 (CentOS 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "tags": "database,postgresql", + "version": "13" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/centos7/postgresql-13-centos7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "12-el7", "annotations": { @@ -151,26 +191,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "9.6-el8", - "annotations": { - "description": "Provides a PostgreSQL 9.6 database on CentOS 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "openshift.io/display-name": "PostgreSQL 9.6 (CentOS 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "database,postgresql", - "version": "9.6" - }, - "from": { - "kind": "DockerImage", - "name": "docker.io/centos/postgresql-96-centos8:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }, diff --git a/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json b/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json index b61755011..1a7d47325 100755 --- a/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-ephemeral", "creationTimestamp": null, @@ -64,7 +64,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json b/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json index e3f752ca1..623bc36dd 100755 --- a/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "postgresql-persistent", "creationTimestamp": null, @@ -81,7 +81,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/python/imagestreams/python-centos.json b/assets/operator/okd-x86_64/python/imagestreams/python-centos.json index 3d6c18504..84b00e4c8 100755 --- a/assets/operator/okd-x86_64/python/imagestreams/python-centos.json +++ b/assets/operator/okd-x86_64/python/imagestreams/python-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "python", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json b/assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json index e03d3a6c1..6408ab5bc 100755 --- a/assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/okd-x86_64/rails/templates/rails-pgsql-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-pgsql-persistent", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -341,7 +341,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json b/assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json index 9d4366f7f..a6aa97190 100755 --- a/assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json +++ b/assets/operator/okd-x86_64/rails/templates/rails-postgresql-example.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "rails-postgresql-example", "creationTimestamp": null, @@ -56,7 +56,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "route.openshift.io/v1", "kind": "Route", "metadata": { "name": "${NAME}" @@ -70,7 +70,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "kind": "ImageStream", "metadata": { "annotations": { @@ -80,7 +80,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "build.openshift.io/v1", "kind": "BuildConfig", "metadata": { "annotations": { @@ -140,7 +140,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -324,7 +324,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { diff --git a/assets/operator/okd-x86_64/redis/imagestreams/redis-centos.json b/assets/operator/okd-x86_64/redis/imagestreams/redis-centos.json index 4cb6ca242..cc7e9242b 100755 --- a/assets/operator/okd-x86_64/redis/imagestreams/redis-centos.json +++ b/assets/operator/okd-x86_64/redis/imagestreams/redis-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "redis", "creationTimestamp": null, diff --git a/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json b/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json index e9af758bd..104f1f03c 100755 --- a/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json +++ b/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-ephemeral", "creationTimestamp": null, @@ -60,7 +60,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/okd-x86_64/redis/templates/redis-persistent.json b/assets/operator/okd-x86_64/redis/templates/redis-persistent.json index 68ee70a6c..d1f4ed9d6 100755 --- a/assets/operator/okd-x86_64/redis/templates/redis-persistent.json +++ b/assets/operator/okd-x86_64/redis/templates/redis-persistent.json @@ -1,6 +1,6 @@ { "kind": "Template", - "apiVersion": "v1", + "apiVersion": "template.openshift.io/v1", "metadata": { "name": "redis-persistent", "creationTimestamp": null, @@ -77,7 +77,7 @@ } }, { - "apiVersion": "v1", + "apiVersion": "apps.openshift.io/v1", "kind": "DeploymentConfig", "metadata": { "annotations": { @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", - "value": "5-el8", + "description": "Version of Redis image to be used (5-el7, 5-el8, 6-el7, 6-el8, or latest).", + "value": "6-el8", "required": true } ], diff --git a/assets/operator/okd-x86_64/ruby/imagestreams/ruby-centos.json b/assets/operator/okd-x86_64/ruby/imagestreams/ruby-centos.json index 6bad1f8ec..1beb13497 100755 --- a/assets/operator/okd-x86_64/ruby/imagestreams/ruby-centos.json +++ b/assets/operator/okd-x86_64/ruby/imagestreams/ruby-centos.json @@ -1,6 +1,6 @@ { "kind": "ImageStream", - "apiVersion": "v1", + "apiVersion": "image.openshift.io/v1", "metadata": { "name": "ruby", "creationTimestamp": null, @@ -16,7 +16,7 @@ { "name": "latest", "annotations": { - "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/2.6/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", + "description": "Build and run Ruby applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/tree/master/3.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Ruby available on OpenShift, including major version updates.", "iconClass": "icon-ruby", "openshift.io/display-name": "Ruby (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", @@ -26,7 +26,7 @@ }, "from": { "kind": "ImageStreamTag", - "name": "2.7-ubi8" + "name": "3.0-ubi8" }, "generation": null, "importPolicy": {}, @@ -35,20 +35,20 @@ } }, { - "name": "2.7-ubi8", + "name": "3.0-ubi8", "annotations": { - "description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.", + "description": "Build and run Ruby 3.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Ruby 2.7 (UBI 8)", + "openshift.io/display-name": "Ruby 3.0 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/ruby-ex.git", - "supports": "ruby:2.7,ruby", + "supports": "ruby:3.0,ruby", "tags": "builder,ruby", - "version": "2.7" + "version": "3.0" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/ruby-27:latest" + "name": "registry.access.redhat.com/ubi8/ruby-30:latest" }, "generation": null, "importPolicy": {}, @@ -78,6 +78,28 @@ "type": "Local" } }, + { + "name": "2.7-ubi8", + "annotations": { + "description": "Build and run Ruby 2.7 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/2.7/README.md.", + "iconClass": "icon-ruby", + "openshift.io/display-name": "Ruby 2.7 (UBI 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/sclorg/ruby-ex.git", + "supports": "ruby:2.7,ruby", + "tags": "builder,ruby", + "version": "2.7" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/ruby-27:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "2.7-ubi7", "annotations": { diff --git a/assets/operator/okd-x86_64/wildfly/imagestreams/wildfly-centos7.json b/assets/operator/okd-x86_64/wildfly/imagestreams/wildfly-centos7.json index 25820c701..19b4e0bda 100755 --- a/assets/operator/okd-x86_64/wildfly/imagestreams/wildfly-centos7.json +++ b/assets/operator/okd-x86_64/wildfly/imagestreams/wildfly-centos7.json @@ -429,6 +429,50 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "25.0", + "annotations": { + "description": "Build and run WildFly 25 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.", + "iconClass": "icon-wildfly", + "openshift.io/display-name": "WildFly 25", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/openshift/openshift-jee-sample.git", + "supports": "wildfly:25,jee,java", + "tags": "builder,wildfly,java", + "version": "25.0" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/wildfly/wildfly-centos7:25.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "26.0", + "annotations": { + "description": "Build and run WildFly 26 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.", + "iconClass": "icon-wildfly", + "openshift.io/display-name": "WildFly 26", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "sampleRepo": "https://github.com/openshift/openshift-jee-sample.git", + "supports": "wildfly:26,jee,java", + "tags": "builder,wildfly,java", + "version": "26.0" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/wildfly/wildfly-centos7:26.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, diff --git a/assets/operator/okd-x86_64/wildfly/imagestreams/wildfly-runtime-centos7.json b/assets/operator/okd-x86_64/wildfly/imagestreams/wildfly-runtime-centos7.json index ff9f2ef0f..087d7a207 100755 --- a/assets/operator/okd-x86_64/wildfly/imagestreams/wildfly-runtime-centos7.json +++ b/assets/operator/okd-x86_64/wildfly/imagestreams/wildfly-runtime-centos7.json @@ -200,6 +200,48 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "25.0", + "annotations": { + "description": "WildFly 25 runtime dependencies image based on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.", + "iconClass": "icon-wildfly", + "openshift.io/display-name": "WildFly Runtime Dependencies 25", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "supports": "wildfly:25,jee,java", + "tags": "wildfly,java", + "version": "25.0" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/wildfly/wildfly-runtime-centos7:25.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "26.0", + "annotations": { + "description": "WildFly 26 runtime dependencies image based on CentOS 7. For more information about using this image, including OpenShift considerations, see https://github.com/wildfly/wildfly-s2i/blob/current/README.md.", + "iconClass": "icon-wildfly", + "openshift.io/display-name": "WildFly Runtime Dependencies 26", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "supports": "wildfly:26,jee,java", + "tags": "wildfly,java", + "version": "26.0" + }, + "from": { + "kind": "DockerImage", + "name": "quay.io/wildfly/wildfly-runtime-centos7:26.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] },