From 870144d18d95b7e1a0b55766445a21c0ee88d88d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 3 Sep 2020 11:41:52 -0400 Subject: [PATCH] assets: full sync from library This pulls in the following changes: * Add UBI 8 tags to dotnet and java imagestreams * SCL templates (aside from nodejs) use RHEL/CentOS/UBI 8 imagestream tags * Remove unmaintained dotnet templates * Fuse updated to 7.7 --- .../templates/cakephp-mysql-example.json | 6 +- .../templates/cakephp-mysql-persistent.json | 6 +- .../templates/dancer-mysql-example.json | 14 +- .../templates/dancer-mysql-persistent.json | 14 +- .../django/templates/django-psql-example.json | 8 +- .../templates/django-psql-persistent.json | 8 +- .../httpd/templates/httpd-example.json | 2 +- .../java/imagestreams/java-rhel-ppc64le.json | 180 ++++++ .../java/imagestreams/java-rhel7-ppc64le.json | 92 --- ...son => openjdk-11-rhel7-rhel-ppc64le.json} | 0 ...hat-openjdk18-openshift-rhel-ppc64le.json} | 0 ...json => ubi8-openjdk-11-rhel-ppc64le.json} | 0 ....json => ubi8-openjdk-8-rhel-ppc64le.json} | 0 .../mariadb/templates/mariadb-ephemeral.json | 4 +- .../mariadb/templates/mariadb-persistent.json | 4 +- .../mysql/templates/mysql-ephemeral.json | 4 +- .../mysql/templates/mysql-persistent.json | 4 +- .../nginx/templates/nginx-example.json | 4 +- .../nodejs/imagestreams/nodejs-rhel.json | 2 +- .../templates/postgresql-ephemeral.json | 4 +- .../templates/postgresql-persistent.json | 4 +- .../templates/rails-pgsql-persistent.json | 4 +- .../templates/rails-postgresql-example.json | 4 +- .../redis/templates/redis-ephemeral.json | 4 +- .../redis/templates/redis-persistent.json | 4 +- .../templates/cakephp-mysql-example.json | 6 +- .../templates/cakephp-mysql-persistent.json | 6 +- .../templates/dancer-mysql-example.json | 14 +- .../templates/dancer-mysql-persistent.json | 14 +- .../django/templates/django-psql-example.json | 8 +- .../templates/django-psql-persistent.json | 8 +- .../httpd/templates/httpd-example.json | 2 +- .../java/imagestreams/java-rhel-s390x.json | 268 +++++++++ .../java/imagestreams/java-rhel7-s390x.json | 92 --- ...x.json => openj9-11-rhel7-rhel-s390x.json} | 0 ...x.json => openj9-11-rhel8-rhel-s390x.json} | 0 ...0x.json => openj9-8-rhel7-rhel-s390x.json} | 0 ...0x.json => openj9-8-rhel8-rhel-s390x.json} | 0 ....json => openjdk-11-rhel7-rhel-s390x.json} | 0 ...edhat-openjdk18-openshift-rhel-s390x.json} | 0 ...x.json => ubi8-openjdk-11-rhel-s390x.json} | 0 ...0x.json => ubi8-openjdk-8-rhel-s390x.json} | 0 .../mariadb/templates/mariadb-ephemeral.json | 4 +- .../mariadb/templates/mariadb-persistent.json | 4 +- .../mysql/templates/mysql-ephemeral.json | 4 +- .../mysql/templates/mysql-persistent.json | 4 +- .../nginx/templates/nginx-example.json | 4 +- .../nodejs/imagestreams/nodejs-rhel.json | 2 +- .../templates/postgresql-ephemeral.json | 4 +- .../templates/postgresql-persistent.json | 4 +- .../templates/rails-pgsql-persistent.json | 4 +- .../templates/rails-postgresql-example.json | 4 +- .../redis/templates/redis-ephemeral.json | 4 +- .../redis/templates/redis-persistent.json | 4 +- .../templates/cakephp-mysql-example.json | 6 +- .../templates/cakephp-mysql-persistent.json | 6 +- .../templates/dancer-mysql-example.json | 14 +- .../templates/dancer-mysql-persistent.json | 14 +- .../django/templates/django-psql-example.json | 8 +- .../templates/django-psql-persistent.json | 8 +- .../dotnet/templates/dotnet-example.json | 355 ----------- .../templates/dotnet-pgsql-persistent.json | 558 ------------------ .../fis/imagestreams/apicurito-ui-rhel7.json | 17 + .../fuse-apicurito-generator-rhel7.json | 17 + .../fis/imagestreams/fuse7-console-rhel7.json | 20 + .../fuse7-eap-openshift-rhel7.json | 20 + .../fuse7-java-openshift-rhel7.json | 24 +- .../fuse7-karaf-openshift-rhel7.json | 32 +- .../ocp-x86_64/fis/templates/apicurito.json | 4 +- ...use76-console.json => fuse77-console.json} | 10 +- ...fuse77-spring-boot-camel-rest-3scale.json} | 16 +- ... => s2i-fuse77-spring-boot-camel-xml.json} | 16 +- ...json => s2i-fuse77-spring-boot-camel.json} | 16 +- .../httpd/templates/httpd-example.json | 2 +- .../java/imagestreams/java-rhel-x86_64.json | 180 ++++++ .../java/imagestreams/java-rhel7.json | 92 --- ...json => openjdk-11-rhel7-rhel-x86_64.json} | 0 ...json => openjdk-11-rhel8-rhel-x86_64.json} | 0 ...dhat-openjdk18-openshift-rhel-x86_64.json} | 0 ....json => ubi8-openjdk-11-rhel-x86_64.json} | 0 ...7.json => ubi8-openjdk-8-rhel-x86_64.json} | 0 .../mariadb/templates/mariadb-ephemeral.json | 4 +- .../mariadb/templates/mariadb-persistent.json | 4 +- .../mysql/templates/mysql-ephemeral.json | 4 +- .../mysql/templates/mysql-persistent.json | 4 +- .../nginx/templates/nginx-example.json | 4 +- .../nodejs/imagestreams/nodejs-rhel.json | 2 +- .../templates/postgresql-ephemeral.json | 4 +- .../templates/postgresql-persistent.json | 4 +- .../templates/rails-pgsql-persistent.json | 4 +- .../templates/rails-postgresql-example.json | 4 +- .../redis/templates/redis-ephemeral.json | 4 +- .../redis/templates/redis-persistent.json | 4 +- .../templates/cakephp-mysql-example.json | 6 +- .../templates/cakephp-mysql-persistent.json | 6 +- .../templates/dancer-mysql-example.json | 14 +- .../templates/dancer-mysql-persistent.json | 14 +- .../django/templates/django-psql-example.json | 8 +- .../templates/django-psql-persistent.json | 8 +- .../dotnet/templates/dotnet-example.json | 355 ----------- .../templates/dotnet-pgsql-persistent.json | 558 ------------------ .../httpd/templates/httpd-example.json | 2 +- .../{java-ubi8.json => java-ubi.json} | 0 .../mariadb/templates/mariadb-ephemeral.json | 4 +- .../mariadb/templates/mariadb-persistent.json | 4 +- .../mysql/templates/mysql-ephemeral.json | 4 +- .../mysql/templates/mysql-persistent.json | 4 +- .../nginx/templates/nginx-example.json | 4 +- .../templates/postgresql-ephemeral.json | 4 +- .../templates/postgresql-persistent.json | 4 +- .../templates/rails-pgsql-persistent.json | 4 +- .../templates/rails-postgresql-example.json | 4 +- .../redis/templates/redis-ephemeral.json | 4 +- .../redis/templates/redis-persistent.json | 4 +- 114 files changed, 1028 insertions(+), 2308 deletions(-) create mode 100755 assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json delete mode 100755 assets/operator/ocp-ppc64le/java/imagestreams/java-rhel7-ppc64le.json rename assets/operator/ocp-ppc64le/java/imagestreams/{openjdk-11-rhel7-rhel7-ppc64le.json => openjdk-11-rhel7-rhel-ppc64le.json} (100%) rename assets/operator/ocp-ppc64le/java/imagestreams/{redhat-openjdk18-openshift-rhel7-ppc64le.json => redhat-openjdk18-openshift-rhel-ppc64le.json} (100%) rename assets/operator/ocp-ppc64le/java/imagestreams/{ubi8-openjdk-11-rhel7-ppc64le.json => ubi8-openjdk-11-rhel-ppc64le.json} (100%) rename assets/operator/ocp-ppc64le/java/imagestreams/{ubi8-openjdk-8-rhel7-ppc64le.json => ubi8-openjdk-8-rhel-ppc64le.json} (100%) create mode 100755 assets/operator/ocp-s390x/java/imagestreams/java-rhel-s390x.json delete mode 100755 assets/operator/ocp-s390x/java/imagestreams/java-rhel7-s390x.json rename assets/operator/ocp-s390x/java/imagestreams/{openj9-11-rhel7-rhel7-s390x.json => openj9-11-rhel7-rhel-s390x.json} (100%) rename assets/operator/ocp-s390x/java/imagestreams/{openj9-11-rhel8-rhel7-s390x.json => openj9-11-rhel8-rhel-s390x.json} (100%) rename assets/operator/ocp-s390x/java/imagestreams/{openj9-8-rhel7-rhel7-s390x.json => openj9-8-rhel7-rhel-s390x.json} (100%) rename assets/operator/ocp-s390x/java/imagestreams/{openj9-8-rhel8-rhel7-s390x.json => openj9-8-rhel8-rhel-s390x.json} (100%) rename assets/operator/ocp-s390x/java/imagestreams/{openjdk-11-rhel7-rhel7-s390x.json => openjdk-11-rhel7-rhel-s390x.json} (100%) rename assets/operator/ocp-s390x/java/imagestreams/{redhat-openjdk18-openshift-rhel7-s390x.json => redhat-openjdk18-openshift-rhel-s390x.json} (100%) rename assets/operator/ocp-s390x/java/imagestreams/{ubi8-openjdk-11-rhel7-s390x.json => ubi8-openjdk-11-rhel-s390x.json} (100%) rename assets/operator/ocp-s390x/java/imagestreams/{ubi8-openjdk-8-rhel7-s390x.json => ubi8-openjdk-8-rhel-s390x.json} (100%) delete mode 100755 assets/operator/ocp-x86_64/dotnet/templates/dotnet-example.json delete mode 100755 assets/operator/ocp-x86_64/dotnet/templates/dotnet-pgsql-persistent.json rename assets/operator/ocp-x86_64/fis/templates/{fuse76-console.json => fuse77-console.json} (97%) rename assets/operator/ocp-x86_64/fis/templates/{s2i-fuse76-spring-boot-camel-rest-3scale.json => s2i-fuse77-spring-boot-camel-rest-3scale.json} (96%) rename assets/operator/ocp-x86_64/fis/templates/{s2i-fuse76-spring-boot-camel-xml.json => s2i-fuse77-spring-boot-camel-xml.json} (95%) rename assets/operator/ocp-x86_64/fis/templates/{s2i-fuse76-spring-boot-camel.json => s2i-fuse77-spring-boot-camel.json} (96%) create mode 100755 assets/operator/ocp-x86_64/java/imagestreams/java-rhel-x86_64.json delete mode 100755 assets/operator/ocp-x86_64/java/imagestreams/java-rhel7.json rename assets/operator/ocp-x86_64/java/imagestreams/{openjdk-11-rhel7-rhel7.json => openjdk-11-rhel7-rhel-x86_64.json} (100%) rename assets/operator/ocp-x86_64/java/imagestreams/{openjdk-11-rhel8-rhel7.json => openjdk-11-rhel8-rhel-x86_64.json} (100%) rename assets/operator/ocp-x86_64/java/imagestreams/{redhat-openjdk18-openshift-rhel7.json => redhat-openjdk18-openshift-rhel-x86_64.json} (100%) rename assets/operator/ocp-x86_64/java/imagestreams/{ubi8-openjdk-11-rhel7.json => ubi8-openjdk-11-rhel-x86_64.json} (100%) rename assets/operator/ocp-x86_64/java/imagestreams/{ubi8-openjdk-8-rhel7.json => ubi8-openjdk-8-rhel-x86_64.json} (100%) delete mode 100755 assets/operator/okd-x86_64/dotnet/templates/dotnet-example.json delete mode 100755 assets/operator/okd-x86_64/dotnet/templates/dotnet-pgsql-persistent.json rename assets/operator/okd-x86_64/java/imagestreams/{java-ubi8.json => java-ubi.json} (100%) 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 2e7426e06..65bfd4b40 100755 --- a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-example.json @@ -419,7 +419,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:8.0", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3 or latest).", - "value": "7.3", + "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", + "value": "7.3-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 61cd68089..ac2532b53 100755 --- a/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/cakephp/templates/cakephp-mysql-persistent.json @@ -438,7 +438,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:8.0", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3 or latest).", - "value": "7.3", + "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", + "value": "7.3-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 8a6292139..656ccac87 100755 --- a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-example.json @@ -115,7 +115,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26", + "name": "perl:5.26-ubi8", "namespace": "${NAMESPACE}" } }, @@ -330,6 +330,10 @@ { "name": "MYSQL_DATABASE", "value": "${DATABASE_NAME}" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" } ], "image": " ", @@ -388,7 +392,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.7", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -499,6 +503,12 @@ "name": "CPAN_MIRROR", "displayName": "Custom CPAN Mirror URL", "description": "The custom CPAN mirror URL" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "displayName": "MySQL authentication plugin", + "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.", + "value": "mysql_native_password" } ], "labels": { 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 bd11eb5c2..17dac3403 100755 --- a/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/dancer/templates/dancer-mysql-persistent.json @@ -115,7 +115,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26", + "name": "perl:5.26-ubi8", "namespace": "${NAMESPACE}" } }, @@ -347,6 +347,10 @@ { "name": "MYSQL_DATABASE", "value": "${DATABASE_NAME}" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" } ], "image": " ", @@ -407,7 +411,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.7", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -525,6 +529,12 @@ "name": "CPAN_MIRROR", "displayName": "Custom CPAN Mirror URL", "description": "The custom CPAN mirror URL" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "displayName": "MySQL authentication plugin", + "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.", + "value": "mysql_native_password" } ], "labels": { 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 46da1378d..bd7daf65b 100755 --- a/assets/operator/ocp-ppc64le/django/templates/django-psql-example.json +++ b/assets/operator/ocp-ppc64le/django/templates/django-psql-example.json @@ -423,15 +423,15 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6 or latest).", - "value": "3.6", + "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).", + "value": "3.6-ubi8", "required": true }, { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).", + "value": "12-el8", "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 559606e7b..c63b71b51 100755 --- a/assets/operator/ocp-ppc64le/django/templates/django-psql-persistent.json +++ b/assets/operator/ocp-ppc64le/django/templates/django-psql-persistent.json @@ -442,15 +442,15 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6 or latest).", - "value": "3.6", + "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).", + "value": "3.6-ubi8", "required": true }, { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).", + "value": "12-el8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json b/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json index a495d5e72..d9d9d2197 100755 --- a/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-ppc64le/httpd/templates/httpd-example.json @@ -93,7 +93,7 @@ "sourceStrategy": { "from": { "kind": "ImageStreamTag", - "name": "httpd:2.4", + "name": "httpd:2.4-el8", "namespace": "${NAMESPACE}" } }, diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json new file mode 100755 index 000000000..e60982c2e --- /dev/null +++ b/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel-ppc64le.json @@ -0,0 +1,180 @@ +{ + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "java", + "creationTimestamp": null, + "labels": { + "xpaas": "1.4.17" + }, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "1.4.17" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "openjdk-8-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openjdk", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-8:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-8-el7", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL 7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openjdk", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "8", + "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,java", + "tags": "builder,java,openjdk,hidden", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openjdk", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-11:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-el7", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL 7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openjdk", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "11", + "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,java", + "tags": "builder,java,openjdk,hidden", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "description": "Build and run Java applications using Maven.", + "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,openjdk", + "version": "latest" + }, + "from": { + "kind": "ImageStreamTag", + "name": "openjdk-11-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel7-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel7-ppc64le.json deleted file mode 100755 index a98e270f8..000000000 --- a/assets/operator/ocp-ppc64le/java/imagestreams/java-rhel7-ppc64le.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "java", - "creationTimestamp": null, - "labels": { - "xpaas": "1.4.17" - }, - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - } - }, - "spec": { - "lookupPolicy": { - "local": false - }, - "tags": [ - { - "name": "8", - "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,java", - "tags": "builder,java,openjdk", - "version": "8" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "11", - "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,java", - "tags": "builder,java,openjdk", - "version": "11" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "latest", - "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,java", - "tags": "builder,java,openjdk", - "version": "latest" - }, - "from": { - "kind": "ImageStreamTag", - "name": "11" - }, - "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-rhel7-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json similarity index 100% rename from assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel7-ppc64le.json rename to assets/operator/ocp-ppc64le/java/imagestreams/openjdk-11-rhel7-rhel-ppc64le.json diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel7-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json similarity index 100% rename from assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel7-ppc64le.json rename to assets/operator/ocp-ppc64le/java/imagestreams/redhat-openjdk18-openshift-rhel-ppc64le.json diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel7-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json similarity index 100% rename from assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel7-ppc64le.json rename to assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-11-rhel-ppc64le.json diff --git a/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel7-ppc64le.json b/assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json similarity index 100% rename from assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel7-ppc64le.json rename to assets/operator/ocp-ppc64le/java/imagestreams/ubi8-openjdk-8-rhel-ppc64le.json diff --git a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json index baf544b42..b3cc99ff1 100755 --- a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-ephemeral.json @@ -253,8 +253,8 @@ { "name": "MARIADB_VERSION", "displayName": "Version of MariaDB Image", - "description": "Version of MariaDB image to be used (10.3 or latest).", - "value": "10.3", + "description": "Version of MariaDB image to be used (10.3-el7, 10.3-el8, or latest).", + "value": "10.3-el8", "required": true } ], diff --git a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json index 9a2afc289..9af30abbe 100755 --- a/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-ppc64le/mariadb/templates/mariadb-persistent.json @@ -270,8 +270,8 @@ { "name": "MARIADB_VERSION", "displayName": "Version of MariaDB Image", - "description": "Version of MariaDB image to be used (10.3 or latest).", - "value": "10.3", + "description": "Version of MariaDB image to be used (10.3-el7, 10.3-el8, or latest).", + "value": "10.3-el8", "required": true }, { diff --git a/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json index 409398fa8..e6fceb378 100755 --- a/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-ppc64le/mysql/templates/mysql-ephemeral.json @@ -272,8 +272,8 @@ { "name": "MYSQL_VERSION", "displayName": "Version of MySQL Image", - "description": "Version of MySQL image to be used (8.0, or latest).", - "value": "8.0", + "description": "Version of MySQL image to be used (8.0-el7, 8.0-el8, or latest).", + "value": "8.0-el8", "required": true } ], diff --git a/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json b/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json index a60ab5f66..6e36f9871 100755 --- a/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-ppc64le/mysql/templates/mysql-persistent.json @@ -277,8 +277,8 @@ { "name": "MYSQL_VERSION", "displayName": "Version of MySQL Image", - "description": "Version of MySQL image to be used (8.0, or latest).", - "value": "8.0", + "description": "Version of MySQL image to be used (8.0-el7, 8.0-el8, or latest).", + "value": "8.0-el8", "required": true } ], diff --git a/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json b/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json index 56cd4050b..9586e7adf 100755 --- a/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-ppc64le/nginx/templates/nginx-example.json @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16 by default).", - "value": "1.16", + "description": "Version of NGINX image to be used (1.16-el8 by default).", + "value": "1.16-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 fbcb4cd50..8ce9b624e 100755 --- a/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json @@ -165,4 +165,4 @@ "status": { "dockerImageRepository": "" } -} +} \ No newline at end of file diff --git a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json index d77c2933b..b61755011 100755 --- a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-ephemeral.json @@ -248,8 +248,8 @@ { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).", + "value": "10-el8", "required": true } ], diff --git a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json index 9c59d7b4a..e3f752ca1 100755 --- a/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-ppc64le/postgresql/templates/postgresql-persistent.json @@ -272,8 +272,8 @@ { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).", + "value": "10-el8", "required": true } ], 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 865622b62..e03d3a6c1 100755 --- a/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.6-ubi8", "namespace": "${NAMESPACE}" } }, @@ -458,7 +458,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12-el8", "namespace": "${NAMESPACE}" } }, 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 1b4aa3950..9d4366f7f 100755 --- a/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-ppc64le/rails/templates/rails-postgresql-example.json @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.6-ubi8", "namespace": "${NAMESPACE}" } }, @@ -439,7 +439,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12-el8", "namespace": "${NAMESPACE}" } }, diff --git a/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json b/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json index 09bd86f35..e9af758bd 100755 --- a/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-ppc64le/redis/templates/redis-ephemeral.json @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5 or latest).", - "value": "5", + "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", + "value": "5-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 559a60db6..68ee70a6c 100755 --- a/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-ppc64le/redis/templates/redis-persistent.json @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5 or latest).", - "value": "5", + "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", + "value": "5-el8", "required": true } ], 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 2e7426e06..65bfd4b40 100755 --- a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json +++ b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-example.json @@ -419,7 +419,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:8.0", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3 or latest).", - "value": "7.3", + "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", + "value": "7.3-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 61cd68089..ac2532b53 100755 --- a/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json +++ b/assets/operator/ocp-s390x/cakephp/templates/cakephp-mysql-persistent.json @@ -438,7 +438,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:8.0", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3 or latest).", - "value": "7.3", + "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", + "value": "7.3-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 8a6292139..656ccac87 100755 --- a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json +++ b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-example.json @@ -115,7 +115,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26", + "name": "perl:5.26-ubi8", "namespace": "${NAMESPACE}" } }, @@ -330,6 +330,10 @@ { "name": "MYSQL_DATABASE", "value": "${DATABASE_NAME}" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" } ], "image": " ", @@ -388,7 +392,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.7", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -499,6 +503,12 @@ "name": "CPAN_MIRROR", "displayName": "Custom CPAN Mirror URL", "description": "The custom CPAN mirror URL" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "displayName": "MySQL authentication plugin", + "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.", + "value": "mysql_native_password" } ], "labels": { 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 bd11eb5c2..17dac3403 100755 --- a/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json +++ b/assets/operator/ocp-s390x/dancer/templates/dancer-mysql-persistent.json @@ -115,7 +115,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26", + "name": "perl:5.26-ubi8", "namespace": "${NAMESPACE}" } }, @@ -347,6 +347,10 @@ { "name": "MYSQL_DATABASE", "value": "${DATABASE_NAME}" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" } ], "image": " ", @@ -407,7 +411,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.7", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -525,6 +529,12 @@ "name": "CPAN_MIRROR", "displayName": "Custom CPAN Mirror URL", "description": "The custom CPAN mirror URL" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "displayName": "MySQL authentication plugin", + "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.", + "value": "mysql_native_password" } ], "labels": { 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 46da1378d..bd7daf65b 100755 --- a/assets/operator/ocp-s390x/django/templates/django-psql-example.json +++ b/assets/operator/ocp-s390x/django/templates/django-psql-example.json @@ -423,15 +423,15 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6 or latest).", - "value": "3.6", + "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).", + "value": "3.6-ubi8", "required": true }, { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).", + "value": "12-el8", "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 559606e7b..c63b71b51 100755 --- a/assets/operator/ocp-s390x/django/templates/django-psql-persistent.json +++ b/assets/operator/ocp-s390x/django/templates/django-psql-persistent.json @@ -442,15 +442,15 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6 or latest).", - "value": "3.6", + "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).", + "value": "3.6-ubi8", "required": true }, { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).", + "value": "12-el8", "required": true }, { diff --git a/assets/operator/ocp-s390x/httpd/templates/httpd-example.json b/assets/operator/ocp-s390x/httpd/templates/httpd-example.json index a495d5e72..d9d9d2197 100755 --- a/assets/operator/ocp-s390x/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-s390x/httpd/templates/httpd-example.json @@ -93,7 +93,7 @@ "sourceStrategy": { "from": { "kind": "ImageStreamTag", - "name": "httpd:2.4", + "name": "httpd:2.4-el8", "namespace": "${NAMESPACE}" } }, diff --git a/assets/operator/ocp-s390x/java/imagestreams/java-rhel-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/java-rhel-s390x.json new file mode 100755 index 000000000..53808c10e --- /dev/null +++ b/assets/operator/ocp-s390x/java/imagestreams/java-rhel-s390x.json @@ -0,0 +1,268 @@ +{ + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "java", + "creationTimestamp": null, + "labels": { + "xpaas": "1.4.17" + }, + "annotations": { + "openshift.io/display-name": "OpenJ9", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "1.4.17" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "openjdk-8-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openjdk", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-8:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-8-el7", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL 7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openjdk", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "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": { + "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", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openj9,hidden", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openj9/openj9-8-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openjdk", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-11:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-el7", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL 7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openjdk", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "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": { + "description": "Build and run Java applications using Maven and OpenJ9 11.", + "iconClass": "icon-rh-openj9", + "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openj9,hidden", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openj9/openj9-11-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "description": "Build and run Java applications using Maven.", + "iconClass": "icon-rh-openj9", + "openshift.io/display-name": "Java (Latest)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java", + "tags": "builder,java,openj9", + "version": "latest" + }, + "from": { + "kind": "ImageStreamTag", + "name": "openjdk-11-ubi8" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/java/imagestreams/java-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/java-rhel7-s390x.json deleted file mode 100755 index da0688fb0..000000000 --- a/assets/operator/ocp-s390x/java/imagestreams/java-rhel7-s390x.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "java", - "creationTimestamp": null, - "labels": { - "xpaas": "1.4.17" - }, - "annotations": { - "openshift.io/display-name": "OpenJ9", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - } - }, - "spec": { - "lookupPolicy": { - "local": false - }, - "tags": [ - { - "name": "8", - "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", - "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": "11", - "annotations": { - "description": "Build and run Java applications using Maven and OpenJ9 11.", - "iconClass": "icon-rh-openj9", - "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL7)", - "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": "latest", - "annotations": { - "description": "Build and run Java applications using Maven and OpenJ9 11.", - "iconClass": "icon-rh-openj9", - "openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL7)", - "sampleContextDir": "undertow-servlet", - "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", - "supports": "java:11,java", - "tags": "builder,java,openj9", - "version": "latest" - }, - "from": { - "kind": "ImageStreamTag", - "name": "11" - }, - "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-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel7-rhel-s390x.json similarity index 100% rename from assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel7-rhel7-s390x.json rename to assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel7-rhel-s390x.json diff --git a/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel8-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel8-rhel-s390x.json similarity index 100% rename from assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel8-rhel7-s390x.json rename to assets/operator/ocp-s390x/java/imagestreams/openj9-11-rhel8-rhel-s390x.json diff --git a/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel7-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel7-rhel-s390x.json similarity index 100% rename from assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel7-rhel7-s390x.json rename to assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel7-rhel-s390x.json diff --git a/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel8-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel8-rhel-s390x.json similarity index 100% rename from assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel8-rhel7-s390x.json rename to assets/operator/ocp-s390x/java/imagestreams/openj9-8-rhel8-rhel-s390x.json diff --git a/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json similarity index 100% rename from assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel7-s390x.json rename to assets/operator/ocp-s390x/java/imagestreams/openjdk-11-rhel7-rhel-s390x.json diff --git a/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json similarity index 100% rename from assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel7-s390x.json rename to assets/operator/ocp-s390x/java/imagestreams/redhat-openjdk18-openshift-rhel-s390x.json diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json similarity index 100% rename from assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel7-s390x.json rename to assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-11-rhel-s390x.json diff --git a/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel7-s390x.json b/assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json similarity index 100% rename from assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel7-s390x.json rename to assets/operator/ocp-s390x/java/imagestreams/ubi8-openjdk-8-rhel-s390x.json diff --git a/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json b/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json index baf544b42..b3cc99ff1 100755 --- a/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-s390x/mariadb/templates/mariadb-ephemeral.json @@ -253,8 +253,8 @@ { "name": "MARIADB_VERSION", "displayName": "Version of MariaDB Image", - "description": "Version of MariaDB image to be used (10.3 or latest).", - "value": "10.3", + "description": "Version of MariaDB image to be used (10.3-el7, 10.3-el8, or latest).", + "value": "10.3-el8", "required": true } ], diff --git a/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json b/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json index 9a2afc289..9af30abbe 100755 --- a/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-s390x/mariadb/templates/mariadb-persistent.json @@ -270,8 +270,8 @@ { "name": "MARIADB_VERSION", "displayName": "Version of MariaDB Image", - "description": "Version of MariaDB image to be used (10.3 or latest).", - "value": "10.3", + "description": "Version of MariaDB image to be used (10.3-el7, 10.3-el8, or latest).", + "value": "10.3-el8", "required": true }, { diff --git a/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json b/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json index 409398fa8..e6fceb378 100755 --- a/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-s390x/mysql/templates/mysql-ephemeral.json @@ -272,8 +272,8 @@ { "name": "MYSQL_VERSION", "displayName": "Version of MySQL Image", - "description": "Version of MySQL image to be used (8.0, or latest).", - "value": "8.0", + "description": "Version of MySQL image to be used (8.0-el7, 8.0-el8, or latest).", + "value": "8.0-el8", "required": true } ], diff --git a/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json b/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json index a60ab5f66..6e36f9871 100755 --- a/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-s390x/mysql/templates/mysql-persistent.json @@ -277,8 +277,8 @@ { "name": "MYSQL_VERSION", "displayName": "Version of MySQL Image", - "description": "Version of MySQL image to be used (8.0, or latest).", - "value": "8.0", + "description": "Version of MySQL image to be used (8.0-el7, 8.0-el8, or latest).", + "value": "8.0-el8", "required": true } ], diff --git a/assets/operator/ocp-s390x/nginx/templates/nginx-example.json b/assets/operator/ocp-s390x/nginx/templates/nginx-example.json index 56cd4050b..9586e7adf 100755 --- a/assets/operator/ocp-s390x/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-s390x/nginx/templates/nginx-example.json @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16 by default).", - "value": "1.16", + "description": "Version of NGINX image to be used (1.16-el8 by default).", + "value": "1.16-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 fbcb4cd50..8ce9b624e 100755 --- a/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json @@ -165,4 +165,4 @@ "status": { "dockerImageRepository": "" } -} +} \ No newline at end of file diff --git a/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json b/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json index d77c2933b..b61755011 100755 --- a/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-s390x/postgresql/templates/postgresql-ephemeral.json @@ -248,8 +248,8 @@ { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).", + "value": "10-el8", "required": true } ], diff --git a/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json b/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json index 9c59d7b4a..e3f752ca1 100755 --- a/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-s390x/postgresql/templates/postgresql-persistent.json @@ -272,8 +272,8 @@ { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).", + "value": "10-el8", "required": true } ], 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 865622b62..e03d3a6c1 100755 --- a/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json +++ b/assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.6-ubi8", "namespace": "${NAMESPACE}" } }, @@ -458,7 +458,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12-el8", "namespace": "${NAMESPACE}" } }, 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 1b4aa3950..9d4366f7f 100755 --- a/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json +++ b/assets/operator/ocp-s390x/rails/templates/rails-postgresql-example.json @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.6-ubi8", "namespace": "${NAMESPACE}" } }, @@ -439,7 +439,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12-el8", "namespace": "${NAMESPACE}" } }, diff --git a/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json b/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json index 09bd86f35..e9af758bd 100755 --- a/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-s390x/redis/templates/redis-ephemeral.json @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5 or latest).", - "value": "5", + "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", + "value": "5-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 559a60db6..68ee70a6c 100755 --- a/assets/operator/ocp-s390x/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-s390x/redis/templates/redis-persistent.json @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5 or latest).", - "value": "5", + "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", + "value": "5-el8", "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 2e7426e06..65bfd4b40 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 @@ -419,7 +419,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:8.0", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3 or latest).", - "value": "7.3", + "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", + "value": "7.3-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 61cd68089..ac2532b53 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 @@ -438,7 +438,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:8.0", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3 or latest).", - "value": "7.3", + "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", + "value": "7.3-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 8a6292139..656ccac87 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 @@ -115,7 +115,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26", + "name": "perl:5.26-ubi8", "namespace": "${NAMESPACE}" } }, @@ -330,6 +330,10 @@ { "name": "MYSQL_DATABASE", "value": "${DATABASE_NAME}" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" } ], "image": " ", @@ -388,7 +392,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.7", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -499,6 +503,12 @@ "name": "CPAN_MIRROR", "displayName": "Custom CPAN Mirror URL", "description": "The custom CPAN mirror URL" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "displayName": "MySQL authentication plugin", + "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.", + "value": "mysql_native_password" } ], "labels": { 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 bd11eb5c2..17dac3403 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 @@ -115,7 +115,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26", + "name": "perl:5.26-ubi8", "namespace": "${NAMESPACE}" } }, @@ -347,6 +347,10 @@ { "name": "MYSQL_DATABASE", "value": "${DATABASE_NAME}" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" } ], "image": " ", @@ -407,7 +411,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.7", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -525,6 +529,12 @@ "name": "CPAN_MIRROR", "displayName": "Custom CPAN Mirror URL", "description": "The custom CPAN mirror URL" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "displayName": "MySQL authentication plugin", + "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.", + "value": "mysql_native_password" } ], "labels": { 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 46da1378d..bd7daf65b 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 @@ -423,15 +423,15 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6 or latest).", - "value": "3.6", + "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).", + "value": "3.6-ubi8", "required": true }, { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).", + "value": "12-el8", "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 559606e7b..c63b71b51 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 @@ -442,15 +442,15 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6 or latest).", - "value": "3.6", + "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).", + "value": "3.6-ubi8", "required": true }, { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).", + "value": "12-el8", "required": true }, { diff --git a/assets/operator/ocp-x86_64/dotnet/templates/dotnet-example.json b/assets/operator/ocp-x86_64/dotnet/templates/dotnet-example.json deleted file mode 100755 index 03c1b0085..000000000 --- a/assets/operator/ocp-x86_64/dotnet/templates/dotnet-example.json +++ /dev/null @@ -1,355 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "dotnet-example", - "creationTimestamp": null, - "annotations": { - "description": "An example .NET Core application.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core Example", - "tags": "quickstart,dotnet,.net", - "template.openshift.io/documentation-url": "https://github.com/redhat-developer/s2i-dotnetcore", - "template.openshift.io/provider-display-name": "Red Hat, Inc.", - "template.openshift.io/support-url": "https://access.redhat.com" - } - }, - "objects": [ - { - "apiVersion": "v1", - "kind": "Route", - "metadata": { - "name": "${NAME}" - }, - "spec": { - "host": "${APPLICATION_DOMAIN}", - "to": { - "kind": "Service", - "name": "${NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "Exposes and load balances the application pods" - }, - "name": "${NAME}" - }, - "spec": { - "ports": [ - { - "name": "web", - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "name": "${NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "annotations": { - "description": "Keeps track of changes in the application image" - }, - "name": "${NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "annotations": { - "description": "Defines how to build the application" - }, - "name": "${NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "DOTNET_STARTUP_PROJECT", - "value": "${DOTNET_STARTUP_PROJECT}" - }, - { - "name": "DOTNET_ASSEMBLY_NAME", - "value": "${DOTNET_ASSEMBLY_NAME}" - }, - { - "name": "DOTNET_NPM_TOOLS", - "value": "${DOTNET_NPM_TOOLS}" - }, - { - "name": "DOTNET_TEST_PROJECTS", - "value": "${DOTNET_TEST_PROJECTS}" - }, - { - "name": "DOTNET_CONFIGURATION", - "value": "${DOTNET_CONFIGURATION}" - }, - { - "name": "DOTNET_RESTORE_SOURCES", - "value": "${DOTNET_RESTORE_SOURCES}" - }, - { - "name": "DOTNET_TOOLS", - "value": "${DOTNET_TOOLS}" - }, - { - "name": "DOTNET_PUBLISH_READYTORUN", - "value": "${DOTNET_PUBLISH_READYTORUN}" - }, - { - "name": "DOTNET_RESTORE_CONFIGFILE", - "value": "${DOTNET_RESTORE_CONFIGFILE}" - } - ], - "from": { - "kind": "ImageStreamTag", - "name": "${DOTNET_IMAGE_STREAM_TAG}", - "namespace": "${NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "type": "ImageChange" - }, - { - "type": "ConfigChange" - }, - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "annotations": { - "description": "Defines how to deploy the application server" - }, - "name": "${NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "name": "${NAME}" - }, - "strategy": { - "type": "Rolling" - }, - "template": { - "metadata": { - "labels": { - "name": "${NAME}" - }, - "name": "${NAME}" - }, - "spec": { - "containers": [ - { - "env": [], - "image": " ", - "livenessProbe": { - "httpGet": { - "path": "/", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 40, - "timeoutSeconds": 15 - }, - "name": "dotnet-app", - "ports": [ - { - "containerPort": 8080 - } - ], - "readinessProbe": { - "httpGet": { - "path": "/", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 10, - "timeoutSeconds": 30 - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dotnet-app" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "NAME", - "displayName": "Name", - "description": "The name assigned to all of the frontend objects defined in this template.", - "value": "dotnet-example", - "required": true - }, - { - "name": "MEMORY_LIMIT", - "displayName": "Memory Limit", - "description": "Maximum amount of memory the container can use.", - "value": "128Mi", - "required": true - }, - { - "name": "DOTNET_IMAGE_STREAM_TAG", - "displayName": ".NET builder", - "description": "The image stream tag which is used to build the code.", - "value": "dotnet:3.0", - "required": true - }, - { - "name": "NAMESPACE", - "displayName": "Namespace", - "description": "The OpenShift Namespace where the ImageStream resides.", - "value": "openshift", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "The URL of the repository with your application source code.", - "value": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_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": "dotnetcore-3.0" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Set this to use a subdirectory of the source code repository" - }, - { - "name": "APPLICATION_DOMAIN", - "displayName": "Application Hostname", - "description": "The exposed hostname that will route to the .NET Core service, if left blank a value will be defaulted." - }, - { - "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]{40}" - }, - { - "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]{40}" - }, - { - "name": "DOTNET_STARTUP_PROJECT", - "displayName": "Startup Project", - "description": "Set this to a project file (e.g. csproj) or a folder containing a single project file.", - "value": "app" - }, - { - "name": "DOTNET_PUBLISH_READYTORUN", - "displayName": "Ahead-of-time compilation", - "description": "Set this to 'true' to perform an ahead-of-time compilation." - }, - { - "name": "DOTNET_ASSEMBLY_NAME", - "displayName": "Startup Assembly", - "description": "Set this when the assembly name is overridden in the project file." - }, - { - "name": "DOTNET_TOOLS", - "displayName": ".NET Tools", - "description": "Set this to a space separated list of .NET tools needed to publish." - }, - { - "name": "DOTNET_NPM_TOOLS", - "displayName": "Npm Tools", - "description": "Set this to a space separated list of npm tools needed to publish." - }, - { - "name": "DOTNET_TEST_PROJECTS", - "displayName": "Test projects", - "description": "Set this to a space separated list of test projects to run before publishing." - }, - { - "name": "DOTNET_CONFIGURATION", - "displayName": "Configuration", - "description": "Set this to configuration (Release/Debug).", - "value": "Release" - }, - { - "name": "DOTNET_RESTORE_SOURCES", - "displayName": "NuGet package sources", - "description": "Set this to override the NuGet.config sources. Cannot be combined with DOTNET_RESTORE_CONFIGFILE." - }, - { - "name": "DOTNET_RESTORE_CONFIGFILE", - "displayName": "NuGet.Config file", - "description": "Set this to a Nuget.Config file. Cannot be combined with DOTNET_RESTORE_SOURCES." - } - ] -} \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/dotnet/templates/dotnet-pgsql-persistent.json b/assets/operator/ocp-x86_64/dotnet/templates/dotnet-pgsql-persistent.json deleted file mode 100755 index d840f3fdb..000000000 --- a/assets/operator/ocp-x86_64/dotnet/templates/dotnet-pgsql-persistent.json +++ /dev/null @@ -1,558 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "dotnet-pgsql-persistent", - "creationTimestamp": null, - "annotations": { - "description": "An example .NET Core application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core + PostgreSQL (Persistent)", - "tags": "quickstart,dotnet", - "template.openshift.io/documentation-url": "https://github.com/redhat-developer/s2i-dotnetcore", - "template.openshift.io/provider-display-name": "Red Hat, Inc.", - "template.openshift.io/support-url": "https://access.redhat.com" - } - }, - "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Secret", - "metadata": { - "name": "${NAME}" - }, - "stringData": { - "connect-string": "Host=${DATABASE_SERVICE_NAME};Database=${DATABASE_NAME};Username=${DATABASE_USER};Password=${DATABASE_PASSWORD}", - "database-password": "${DATABASE_PASSWORD}" - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "Exposes and load balances the application pods", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${DATABASE_SERVICE_NAME}\", \"kind\": \"Service\"}]" - }, - "name": "${NAME}" - }, - "spec": { - "ports": [ - { - "name": "web", - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "name": "${NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Route", - "metadata": { - "name": "${NAME}" - }, - "spec": { - "host": "${APPLICATION_DOMAIN}", - "to": { - "kind": "Service", - "name": "${NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "annotations": { - "description": "Keeps track of changes in the application image" - }, - "name": "${NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "annotations": { - "description": "Defines how to build the application" - }, - "name": "${NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "postCommit": {}, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "DOTNET_STARTUP_PROJECT", - "value": "${DOTNET_STARTUP_PROJECT}" - }, - { - "name": "DOTNET_ASSEMBLY_NAME", - "value": "${DOTNET_ASSEMBLY_NAME}" - }, - { - "name": "DOTNET_NPM_TOOLS", - "value": "${DOTNET_NPM_TOOLS}" - }, - { - "name": "DOTNET_TEST_PROJECTS", - "value": "${DOTNET_TEST_PROJECTS}" - }, - { - "name": "DOTNET_CONFIGURATION", - "value": "${DOTNET_CONFIGURATION}" - }, - { - "name": "DOTNET_RESTORE_SOURCES", - "value": "${DOTNET_RESTORE_SOURCES}" - }, - { - "name": "DOTNET_TOOLS", - "value": "${DOTNET_TOOLS}" - } - ], - "from": { - "kind": "ImageStreamTag", - "name": "${DOTNET_IMAGE_STREAM_TAG}", - "namespace": "${NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "type": "ImageChange" - }, - { - "type": "ConfigChange" - }, - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "annotations": { - "description": "Defines how to deploy the application server" - }, - "name": "${NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "name": "${NAME}" - }, - "strategy": { - "resources": {}, - "rollingParams": { - "intervalSeconds": 1, - "maxSurge": "25%", - "maxUnavailable": "25%", - "timeoutSeconds": 600, - "updatePeriodSeconds": 1 - }, - "type": "Rolling" - }, - "template": { - "metadata": { - "labels": { - "name": "${NAME}" - }, - "name": "${NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "ConnectionString", - "valueFrom": { - "secretKeyRef": { - "key": "connect-string", - "name": "${NAME}" - } - } - } - ], - "image": " ", - "livenessProbe": { - "httpGet": { - "path": "/", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 40, - "timeoutSeconds": 10 - }, - "name": "dotnet-pgsql-persistent", - "ports": [ - { - "containerPort": 8080 - } - ], - "readinessProbe": { - "httpGet": { - "path": "/", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 10, - "timeoutSeconds": 30 - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dotnet-pgsql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "PersistentVolumeClaim", - "metadata": { - "name": "${DATABASE_SERVICE_NAME}" - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "${VOLUME_CAPACITY}" - } - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "Exposes the database server" - }, - "name": "${DATABASE_SERVICE_NAME}" - }, - "spec": { - "ports": [ - { - "name": "postgresql", - "port": 5432, - "targetPort": 5432 - } - ], - "selector": { - "name": "${DATABASE_SERVICE_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "annotations": { - "description": "Defines how to deploy the database" - }, - "name": "${DATABASE_SERVICE_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "name": "${DATABASE_SERVICE_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "name": "${DATABASE_SERVICE_NAME}" - }, - "name": "${DATABASE_SERVICE_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "POSTGRESQL_USER", - "value": "${DATABASE_USER}" - }, - { - "name": "POSTGRESQL_PASSWORD", - "valueFrom": { - "secretKeyRef": { - "key": "database-password", - "name": "${NAME}" - } - } - }, - { - "name": "POSTGRESQL_DATABASE", - "value": "${DATABASE_NAME}" - }, - { - "name": "POSTGRESQL_MAX_CONNECTIONS", - "value": "${POSTGRESQL_MAX_CONNECTIONS}" - }, - { - "name": "POSTGRESQL_SHARED_BUFFERS", - "value": "${POSTGRESQL_SHARED_BUFFERS}" - } - ], - "image": " ", - "livenessProbe": { - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 5432 - }, - "timeoutSeconds": 1 - }, - "name": "postgresql", - "ports": [ - { - "containerPort": 5432 - } - ], - "resources": { - "limits": { - "memory": "${MEMORY_POSTGRESQL_LIMIT}" - } - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/pgsql/data", - "name": "${DATABASE_SERVICE_NAME}-data" - } - ] - } - ], - "volumes": [ - { - "name": "${DATABASE_SERVICE_NAME}-data", - "persistentVolumeClaim": { - "claimName": "${DATABASE_SERVICE_NAME}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:9.5", - "namespace": "openshift" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "NAME", - "displayName": "Name", - "description": "The name assigned to all of the frontend objects defined in this template.", - "value": "musicstore", - "required": true - }, - { - "name": "MEMORY_LIMIT", - "displayName": "Memory Limit", - "description": "Maximum amount of memory the .NET Core container can use.", - "value": "128Mi", - "required": true - }, - { - "name": "MEMORY_POSTGRESQL_LIMIT", - "displayName": "Memory Limit (PostgreSQL)", - "description": "Maximum amount of memory the PostgreSQL container can use.", - "value": "128Mi", - "required": true - }, - { - "name": "VOLUME_CAPACITY", - "displayName": "Volume Capacity", - "description": "Volume space available for data, e.g. 512Mi, 2Gi", - "value": "256Mi", - "required": true - }, - { - "name": "DOTNET_IMAGE_STREAM_TAG", - "displayName": ".NET builder", - "description": "The image stream tag which is used to build the code.", - "value": "dotnet:2.1", - "required": true - }, - { - "name": "NAMESPACE", - "displayName": "Namespace", - "description": "The OpenShift Namespace where the .NET builder ImageStream resides.", - "value": "openshift", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "The URL of the repository with your application source code.", - "value": "https://github.com/redhat-developer/s2i-aspnet-musicstore-ex.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_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": "rel/2.1-example" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Set this to the relative path to your project if it is not in the root of your repository." - }, - { - "name": "DOTNET_STARTUP_PROJECT", - "displayName": "Startup Project", - "description": "Set this to a project file (e.g. csproj) or a folder containing a single project file.", - "value": "samples/MusicStore" - }, - { - "name": "DOTNET_ASSEMBLY_NAME", - "displayName": "Startup Assembly", - "description": "Set this when the assembly name is overridden in the project file." - }, - { - "name": "DOTNET_TOOLS", - "displayName": ".NET Tools", - "description": "Set this to a space separated list of .NET tools needed to publish." - }, - { - "name": "DOTNET_NPM_TOOLS", - "displayName": "Npm Tools", - "description": "Set this to a space separated list of npm tools needed to publish." - }, - { - "name": "DOTNET_TEST_PROJECTS", - "displayName": "Test projects", - "description": "Set this to a space separated list of test projects to run before publishing." - }, - { - "name": "DOTNET_CONFIGURATION", - "displayName": "Configuration", - "description": "Set this to configuration (Release/Debug).", - "value": "Release" - }, - { - "name": "DOTNET_RESTORE_SOURCES", - "displayName": "NuGet package sources", - "description": "Set this to override the NuGet.config sources." - }, - { - "name": "APPLICATION_DOMAIN", - "displayName": "Application Hostname", - "description": "The exposed hostname that will route to the .NET Core service, if left blank a value will be defaulted." - }, - { - "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]{40}" - }, - { - "name": "DATABASE_SERVICE_NAME", - "displayName": "Database Service Name", - "value": "postgresql", - "required": true - }, - { - "name": "DATABASE_USER", - "displayName": "Database Username", - "generate": "expression", - "from": "user[A-Z0-9]{3}" - }, - { - "name": "DATABASE_PASSWORD", - "displayName": "Database Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}" - }, - { - "name": "DATABASE_NAME", - "displayName": "Database Name", - "value": "musicstore", - "required": true - }, - { - "name": "POSTGRESQL_MAX_CONNECTIONS", - "displayName": "Maximum Database Connections", - "value": "100" - }, - { - "name": "POSTGRESQL_SHARED_BUFFERS", - "displayName": "Shared Buffer Amount", - "value": "12MB" - } - ], - "labels": { - "template": "dotnet-pgsql-persistent" - } -} \ 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 f1a33c13f..d2ce23fc7 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 @@ -98,6 +98,23 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.7", + "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:1.7" + }, + "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 ea5673c16..a0a276bc5 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 @@ -98,6 +98,23 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.7", + "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:1.7" + }, + "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 d0162d90f..e5fe5c508 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 @@ -153,6 +153,26 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.7", + "annotations": { + "description": "Red Hat Fuse 7.7 Console image.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.7 Console", + "supports": "jboss-fuse:7.7.0,java:8,xpaas:1.2", + "tags": "jboss-fuse,hawtio,java,xpaas,hidden", + "version": "1.7" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-console:1.7" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, 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 f5bc63a4f..d77178e85 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 @@ -153,6 +153,26 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.7", + "annotations": { + "description": "Red Hat Fuse 7.7 EAP S2I images.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.7 EAP", + "supports": "jboss-fuse:7.7.0,java:8,xpaas:1.2", + "tags": "builder,jboss-fuse,java,eap,xpaas,hidden", + "version": "1.7" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-eap-openshift:1.7" + }, + "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 7e2575534..7f9bf5f77 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 @@ -137,12 +137,12 @@ { "name": "1.6", "annotations": { - "description": "Red Hat Fuse 7.6 Java S2I images.", + "description": "Red Hat Fuse 7.7 Java S2I images.", "iconClass": "icon-rh-integration", "openshift.io/display-name": "Red Hat Fuse 7.6 Java", "supports": "jboss-fuse:7.6.0,java:8,xpaas:1.2", "tags": "builder,jboss-fuse,java,xpaas,hidden", - "version": "1.6" + "version": "1.7" }, "from": { "kind": "DockerImage", @@ -153,6 +153,26 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "1.7", + "annotations": { + "description": "Red Hat Fuse 7.7 Java S2I images.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.7 Java", + "supports": "jboss-fuse:7.7.0,java:8,xpaas:1.2", + "tags": "builder,jboss-fuse,java,xpaas,hidden", + "version": "1.7" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-java-openshift:1.7" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } } ] }, 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 a442da670..44dfb377e 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 @@ -135,18 +135,38 @@ } }, { - "name": "1.6", + "name": "1.7", "annotations": { - "description": "Red Hat Fuse 7.6 Karaf S2I images.", + "description": "Red Hat Fuse 7.7 Karaf S2I images.", "iconClass": "icon-rh-integration", - "openshift.io/display-name": "Red Hat Fuse 7.6 Karaf", - "supports": "jboss-fuse:7.6.0,java:8,xpaas:1.2", + "openshift.io/display-name": "Red Hat Fuse 7.7 Karaf", + "supports": "jboss-fuse:7.7.0,java:8,xpaas:1.2", "tags": "builder,jboss-fuse,java,karaf,xpaas,hidden", - "version": "1.6" + "version": "1.7" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/fuse7/fuse-karaf-openshift:1.6" + "name": "registry.redhat.io/fuse7/fuse-karaf-openshift:1.7" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "1.7", + "annotations": { + "description": "Red Hat Fuse 7.7 Karaf S2I images.", + "iconClass": "icon-rh-integration", + "openshift.io/display-name": "Red Hat Fuse 7.7 Karaf", + "supports": "jboss-fuse:7.7.0,java:8,xpaas:1.2", + "tags": "builder,jboss-fuse,java,karaf,xpaas,hidden", + "version": "1.7" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/fuse7/fuse-karaf-openshift:1.7" }, "generation": null, "importPolicy": {}, diff --git a/assets/operator/ocp-x86_64/fis/templates/apicurito.json b/assets/operator/ocp-x86_64/fis/templates/apicurito.json index 7e087a712..924e2ec53 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.6" + "version": "1.7" } }, "message": "Apicurito is now deployed to https://${ROUTE_HOSTNAME}.", @@ -347,7 +347,7 @@ "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "1.6", + "value": "1.7", "required": true }, { diff --git a/assets/operator/ocp-x86_64/fis/templates/fuse76-console.json b/assets/operator/ocp-x86_64/fis/templates/fuse77-console.json similarity index 97% rename from assets/operator/ocp-x86_64/fis/templates/fuse76-console.json rename to assets/operator/ocp-x86_64/fis/templates/fuse77-console.json index 87698db90..378898b07 100755 --- a/assets/operator/ocp-x86_64/fis/templates/fuse76-console.json +++ b/assets/operator/ocp-x86_64/fis/templates/fuse77-console.json @@ -2,7 +2,7 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "fuse76-console", + "name": "fuse77-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.6 Console", + "openshift.io/display-name": "Red Hat Fuse 7.7 Console", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "hawtio,java,fis,jboss-fuse", - "version": "1.6" + "version": "1.7" } }, "objects": [ @@ -248,14 +248,14 @@ "name": "APP_NAME", "displayName": "Application Name", "description": "The name assigned to the application.", - "value": "fuse76-console", + "value": "fuse77-console", "required": true }, { "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "1.6", + "value": "1.7", "required": true }, { diff --git a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel-rest-3scale.json b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel-rest-3scale.json similarity index 96% rename from assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel-rest-3scale.json rename to assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel-rest-3scale.json index 5d93df777..3557ae073 100755 --- a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel-rest-3scale.json +++ b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel-rest-3scale.json @@ -2,15 +2,15 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "s2i-fuse76-spring-boot-camel-rest-3scale", + "name": "s2i-fuse77-spring-boot-camel-rest-3scale", "creationTimestamp": null, "annotations": { "description": "Spring Boot, 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.6 Camel REST DSL and 3Scale", + "openshift.io/display-name": "Red Hat Fuse 7.7 Camel REST DSL and 3Scale", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "quickstart,java,springboot,fis,jboss-fuse,3scale", - "version": "1.6" + "version": "1.7" } }, "objects": [ @@ -296,7 +296,7 @@ "name": "APP_NAME", "displayName": "Application Name", "description": "The name assigned to the application.", - "value": "s2i-fuse76-spring-boot-camel-rest-3scale", + "value": "s2i-fuse77-spring-boot-camel-rest-3scale", "required": true }, { @@ -310,7 +310,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-1.0.0.fuse-760022-redhat-00001" + "value": "spring-boot-camel-rest-3scale-1.0.0.fuse-770010-redhat-00003" }, { "name": "SERVICE_NAME", @@ -322,13 +322,13 @@ "name": "BUILDER_VERSION", "displayName": "Builder version", "description": "The version of the FIS S2I builder image to use.", - "value": "1.6" + "value": "1.7" }, { "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "1.0.0.fuse-760022-redhat-00001" + "value": "1.0.0.fuse-770010-redhat-00003" }, { "name": "MAVEN_ARGS", @@ -409,6 +409,6 @@ } ], "labels": { - "template": "s2i-fuse76-spring-boot-camel-rest-3scale" + "template": "s2i-fuse77-spring-boot-camel-rest-3scale" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel-xml.json b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel-xml.json similarity index 95% rename from assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel-xml.json rename to assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel-xml.json index 982b53fa3..1e3c25e06 100755 --- a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel-xml.json +++ b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel-xml.json @@ -2,15 +2,15 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "s2i-fuse76-spring-boot-camel-xml", + "name": "s2i-fuse77-spring-boot-camel-xml", "creationTimestamp": null, "annotations": { "description": "Spring Boot and Camel Xml QuickStart. This example demonstrates how you can use Apache Camel with Spring Boot on OpenShift. The quickstart uses Spring Boot 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.6 Camel XML DSL with Spring Boot", + "openshift.io/display-name": "Red Hat Fuse 7.7 Camel XML DSL with Spring Boot", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "quickstart,java,springboot,fis,jboss-fuse", - "version": "1.6" + "version": "1.7" } }, "objects": [ @@ -240,7 +240,7 @@ "name": "APP_NAME", "displayName": "Application Name", "description": "The name assigned to the application.", - "value": "s2i-fuse76-spring-boot-camel-xml", + "value": "s2i-fuse77-spring-boot-camel-xml", "required": true }, { @@ -254,19 +254,19 @@ "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-1.0.0.fuse-760022-redhat-00001" + "value": "spring-boot-camel-xml-1.0.0.fuse-770010-redhat-00003" }, { "name": "BUILDER_VERSION", "displayName": "Builder version", "description": "The version of the FIS S2I builder image to use.", - "value": "1.6" + "value": "1.7" }, { "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "1.0.0.fuse-760022-redhat-00001" + "value": "1.0.0.fuse-770010-redhat-00003" }, { "name": "MAVEN_ARGS", @@ -347,6 +347,6 @@ } ], "labels": { - "template": "s2i-fuse76-spring-boot-camel-xml" + "template": "s2i-fuse77-spring-boot-camel-xml" } } \ No newline at end of file diff --git a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel.json b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel.json similarity index 96% rename from assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel.json rename to assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel.json index 129d2dfa6..f92e219bf 100755 --- a/assets/operator/ocp-x86_64/fis/templates/s2i-fuse76-spring-boot-camel.json +++ b/assets/operator/ocp-x86_64/fis/templates/s2i-fuse77-spring-boot-camel.json @@ -2,15 +2,15 @@ "kind": "Template", "apiVersion": "v1", "metadata": { - "name": "s2i-fuse76-spring-boot-camel", + "name": "s2i-fuse77-spring-boot-camel", "creationTimestamp": null, "annotations": { "description": "Spring Boot and Camel QuickStart. This example demonstrates how you can use Apache Camel with Spring Boot 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.6 Camel with Spring Boot", + "openshift.io/display-name": "Red Hat Fuse 7.7 Camel with Spring Boot", "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "quickstart,java,springboot,fis,jboss-fuse", - "version": "1.6" + "version": "1.7" } }, "objects": [ @@ -240,7 +240,7 @@ "name": "APP_NAME", "displayName": "Application Name", "description": "The name assigned to the application.", - "value": "s2i-fuse76-spring-boot-camel", + "value": "s2i-fuse77-spring-boot-camel", "required": true }, { @@ -254,19 +254,19 @@ "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-1.0.0.fuse-760022-redhat-00001" + "value": "spring-boot-camel-1.0.0.fuse-770010-redhat-00004" }, { "name": "BUILDER_VERSION", "displayName": "Builder version", "description": "The version of the FIS S2I builder image to use.", - "value": "1.6" + "value": "1.7" }, { "name": "APP_VERSION", "displayName": "Application Version", "description": "The application version.", - "value": "1.0.0.fuse-760022-redhat-00001" + "value": "1.0.0.fuse-770010-redhat-00004" }, { "name": "MAVEN_ARGS", @@ -347,6 +347,6 @@ } ], "labels": { - "template": "s2i-fuse76-spring-boot-camel" + "template": "s2i-fuse77-spring-boot-camel" } } \ No newline at end of file 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 a495d5e72..d9d9d2197 100755 --- a/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json +++ b/assets/operator/ocp-x86_64/httpd/templates/httpd-example.json @@ -93,7 +93,7 @@ "sourceStrategy": { "from": { "kind": "ImageStreamTag", - "name": "httpd:2.4", + "name": "httpd:2.4-el8", "namespace": "${NAMESPACE}" } }, 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 new file mode 100755 index 000000000..e60982c2e --- /dev/null +++ b/assets/operator/ocp-x86_64/java/imagestreams/java-rhel-x86_64.json @@ -0,0 +1,180 @@ +{ + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "java", + "creationTimestamp": null, + "labels": { + "xpaas": "1.4.17" + }, + "annotations": { + "openshift.io/display-name": "Red Hat OpenJDK", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "version": "1.4.17" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "openjdk-8-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openjdk", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-8:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-8-el7", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 8.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL 7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:8,java", + "tags": "builder,java,openjdk", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "8", + "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,java", + "tags": "builder,java,openjdk,hidden", + "version": "8" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-ubi8", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openjdk", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi8/openjdk-11:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "openjdk-11-el7", + "annotations": { + "description": "Build and run Java applications using Maven and OpenJDK 11.", + "iconClass": "icon-rh-openjdk", + "openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL 7)", + "sampleContextDir": "undertow-servlet", + "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts", + "supports": "java:11,java", + "tags": "builder,java,openjdk", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "11", + "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,java", + "tags": "builder,java,openjdk,hidden", + "version": "11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "description": "Build and run Java applications using Maven.", + "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,openjdk", + "version": "latest" + }, + "from": { + "kind": "ImageStreamTag", + "name": "openjdk-11-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/java-rhel7.json b/assets/operator/ocp-x86_64/java/imagestreams/java-rhel7.json deleted file mode 100755 index a98e270f8..000000000 --- a/assets/operator/ocp-x86_64/java/imagestreams/java-rhel7.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "java", - "creationTimestamp": null, - "labels": { - "xpaas": "1.4.17" - }, - "annotations": { - "openshift.io/display-name": "Red Hat OpenJDK", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "version": "1.4.17" - } - }, - "spec": { - "lookupPolicy": { - "local": false - }, - "tags": [ - { - "name": "8", - "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,java", - "tags": "builder,java,openjdk", - "version": "8" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "11", - "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,java", - "tags": "builder,java,openjdk", - "version": "11" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "latest", - "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,java", - "tags": "builder,java,openjdk", - "version": "latest" - }, - "from": { - "kind": "ImageStreamTag", - "name": "11" - }, - "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-rhel7.json b/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json similarity index 100% rename from assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel7.json rename to assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel7-rhel-x86_64.json diff --git a/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel8-rhel7.json b/assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel8-rhel-x86_64.json similarity index 100% rename from assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel8-rhel7.json rename to assets/operator/ocp-x86_64/java/imagestreams/openjdk-11-rhel8-rhel-x86_64.json diff --git a/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel7.json b/assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json similarity index 100% rename from assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel7.json rename to assets/operator/ocp-x86_64/java/imagestreams/redhat-openjdk18-openshift-rhel-x86_64.json diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel7.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json similarity index 100% rename from assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel7.json rename to assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-11-rhel-x86_64.json diff --git a/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel7.json b/assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json similarity index 100% rename from assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel7.json rename to assets/operator/ocp-x86_64/java/imagestreams/ubi8-openjdk-8-rhel-x86_64.json 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 baf544b42..b3cc99ff1 100755 --- a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-ephemeral.json @@ -253,8 +253,8 @@ { "name": "MARIADB_VERSION", "displayName": "Version of MariaDB Image", - "description": "Version of MariaDB image to be used (10.3 or latest).", - "value": "10.3", + "description": "Version of MariaDB image to be used (10.3-el7, 10.3-el8, or latest).", + "value": "10.3-el8", "required": true } ], 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 9a2afc289..9af30abbe 100755 --- a/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/ocp-x86_64/mariadb/templates/mariadb-persistent.json @@ -270,8 +270,8 @@ { "name": "MARIADB_VERSION", "displayName": "Version of MariaDB Image", - "description": "Version of MariaDB image to be used (10.3 or latest).", - "value": "10.3", + "description": "Version of MariaDB image to be used (10.3-el7, 10.3-el8, or latest).", + "value": "10.3-el8", "required": true }, { 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 409398fa8..e6fceb378 100755 --- a/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/ocp-x86_64/mysql/templates/mysql-ephemeral.json @@ -272,8 +272,8 @@ { "name": "MYSQL_VERSION", "displayName": "Version of MySQL Image", - "description": "Version of MySQL image to be used (8.0, or latest).", - "value": "8.0", + "description": "Version of MySQL image to be used (8.0-el7, 8.0-el8, or latest).", + "value": "8.0-el8", "required": true } ], 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 a60ab5f66..6e36f9871 100755 --- a/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json +++ b/assets/operator/ocp-x86_64/mysql/templates/mysql-persistent.json @@ -277,8 +277,8 @@ { "name": "MYSQL_VERSION", "displayName": "Version of MySQL Image", - "description": "Version of MySQL image to be used (8.0, or latest).", - "value": "8.0", + "description": "Version of MySQL image to be used (8.0-el7, 8.0-el8, or latest).", + "value": "8.0-el8", "required": true } ], 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 56cd4050b..9586e7adf 100755 --- a/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json +++ b/assets/operator/ocp-x86_64/nginx/templates/nginx-example.json @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16 by default).", - "value": "1.16", + "description": "Version of NGINX image to be used (1.16-el8 by default).", + "value": "1.16-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 fbcb4cd50..8ce9b624e 100755 --- a/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json +++ b/assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json @@ -165,4 +165,4 @@ "status": { "dockerImageRepository": "" } -} +} \ No newline at end of file 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 d77c2933b..b61755011 100755 --- a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-ephemeral.json @@ -248,8 +248,8 @@ { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).", + "value": "10-el8", "required": true } ], 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 9c59d7b4a..e3f752ca1 100755 --- a/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/ocp-x86_64/postgresql/templates/postgresql-persistent.json @@ -272,8 +272,8 @@ { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).", + "value": "10-el8", "required": true } ], 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 865622b62..e03d3a6c1 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 @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.6-ubi8", "namespace": "${NAMESPACE}" } }, @@ -458,7 +458,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12-el8", "namespace": "${NAMESPACE}" } }, 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 1b4aa3950..9d4366f7f 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 @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.6-ubi8", "namespace": "${NAMESPACE}" } }, @@ -439,7 +439,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12-el8", "namespace": "${NAMESPACE}" } }, 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 09bd86f35..e9af758bd 100755 --- a/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json +++ b/assets/operator/ocp-x86_64/redis/templates/redis-ephemeral.json @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5 or latest).", - "value": "5", + "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", + "value": "5-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 559a60db6..68ee70a6c 100755 --- a/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json +++ b/assets/operator/ocp-x86_64/redis/templates/redis-persistent.json @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5 or latest).", - "value": "5", + "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", + "value": "5-el8", "required": true } ], 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 2e7426e06..65bfd4b40 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 @@ -419,7 +419,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:8.0", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -450,8 +450,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3 or latest).", - "value": "7.3", + "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", + "value": "7.3-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 61cd68089..ac2532b53 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 @@ -438,7 +438,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:8.0", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -469,8 +469,8 @@ { "name": "PHP_VERSION", "displayName": "PHP Version", - "description": "Version of PHP image to be used (7.3 or latest).", - "value": "7.3", + "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).", + "value": "7.3-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 8a6292139..656ccac87 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 @@ -115,7 +115,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26", + "name": "perl:5.26-ubi8", "namespace": "${NAMESPACE}" } }, @@ -330,6 +330,10 @@ { "name": "MYSQL_DATABASE", "value": "${DATABASE_NAME}" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" } ], "image": " ", @@ -388,7 +392,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.7", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -499,6 +503,12 @@ "name": "CPAN_MIRROR", "displayName": "Custom CPAN Mirror URL", "description": "The custom CPAN mirror URL" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "displayName": "MySQL authentication plugin", + "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.", + "value": "mysql_native_password" } ], "labels": { 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 bd11eb5c2..17dac3403 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 @@ -115,7 +115,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26", + "name": "perl:5.26-ubi8", "namespace": "${NAMESPACE}" } }, @@ -347,6 +347,10 @@ { "name": "MYSQL_DATABASE", "value": "${DATABASE_NAME}" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" } ], "image": " ", @@ -407,7 +411,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:5.7", + "name": "mysql:8.0-el8", "namespace": "${NAMESPACE}" } }, @@ -525,6 +529,12 @@ "name": "CPAN_MIRROR", "displayName": "Custom CPAN Mirror URL", "description": "The custom CPAN mirror URL" + }, + { + "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN", + "displayName": "MySQL authentication plugin", + "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.", + "value": "mysql_native_password" } ], "labels": { 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 46da1378d..bd7daf65b 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 @@ -423,15 +423,15 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6 or latest).", - "value": "3.6", + "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).", + "value": "3.6-ubi8", "required": true }, { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).", + "value": "12-el8", "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 559606e7b..c63b71b51 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 @@ -442,15 +442,15 @@ { "name": "PYTHON_VERSION", "displayName": "Version of Python Image", - "description": "Version of Python image to be used (3.6 or latest).", - "value": "3.6", + "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).", + "value": "3.6-ubi8", "required": true }, { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).", + "value": "12-el8", "required": true }, { diff --git a/assets/operator/okd-x86_64/dotnet/templates/dotnet-example.json b/assets/operator/okd-x86_64/dotnet/templates/dotnet-example.json deleted file mode 100755 index 03c1b0085..000000000 --- a/assets/operator/okd-x86_64/dotnet/templates/dotnet-example.json +++ /dev/null @@ -1,355 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "dotnet-example", - "creationTimestamp": null, - "annotations": { - "description": "An example .NET Core application.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core Example", - "tags": "quickstart,dotnet,.net", - "template.openshift.io/documentation-url": "https://github.com/redhat-developer/s2i-dotnetcore", - "template.openshift.io/provider-display-name": "Red Hat, Inc.", - "template.openshift.io/support-url": "https://access.redhat.com" - } - }, - "objects": [ - { - "apiVersion": "v1", - "kind": "Route", - "metadata": { - "name": "${NAME}" - }, - "spec": { - "host": "${APPLICATION_DOMAIN}", - "to": { - "kind": "Service", - "name": "${NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "Exposes and load balances the application pods" - }, - "name": "${NAME}" - }, - "spec": { - "ports": [ - { - "name": "web", - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "name": "${NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "annotations": { - "description": "Keeps track of changes in the application image" - }, - "name": "${NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "annotations": { - "description": "Defines how to build the application" - }, - "name": "${NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "DOTNET_STARTUP_PROJECT", - "value": "${DOTNET_STARTUP_PROJECT}" - }, - { - "name": "DOTNET_ASSEMBLY_NAME", - "value": "${DOTNET_ASSEMBLY_NAME}" - }, - { - "name": "DOTNET_NPM_TOOLS", - "value": "${DOTNET_NPM_TOOLS}" - }, - { - "name": "DOTNET_TEST_PROJECTS", - "value": "${DOTNET_TEST_PROJECTS}" - }, - { - "name": "DOTNET_CONFIGURATION", - "value": "${DOTNET_CONFIGURATION}" - }, - { - "name": "DOTNET_RESTORE_SOURCES", - "value": "${DOTNET_RESTORE_SOURCES}" - }, - { - "name": "DOTNET_TOOLS", - "value": "${DOTNET_TOOLS}" - }, - { - "name": "DOTNET_PUBLISH_READYTORUN", - "value": "${DOTNET_PUBLISH_READYTORUN}" - }, - { - "name": "DOTNET_RESTORE_CONFIGFILE", - "value": "${DOTNET_RESTORE_CONFIGFILE}" - } - ], - "from": { - "kind": "ImageStreamTag", - "name": "${DOTNET_IMAGE_STREAM_TAG}", - "namespace": "${NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "type": "ImageChange" - }, - { - "type": "ConfigChange" - }, - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - }, - { - "generic": { - "secret": "${GENERIC_WEBHOOK_SECRET}" - }, - "type": "Generic" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "annotations": { - "description": "Defines how to deploy the application server" - }, - "name": "${NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "name": "${NAME}" - }, - "strategy": { - "type": "Rolling" - }, - "template": { - "metadata": { - "labels": { - "name": "${NAME}" - }, - "name": "${NAME}" - }, - "spec": { - "containers": [ - { - "env": [], - "image": " ", - "livenessProbe": { - "httpGet": { - "path": "/", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 40, - "timeoutSeconds": 15 - }, - "name": "dotnet-app", - "ports": [ - { - "containerPort": 8080 - } - ], - "readinessProbe": { - "httpGet": { - "path": "/", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 10, - "timeoutSeconds": 30 - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dotnet-app" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "NAME", - "displayName": "Name", - "description": "The name assigned to all of the frontend objects defined in this template.", - "value": "dotnet-example", - "required": true - }, - { - "name": "MEMORY_LIMIT", - "displayName": "Memory Limit", - "description": "Maximum amount of memory the container can use.", - "value": "128Mi", - "required": true - }, - { - "name": "DOTNET_IMAGE_STREAM_TAG", - "displayName": ".NET builder", - "description": "The image stream tag which is used to build the code.", - "value": "dotnet:3.0", - "required": true - }, - { - "name": "NAMESPACE", - "displayName": "Namespace", - "description": "The OpenShift Namespace where the ImageStream resides.", - "value": "openshift", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "The URL of the repository with your application source code.", - "value": "https://github.com/redhat-developer/s2i-dotnetcore-ex.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_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": "dotnetcore-3.0" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Set this to use a subdirectory of the source code repository" - }, - { - "name": "APPLICATION_DOMAIN", - "displayName": "Application Hostname", - "description": "The exposed hostname that will route to the .NET Core service, if left blank a value will be defaulted." - }, - { - "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]{40}" - }, - { - "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]{40}" - }, - { - "name": "DOTNET_STARTUP_PROJECT", - "displayName": "Startup Project", - "description": "Set this to a project file (e.g. csproj) or a folder containing a single project file.", - "value": "app" - }, - { - "name": "DOTNET_PUBLISH_READYTORUN", - "displayName": "Ahead-of-time compilation", - "description": "Set this to 'true' to perform an ahead-of-time compilation." - }, - { - "name": "DOTNET_ASSEMBLY_NAME", - "displayName": "Startup Assembly", - "description": "Set this when the assembly name is overridden in the project file." - }, - { - "name": "DOTNET_TOOLS", - "displayName": ".NET Tools", - "description": "Set this to a space separated list of .NET tools needed to publish." - }, - { - "name": "DOTNET_NPM_TOOLS", - "displayName": "Npm Tools", - "description": "Set this to a space separated list of npm tools needed to publish." - }, - { - "name": "DOTNET_TEST_PROJECTS", - "displayName": "Test projects", - "description": "Set this to a space separated list of test projects to run before publishing." - }, - { - "name": "DOTNET_CONFIGURATION", - "displayName": "Configuration", - "description": "Set this to configuration (Release/Debug).", - "value": "Release" - }, - { - "name": "DOTNET_RESTORE_SOURCES", - "displayName": "NuGet package sources", - "description": "Set this to override the NuGet.config sources. Cannot be combined with DOTNET_RESTORE_CONFIGFILE." - }, - { - "name": "DOTNET_RESTORE_CONFIGFILE", - "displayName": "NuGet.Config file", - "description": "Set this to a Nuget.Config file. Cannot be combined with DOTNET_RESTORE_SOURCES." - } - ] -} \ No newline at end of file diff --git a/assets/operator/okd-x86_64/dotnet/templates/dotnet-pgsql-persistent.json b/assets/operator/okd-x86_64/dotnet/templates/dotnet-pgsql-persistent.json deleted file mode 100755 index d840f3fdb..000000000 --- a/assets/operator/okd-x86_64/dotnet/templates/dotnet-pgsql-persistent.json +++ /dev/null @@ -1,558 +0,0 @@ -{ - "kind": "Template", - "apiVersion": "v1", - "metadata": { - "name": "dotnet-pgsql-persistent", - "creationTimestamp": null, - "annotations": { - "description": "An example .NET Core application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore.", - "iconClass": "icon-dotnet", - "openshift.io/display-name": ".NET Core + PostgreSQL (Persistent)", - "tags": "quickstart,dotnet", - "template.openshift.io/documentation-url": "https://github.com/redhat-developer/s2i-dotnetcore", - "template.openshift.io/provider-display-name": "Red Hat, Inc.", - "template.openshift.io/support-url": "https://access.redhat.com" - } - }, - "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore.", - "objects": [ - { - "apiVersion": "v1", - "kind": "Secret", - "metadata": { - "name": "${NAME}" - }, - "stringData": { - "connect-string": "Host=${DATABASE_SERVICE_NAME};Database=${DATABASE_NAME};Username=${DATABASE_USER};Password=${DATABASE_PASSWORD}", - "database-password": "${DATABASE_PASSWORD}" - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "Exposes and load balances the application pods", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${DATABASE_SERVICE_NAME}\", \"kind\": \"Service\"}]" - }, - "name": "${NAME}" - }, - "spec": { - "ports": [ - { - "name": "web", - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "name": "${NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "Route", - "metadata": { - "name": "${NAME}" - }, - "spec": { - "host": "${APPLICATION_DOMAIN}", - "to": { - "kind": "Service", - "name": "${NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "ImageStream", - "metadata": { - "annotations": { - "description": "Keeps track of changes in the application image" - }, - "name": "${NAME}" - } - }, - { - "apiVersion": "v1", - "kind": "BuildConfig", - "metadata": { - "annotations": { - "description": "Defines how to build the application" - }, - "name": "${NAME}" - }, - "spec": { - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "postCommit": {}, - "source": { - "contextDir": "${CONTEXT_DIR}", - "git": { - "ref": "${SOURCE_REPOSITORY_REF}", - "uri": "${SOURCE_REPOSITORY_URL}" - }, - "type": "Git" - }, - "strategy": { - "sourceStrategy": { - "env": [ - { - "name": "DOTNET_STARTUP_PROJECT", - "value": "${DOTNET_STARTUP_PROJECT}" - }, - { - "name": "DOTNET_ASSEMBLY_NAME", - "value": "${DOTNET_ASSEMBLY_NAME}" - }, - { - "name": "DOTNET_NPM_TOOLS", - "value": "${DOTNET_NPM_TOOLS}" - }, - { - "name": "DOTNET_TEST_PROJECTS", - "value": "${DOTNET_TEST_PROJECTS}" - }, - { - "name": "DOTNET_CONFIGURATION", - "value": "${DOTNET_CONFIGURATION}" - }, - { - "name": "DOTNET_RESTORE_SOURCES", - "value": "${DOTNET_RESTORE_SOURCES}" - }, - { - "name": "DOTNET_TOOLS", - "value": "${DOTNET_TOOLS}" - } - ], - "from": { - "kind": "ImageStreamTag", - "name": "${DOTNET_IMAGE_STREAM_TAG}", - "namespace": "${NAMESPACE}" - } - }, - "type": "Source" - }, - "triggers": [ - { - "type": "ImageChange" - }, - { - "type": "ConfigChange" - }, - { - "github": { - "secret": "${GITHUB_WEBHOOK_SECRET}" - }, - "type": "GitHub" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "annotations": { - "description": "Defines how to deploy the application server" - }, - "name": "${NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "name": "${NAME}" - }, - "strategy": { - "resources": {}, - "rollingParams": { - "intervalSeconds": 1, - "maxSurge": "25%", - "maxUnavailable": "25%", - "timeoutSeconds": 600, - "updatePeriodSeconds": 1 - }, - "type": "Rolling" - }, - "template": { - "metadata": { - "labels": { - "name": "${NAME}" - }, - "name": "${NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "ConnectionString", - "valueFrom": { - "secretKeyRef": { - "key": "connect-string", - "name": "${NAME}" - } - } - } - ], - "image": " ", - "livenessProbe": { - "httpGet": { - "path": "/", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 40, - "timeoutSeconds": 10 - }, - "name": "dotnet-pgsql-persistent", - "ports": [ - { - "containerPort": 8080 - } - ], - "readinessProbe": { - "httpGet": { - "path": "/", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 10, - "timeoutSeconds": 30 - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "dotnet-pgsql-persistent" - ], - "from": { - "kind": "ImageStreamTag", - "name": "${NAME}:latest" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - }, - { - "apiVersion": "v1", - "kind": "PersistentVolumeClaim", - "metadata": { - "name": "${DATABASE_SERVICE_NAME}" - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "${VOLUME_CAPACITY}" - } - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "description": "Exposes the database server" - }, - "name": "${DATABASE_SERVICE_NAME}" - }, - "spec": { - "ports": [ - { - "name": "postgresql", - "port": 5432, - "targetPort": 5432 - } - ], - "selector": { - "name": "${DATABASE_SERVICE_NAME}" - } - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "annotations": { - "description": "Defines how to deploy the database" - }, - "name": "${DATABASE_SERVICE_NAME}" - }, - "spec": { - "replicas": 1, - "selector": { - "name": "${DATABASE_SERVICE_NAME}" - }, - "strategy": { - "type": "Recreate" - }, - "template": { - "metadata": { - "labels": { - "name": "${DATABASE_SERVICE_NAME}" - }, - "name": "${DATABASE_SERVICE_NAME}" - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "POSTGRESQL_USER", - "value": "${DATABASE_USER}" - }, - { - "name": "POSTGRESQL_PASSWORD", - "valueFrom": { - "secretKeyRef": { - "key": "database-password", - "name": "${NAME}" - } - } - }, - { - "name": "POSTGRESQL_DATABASE", - "value": "${DATABASE_NAME}" - }, - { - "name": "POSTGRESQL_MAX_CONNECTIONS", - "value": "${POSTGRESQL_MAX_CONNECTIONS}" - }, - { - "name": "POSTGRESQL_SHARED_BUFFERS", - "value": "${POSTGRESQL_SHARED_BUFFERS}" - } - ], - "image": " ", - "livenessProbe": { - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 5432 - }, - "timeoutSeconds": 1 - }, - "name": "postgresql", - "ports": [ - { - "containerPort": 5432 - } - ], - "resources": { - "limits": { - "memory": "${MEMORY_POSTGRESQL_LIMIT}" - } - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/pgsql/data", - "name": "${DATABASE_SERVICE_NAME}-data" - } - ] - } - ], - "volumes": [ - { - "name": "${DATABASE_SERVICE_NAME}-data", - "persistentVolumeClaim": { - "claimName": "${DATABASE_SERVICE_NAME}" - } - } - ] - } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:9.5", - "namespace": "openshift" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] - } - } - ], - "parameters": [ - { - "name": "NAME", - "displayName": "Name", - "description": "The name assigned to all of the frontend objects defined in this template.", - "value": "musicstore", - "required": true - }, - { - "name": "MEMORY_LIMIT", - "displayName": "Memory Limit", - "description": "Maximum amount of memory the .NET Core container can use.", - "value": "128Mi", - "required": true - }, - { - "name": "MEMORY_POSTGRESQL_LIMIT", - "displayName": "Memory Limit (PostgreSQL)", - "description": "Maximum amount of memory the PostgreSQL container can use.", - "value": "128Mi", - "required": true - }, - { - "name": "VOLUME_CAPACITY", - "displayName": "Volume Capacity", - "description": "Volume space available for data, e.g. 512Mi, 2Gi", - "value": "256Mi", - "required": true - }, - { - "name": "DOTNET_IMAGE_STREAM_TAG", - "displayName": ".NET builder", - "description": "The image stream tag which is used to build the code.", - "value": "dotnet:2.1", - "required": true - }, - { - "name": "NAMESPACE", - "displayName": "Namespace", - "description": "The OpenShift Namespace where the .NET builder ImageStream resides.", - "value": "openshift", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_URL", - "displayName": "Git Repository URL", - "description": "The URL of the repository with your application source code.", - "value": "https://github.com/redhat-developer/s2i-aspnet-musicstore-ex.git", - "required": true - }, - { - "name": "SOURCE_REPOSITORY_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": "rel/2.1-example" - }, - { - "name": "CONTEXT_DIR", - "displayName": "Context Directory", - "description": "Set this to the relative path to your project if it is not in the root of your repository." - }, - { - "name": "DOTNET_STARTUP_PROJECT", - "displayName": "Startup Project", - "description": "Set this to a project file (e.g. csproj) or a folder containing a single project file.", - "value": "samples/MusicStore" - }, - { - "name": "DOTNET_ASSEMBLY_NAME", - "displayName": "Startup Assembly", - "description": "Set this when the assembly name is overridden in the project file." - }, - { - "name": "DOTNET_TOOLS", - "displayName": ".NET Tools", - "description": "Set this to a space separated list of .NET tools needed to publish." - }, - { - "name": "DOTNET_NPM_TOOLS", - "displayName": "Npm Tools", - "description": "Set this to a space separated list of npm tools needed to publish." - }, - { - "name": "DOTNET_TEST_PROJECTS", - "displayName": "Test projects", - "description": "Set this to a space separated list of test projects to run before publishing." - }, - { - "name": "DOTNET_CONFIGURATION", - "displayName": "Configuration", - "description": "Set this to configuration (Release/Debug).", - "value": "Release" - }, - { - "name": "DOTNET_RESTORE_SOURCES", - "displayName": "NuGet package sources", - "description": "Set this to override the NuGet.config sources." - }, - { - "name": "APPLICATION_DOMAIN", - "displayName": "Application Hostname", - "description": "The exposed hostname that will route to the .NET Core service, if left blank a value will be defaulted." - }, - { - "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]{40}" - }, - { - "name": "DATABASE_SERVICE_NAME", - "displayName": "Database Service Name", - "value": "postgresql", - "required": true - }, - { - "name": "DATABASE_USER", - "displayName": "Database Username", - "generate": "expression", - "from": "user[A-Z0-9]{3}" - }, - { - "name": "DATABASE_PASSWORD", - "displayName": "Database Password", - "generate": "expression", - "from": "[a-zA-Z0-9]{8}" - }, - { - "name": "DATABASE_NAME", - "displayName": "Database Name", - "value": "musicstore", - "required": true - }, - { - "name": "POSTGRESQL_MAX_CONNECTIONS", - "displayName": "Maximum Database Connections", - "value": "100" - }, - { - "name": "POSTGRESQL_SHARED_BUFFERS", - "displayName": "Shared Buffer Amount", - "value": "12MB" - } - ], - "labels": { - "template": "dotnet-pgsql-persistent" - } -} \ No newline at end of file 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 a495d5e72..d9d9d2197 100755 --- a/assets/operator/okd-x86_64/httpd/templates/httpd-example.json +++ b/assets/operator/okd-x86_64/httpd/templates/httpd-example.json @@ -93,7 +93,7 @@ "sourceStrategy": { "from": { "kind": "ImageStreamTag", - "name": "httpd:2.4", + "name": "httpd:2.4-el8", "namespace": "${NAMESPACE}" } }, diff --git a/assets/operator/okd-x86_64/java/imagestreams/java-ubi8.json b/assets/operator/okd-x86_64/java/imagestreams/java-ubi.json similarity index 100% rename from assets/operator/okd-x86_64/java/imagestreams/java-ubi8.json rename to assets/operator/okd-x86_64/java/imagestreams/java-ubi.json 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 baf544b42..b3cc99ff1 100755 --- a/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json +++ b/assets/operator/okd-x86_64/mariadb/templates/mariadb-ephemeral.json @@ -253,8 +253,8 @@ { "name": "MARIADB_VERSION", "displayName": "Version of MariaDB Image", - "description": "Version of MariaDB image to be used (10.3 or latest).", - "value": "10.3", + "description": "Version of MariaDB image to be used (10.3-el7, 10.3-el8, or latest).", + "value": "10.3-el8", "required": true } ], 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 9a2afc289..9af30abbe 100755 --- a/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json +++ b/assets/operator/okd-x86_64/mariadb/templates/mariadb-persistent.json @@ -270,8 +270,8 @@ { "name": "MARIADB_VERSION", "displayName": "Version of MariaDB Image", - "description": "Version of MariaDB image to be used (10.3 or latest).", - "value": "10.3", + "description": "Version of MariaDB image to be used (10.3-el7, 10.3-el8, or latest).", + "value": "10.3-el8", "required": true }, { 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 409398fa8..e6fceb378 100755 --- a/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json +++ b/assets/operator/okd-x86_64/mysql/templates/mysql-ephemeral.json @@ -272,8 +272,8 @@ { "name": "MYSQL_VERSION", "displayName": "Version of MySQL Image", - "description": "Version of MySQL image to be used (8.0, or latest).", - "value": "8.0", + "description": "Version of MySQL image to be used (8.0-el7, 8.0-el8, or latest).", + "value": "8.0-el8", "required": true } ], 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 a60ab5f66..6e36f9871 100755 --- a/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json +++ b/assets/operator/okd-x86_64/mysql/templates/mysql-persistent.json @@ -277,8 +277,8 @@ { "name": "MYSQL_VERSION", "displayName": "Version of MySQL Image", - "description": "Version of MySQL image to be used (8.0, or latest).", - "value": "8.0", + "description": "Version of MySQL image to be used (8.0-el7, 8.0-el8, or latest).", + "value": "8.0-el8", "required": true } ], 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 56cd4050b..9586e7adf 100755 --- a/assets/operator/okd-x86_64/nginx/templates/nginx-example.json +++ b/assets/operator/okd-x86_64/nginx/templates/nginx-example.json @@ -223,8 +223,8 @@ { "name": "NGINX_VERSION", "displayName": "NGINX Version", - "description": "Version of NGINX image to be used (1.16 by default).", - "value": "1.16", + "description": "Version of NGINX image to be used (1.16-el8 by default).", + "value": "1.16-el8", "required": true }, { 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 d77c2933b..b61755011 100755 --- a/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json +++ b/assets/operator/okd-x86_64/postgresql/templates/postgresql-ephemeral.json @@ -248,8 +248,8 @@ { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).", + "value": "10-el8", "required": true } ], 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 9c59d7b4a..e3f752ca1 100755 --- a/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json +++ b/assets/operator/okd-x86_64/postgresql/templates/postgresql-persistent.json @@ -272,8 +272,8 @@ { "name": "POSTGRESQL_VERSION", "displayName": "Version of PostgreSQL Image", - "description": "Version of PostgreSQL image to be used (10 or latest).", - "value": "10", + "description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).", + "value": "10-el8", "required": true } ], 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 865622b62..e03d3a6c1 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 @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.6-ubi8", "namespace": "${NAMESPACE}" } }, @@ -458,7 +458,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12-el8", "namespace": "${NAMESPACE}" } }, 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 1b4aa3950..9d4366f7f 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 @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.6-ubi8", "namespace": "${NAMESPACE}" } }, @@ -439,7 +439,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12-el8", "namespace": "${NAMESPACE}" } }, 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 09bd86f35..e9af758bd 100755 --- a/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json +++ b/assets/operator/okd-x86_64/redis/templates/redis-ephemeral.json @@ -211,8 +211,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5 or latest).", - "value": "5", + "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", + "value": "5-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 559a60db6..68ee70a6c 100755 --- a/assets/operator/okd-x86_64/redis/templates/redis-persistent.json +++ b/assets/operator/okd-x86_64/redis/templates/redis-persistent.json @@ -235,8 +235,8 @@ { "name": "REDIS_VERSION", "displayName": "Version of Redis Image", - "description": "Version of Redis image to be used (5 or latest).", - "value": "5", + "description": "Version of Redis image to be used (5-el7, 5-el8, or latest).", + "value": "5-el8", "required": true } ],