Merge pull request openshift#305 from gabemontero/rename-payload-dir

simplify imagestream/template directory structure; more sensible dir name
osherdp · Jul 16, 2020 · 339fa95 · 339fa95
2 parents e7cc9a4 + 9604dd3
commit 339fa95
Show file tree

Hide file tree

Showing 301 changed files with 2 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-samples-operator/cluste
 RUN ln -f /usr/bin/cluster-samples-operator /usr/bin/cluster-samples-operator-watch
 COPY manifests/image-references manifests/0* /manifests/
 COPY vendor/github.com/openshift/api/samples/v1/0000_10_samplesconfig.crd.yaml /manifests/
-COPY tmp/build/assets /opt/openshift/
+COPY assets /opt/openshift/
 RUN useradd cluster-samples-operator
 USER cluster-samples-operator
 ENTRYPOINT []

diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
@@ -8,7 +8,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-samples-operator/cluste
 RUN ln -f /usr/bin/cluster-samples-operator /usr/bin/cluster-samples-operator-watch
 COPY manifests/image-references manifests/0* /manifests/
 COPY vendor/github.com/openshift/api/samples/v1/0000_10_samplesconfig.crd.yaml /manifests/
-COPY tmp/build/assets /opt/openshift/
+COPY assets /opt/openshift/
 RUN useradd cluster-samples-operator
 USER cluster-samples-operator
 ENTRYPOINT []

diff --git a/README.md b/README.md
@@ -121,6 +121,5 @@ If there is a bug in the samples operator deletion logic, to reset the samples o
 
 # Update the content in this repository from https://github.com/OpenShift/library
 - Create a git branch in your local copy of this repository
-- cd tmp/build
 - ./library-sync.sh
 - Commit the changes and create a PR
diff --git a/...ephp/templates/cakephp-mysql-example.json → ...ephp/templates/cakephp-mysql-example.json b/...ephp/templates/cakephp-mysql-example.json → ...ephp/templates/cakephp-mysql-example.json
diff --git a/...p/templates/cakephp-mysql-persistent.json → ...p/templates/cakephp-mysql-persistent.json b/...p/templates/cakephp-mysql-persistent.json → ...p/templates/cakephp-mysql-persistent.json
diff --git a/...ancer/templates/dancer-mysql-example.json → ...ancer/templates/dancer-mysql-example.json b/...ancer/templates/dancer-mysql-example.json → ...ancer/templates/dancer-mysql-example.json
diff --git a/...er/templates/dancer-mysql-persistent.json → ...er/templates/dancer-mysql-persistent.json b/...er/templates/dancer-mysql-persistent.json → ...er/templates/dancer-mysql-persistent.json
diff --git a/...django/templates/django-psql-example.json → ...django/templates/django-psql-example.json b/...django/templates/django-psql-example.json → ...django/templates/django-psql-example.json
diff --git a/...ngo/templates/django-psql-persistent.json → ...ngo/templates/django-psql-persistent.json b/...ngo/templates/django-psql-persistent.json → ...ngo/templates/django-psql-persistent.json
diff --git a/...4le/golang/imagestreams/golang-rhel7.json → ...4le/golang/imagestreams/golang-rhel7.json b/...4le/golang/imagestreams/golang-rhel7.json → ...4le/golang/imagestreams/golang-rhel7.json
diff --git a/...c64le/httpd/imagestreams/httpd-rhel7.json → ...c64le/httpd/imagestreams/httpd-rhel7.json b/...c64le/httpd/imagestreams/httpd-rhel7.json → ...c64le/httpd/imagestreams/httpd-rhel7.json
diff --git a/...pc64le/httpd/templates/httpd-example.json → ...pc64le/httpd/templates/httpd-example.json b/...pc64le/httpd/templates/httpd-example.json → ...pc64le/httpd/templates/httpd-example.json
diff --git a/...java/imagestreams/java-rhel7-ppc64le.json → ...java/imagestreams/java-rhel7-ppc64le.json b/...java/imagestreams/java-rhel7-ppc64le.json → ...java/imagestreams/java-rhel7-ppc64le.json
diff --git a/...reams/openjdk-11-rhel7-rhel7-ppc64le.json → ...reams/openjdk-11-rhel7-rhel7-ppc64le.json b/...reams/openjdk-11-rhel7-rhel7-ppc64le.json → ...reams/openjdk-11-rhel7-rhel7-ppc64le.json
diff --git a/...reams/openjdk-11-rhel8-rhel7-ppc64le.json → ...reams/openjdk-11-rhel8-rhel7-ppc64le.json b/...reams/openjdk-11-rhel8-rhel7-ppc64le.json → ...reams/openjdk-11-rhel8-rhel7-ppc64le.json
diff --git a/...treams/openjdk-8-rhel8-rhel7-ppc64le.json → ...treams/openjdk-8-rhel8-rhel7-ppc64le.json b/...treams/openjdk-8-rhel8-rhel7-ppc64le.json → ...treams/openjdk-8-rhel8-rhel7-ppc64le.json
diff --git a/...at-openjdk18-openshift-rhel7-ppc64le.json → ...at-openjdk18-openshift-rhel7-ppc64le.json b/...at-openjdk18-openshift-rhel7-ppc64le.json → ...at-openjdk18-openshift-rhel7-ppc64le.json
diff --git a/...java/templates/openjdk-web-basic-s2i.json → ...java/templates/openjdk-web-basic-s2i.json b/...java/templates/openjdk-web-basic-s2i.json → ...java/templates/openjdk-web-basic-s2i.json
diff --git a/...magestreams/jenkins-agent-base-rhel7.json → ...magestreams/jenkins-agent-base-rhel7.json b/...magestreams/jenkins-agent-base-rhel7.json → ...magestreams/jenkins-agent-base-rhel7.json
diff --git a/...agestreams/jenkins-agent-maven-rhel7.json → ...agestreams/jenkins-agent-maven-rhel7.json b/...agestreams/jenkins-agent-maven-rhel7.json → ...agestreams/jenkins-agent-maven-rhel7.json
diff --git a/...gestreams/jenkins-agent-nodejs-rhel7.json → ...gestreams/jenkins-agent-nodejs-rhel7.json b/...gestreams/jenkins-agent-nodejs-rhel7.json → ...gestreams/jenkins-agent-nodejs-rhel7.json
diff --git a/...e/jenkins/imagestreams/jenkins-rhel7.json → ...e/jenkins/imagestreams/jenkins-rhel7.json b/...e/jenkins/imagestreams/jenkins-rhel7.json → ...e/jenkins/imagestreams/jenkins-rhel7.json
diff --git a/...emplates/jenkins-ephemeral-monitored.json → ...emplates/jenkins-ephemeral-monitored.json b/...emplates/jenkins-ephemeral-monitored.json → ...emplates/jenkins-ephemeral-monitored.json
diff --git a/.../jenkins/templates/jenkins-ephemeral.json → .../jenkins/templates/jenkins-ephemeral.json b/.../jenkins/templates/jenkins-ephemeral.json → .../jenkins/templates/jenkins-ephemeral.json
diff --git a/...mplates/jenkins-persistent-monitored.json → ...mplates/jenkins-persistent-monitored.json b/...mplates/jenkins-persistent-monitored.json → ...mplates/jenkins-persistent-monitored.json
diff --git a/...jenkins/templates/jenkins-persistent.json → ...jenkins/templates/jenkins-persistent.json b/...jenkins/templates/jenkins-persistent.json → ...jenkins/templates/jenkins-persistent.json
diff --git a/...e/mariadb/imagestreams/mariadb-rhel7.json → ...e/mariadb/imagestreams/mariadb-rhel7.json b/...e/mariadb/imagestreams/mariadb-rhel7.json → ...e/mariadb/imagestreams/mariadb-rhel7.json
diff --git a/.../mariadb/templates/mariadb-ephemeral.json → .../mariadb/templates/mariadb-ephemeral.json b/.../mariadb/templates/mariadb-ephemeral.json → .../mariadb/templates/mariadb-ephemeral.json
diff --git a/...mariadb/templates/mariadb-persistent.json → ...mariadb/templates/mariadb-persistent.json b/...mariadb/templates/mariadb-persistent.json → ...mariadb/templates/mariadb-persistent.json
diff --git a/...b/imagestreams/mongodb-rhel7-ppc64le.json → ...b/imagestreams/mongodb-rhel7-ppc64le.json b/...b/imagestreams/mongodb-rhel7-ppc64le.json → ...b/imagestreams/mongodb-rhel7-ppc64le.json
diff --git a/.../mongodb/templates/mongodb-ephemeral.json → .../mongodb/templates/mongodb-ephemeral.json b/.../mongodb/templates/mongodb-ephemeral.json → .../mongodb/templates/mongodb-ephemeral.json
diff --git a/...mongodb/templates/mongodb-persistent.json → ...mongodb/templates/mongodb-persistent.json b/...mongodb/templates/mongodb-persistent.json → ...mongodb/templates/mongodb-persistent.json
diff --git a/...c64le/mysql/imagestreams/mysql-rhel7.json → ...c64le/mysql/imagestreams/mysql-rhel7.json b/...c64le/mysql/imagestreams/mysql-rhel7.json → ...c64le/mysql/imagestreams/mysql-rhel7.json
diff --git a/...64le/mysql/templates/mysql-ephemeral.json → ...64le/mysql/templates/mysql-ephemeral.json b/...64le/mysql/templates/mysql-ephemeral.json → ...64le/mysql/templates/mysql-ephemeral.json
diff --git a/...4le/mysql/templates/mysql-persistent.json → ...4le/mysql/templates/mysql-persistent.json b/...4le/mysql/templates/mysql-persistent.json → ...4le/mysql/templates/mysql-persistent.json
diff --git a/...inx/imagestreams/nginx-rhel7-ppc64le.json → ...inx/imagestreams/nginx-rhel7-ppc64le.json b/...inx/imagestreams/nginx-rhel7-ppc64le.json → ...inx/imagestreams/nginx-rhel7-ppc64le.json
diff --git a/...pc64le/nginx/templates/nginx-example.json → ...pc64le/nginx/templates/nginx-example.json b/...pc64le/nginx/templates/nginx-example.json → ...pc64le/nginx/templates/nginx-example.json
diff --git a/...4le/nodejs/imagestreams/nodejs-rhel7.json → ...4le/nodejs/imagestreams/nodejs-rhel7.json b/...4le/nodejs/imagestreams/nodejs-rhel7.json → ...4le/nodejs/imagestreams/nodejs-rhel7.json
diff --git a/...js/templates/nodejs-mongo-persistent.json → ...js/templates/nodejs-mongo-persistent.json b/...js/templates/nodejs-mongo-persistent.json → ...js/templates/nodejs-mongo-persistent.json
diff --git a/...ejs/templates/nodejs-mongodb-example.json → ...ejs/templates/nodejs-mongodb-example.json b/...ejs/templates/nodejs-mongodb-example.json → ...ejs/templates/nodejs-mongodb-example.json
diff --git a/...ppc64le/perl/imagestreams/perl-rhel7.json → ...ppc64le/perl/imagestreams/perl-rhel7.json b/...ppc64le/perl/imagestreams/perl-rhel7.json → ...ppc64le/perl/imagestreams/perl-rhel7.json
diff --git a/...p-ppc64le/php/imagestreams/php-rhel7.json → ...p-ppc64le/php/imagestreams/php-rhel7.json b/...p-ppc64le/php/imagestreams/php-rhel7.json → ...p-ppc64le/php/imagestreams/php-rhel7.json
diff --git a/...magestreams/postgresql-rhel7-ppc64le.json → ...magestreams/postgresql-rhel7-ppc64le.json b/...magestreams/postgresql-rhel7-ppc64le.json → ...magestreams/postgresql-rhel7-ppc64le.json
diff --git a/...resql/templates/postgresql-ephemeral.json → ...resql/templates/postgresql-ephemeral.json b/...resql/templates/postgresql-ephemeral.json → ...resql/templates/postgresql-ephemeral.json
diff --git a/...esql/templates/postgresql-persistent.json → ...esql/templates/postgresql-persistent.json b/...esql/templates/postgresql-persistent.json → ...esql/templates/postgresql-persistent.json
diff --git a/...4le/python/imagestreams/python-rhel7.json → ...4le/python/imagestreams/python-rhel7.json b/...4le/python/imagestreams/python-rhel7.json → ...4le/python/imagestreams/python-rhel7.json
diff --git a/...ils/templates/rails-pgsql-persistent.json → ...ils/templates/rails-pgsql-persistent.json b/...ils/templates/rails-pgsql-persistent.json → ...ils/templates/rails-pgsql-persistent.json
diff --git a/...s/templates/rails-postgresql-example.json → ...s/templates/rails-postgresql-example.json b/...s/templates/rails-postgresql-example.json → ...s/templates/rails-postgresql-example.json
diff --git a/...c64le/redis/imagestreams/redis-rhel7.json → ...c64le/redis/imagestreams/redis-rhel7.json b/...c64le/redis/imagestreams/redis-rhel7.json → ...c64le/redis/imagestreams/redis-rhel7.json
diff --git a/...64le/redis/templates/redis-ephemeral.json → ...64le/redis/templates/redis-ephemeral.json b/...64le/redis/templates/redis-ephemeral.json → ...64le/redis/templates/redis-ephemeral.json
diff --git a/...4le/redis/templates/redis-persistent.json → ...4le/redis/templates/redis-persistent.json b/...4le/redis/templates/redis-persistent.json → ...4le/redis/templates/redis-persistent.json
diff --git a/...ruby/imagestreams/ruby-rhel7-ppc64le.json → ...ruby/imagestreams/ruby-rhel7-ppc64le.json b/...ruby/imagestreams/ruby-rhel7-ppc64le.json → ...ruby/imagestreams/ruby-rhel7-ppc64le.json
diff --git a/...ephp/templates/cakephp-mysql-example.json → ...ephp/templates/cakephp-mysql-example.json b/...ephp/templates/cakephp-mysql-example.json → ...ephp/templates/cakephp-mysql-example.json
diff --git a/...p/templates/cakephp-mysql-persistent.json → ...p/templates/cakephp-mysql-persistent.json b/...p/templates/cakephp-mysql-persistent.json → ...p/templates/cakephp-mysql-persistent.json
diff --git a/...ancer/templates/dancer-mysql-example.json → ...ancer/templates/dancer-mysql-example.json b/...ancer/templates/dancer-mysql-example.json → ...ancer/templates/dancer-mysql-example.json
diff --git a/...er/templates/dancer-mysql-persistent.json → ...er/templates/dancer-mysql-persistent.json b/...er/templates/dancer-mysql-persistent.json → ...er/templates/dancer-mysql-persistent.json
diff --git a/...django/templates/django-psql-example.json → ...django/templates/django-psql-example.json b/...django/templates/django-psql-example.json → ...django/templates/django-psql-example.json
diff --git a/...ngo/templates/django-psql-persistent.json → ...ngo/templates/django-psql-persistent.json b/...ngo/templates/django-psql-persistent.json → ...ngo/templates/django-psql-persistent.json
diff --git a/...90x/golang/imagestreams/golang-rhel7.json → ...90x/golang/imagestreams/golang-rhel7.json b/...90x/golang/imagestreams/golang-rhel7.json → ...90x/golang/imagestreams/golang-rhel7.json
diff --git a/...s390x/httpd/imagestreams/httpd-rhel7.json → ...s390x/httpd/imagestreams/httpd-rhel7.json b/...s390x/httpd/imagestreams/httpd-rhel7.json → ...s390x/httpd/imagestreams/httpd-rhel7.json
diff --git a/...-s390x/httpd/templates/httpd-example.json → ...-s390x/httpd/templates/httpd-example.json b/...-s390x/httpd/templates/httpd-example.json → ...-s390x/httpd/templates/httpd-example.json
diff --git a/...x/java/imagestreams/java-rhel7-s390x.json → ...x/java/imagestreams/java-rhel7-s390x.json b/...x/java/imagestreams/java-rhel7-s390x.json → ...x/java/imagestreams/java-rhel7-s390x.json
diff --git a/...streams/openjdk-11-rhel7-rhel7-s390x.json → ...streams/openjdk-11-rhel7-rhel7-s390x.json b/...streams/openjdk-11-rhel7-rhel7-s390x.json → ...streams/openjdk-11-rhel7-rhel7-s390x.json
diff --git a/...streams/openjdk-11-rhel8-rhel7-s390x.json → ...streams/openjdk-11-rhel8-rhel7-s390x.json b/...streams/openjdk-11-rhel8-rhel7-s390x.json → ...streams/openjdk-11-rhel8-rhel7-s390x.json
diff --git a/...estreams/openjdk-8-rhel8-rhel7-s390x.json → ...estreams/openjdk-8-rhel8-rhel7-s390x.json b/...estreams/openjdk-8-rhel8-rhel7-s390x.json → ...estreams/openjdk-8-rhel8-rhel7-s390x.json
diff --git a/...dhat-openjdk18-openshift-rhel7-s390x.json → ...dhat-openjdk18-openshift-rhel7-s390x.json b/...dhat-openjdk18-openshift-rhel7-s390x.json → ...dhat-openjdk18-openshift-rhel7-s390x.json
diff --git a/...java/templates/openjdk-web-basic-s2i.json → ...java/templates/openjdk-web-basic-s2i.json b/...java/templates/openjdk-web-basic-s2i.json → ...java/templates/openjdk-web-basic-s2i.json
diff --git a/...magestreams/jenkins-agent-base-rhel7.json → ...magestreams/jenkins-agent-base-rhel7.json b/...magestreams/jenkins-agent-base-rhel7.json → ...magestreams/jenkins-agent-base-rhel7.json
diff --git a/...agestreams/jenkins-agent-maven-rhel7.json → ...agestreams/jenkins-agent-maven-rhel7.json b/...agestreams/jenkins-agent-maven-rhel7.json → ...agestreams/jenkins-agent-maven-rhel7.json
diff --git a/...gestreams/jenkins-agent-nodejs-rhel7.json → ...gestreams/jenkins-agent-nodejs-rhel7.json b/...gestreams/jenkins-agent-nodejs-rhel7.json → ...gestreams/jenkins-agent-nodejs-rhel7.json
diff --git a/...x/jenkins/imagestreams/jenkins-rhel7.json → ...x/jenkins/imagestreams/jenkins-rhel7.json b/...x/jenkins/imagestreams/jenkins-rhel7.json → ...x/jenkins/imagestreams/jenkins-rhel7.json
diff --git a/...emplates/jenkins-ephemeral-monitored.json → ...emplates/jenkins-ephemeral-monitored.json b/...emplates/jenkins-ephemeral-monitored.json → ...emplates/jenkins-ephemeral-monitored.json
diff --git a/.../jenkins/templates/jenkins-ephemeral.json → .../jenkins/templates/jenkins-ephemeral.json b/.../jenkins/templates/jenkins-ephemeral.json → .../jenkins/templates/jenkins-ephemeral.json
diff --git a/...mplates/jenkins-persistent-monitored.json → ...mplates/jenkins-persistent-monitored.json b/...mplates/jenkins-persistent-monitored.json → ...mplates/jenkins-persistent-monitored.json
diff --git a/...jenkins/templates/jenkins-persistent.json → ...jenkins/templates/jenkins-persistent.json b/...jenkins/templates/jenkins-persistent.json → ...jenkins/templates/jenkins-persistent.json
diff --git a/...x/mariadb/imagestreams/mariadb-rhel7.json → ...x/mariadb/imagestreams/mariadb-rhel7.json b/...x/mariadb/imagestreams/mariadb-rhel7.json → ...x/mariadb/imagestreams/mariadb-rhel7.json
diff --git a/.../mariadb/templates/mariadb-ephemeral.json → .../mariadb/templates/mariadb-ephemeral.json b/.../mariadb/templates/mariadb-ephemeral.json → .../mariadb/templates/mariadb-ephemeral.json
diff --git a/...mariadb/templates/mariadb-persistent.json → ...mariadb/templates/mariadb-persistent.json b/...mariadb/templates/mariadb-persistent.json → ...mariadb/templates/mariadb-persistent.json
diff --git a/...odb/imagestreams/mongodb-rhel7-s390x.json → ...odb/imagestreams/mongodb-rhel7-s390x.json b/...odb/imagestreams/mongodb-rhel7-s390x.json → ...odb/imagestreams/mongodb-rhel7-s390x.json
diff --git a/.../mongodb/templates/mongodb-ephemeral.json → .../mongodb/templates/mongodb-ephemeral.json b/.../mongodb/templates/mongodb-ephemeral.json → .../mongodb/templates/mongodb-ephemeral.json
diff --git a/...mongodb/templates/mongodb-persistent.json → ...mongodb/templates/mongodb-persistent.json b/...mongodb/templates/mongodb-persistent.json → ...mongodb/templates/mongodb-persistent.json
diff --git a/...s390x/mysql/imagestreams/mysql-rhel7.json → ...s390x/mysql/imagestreams/mysql-rhel7.json b/...s390x/mysql/imagestreams/mysql-rhel7.json → ...s390x/mysql/imagestreams/mysql-rhel7.json
diff --git a/...390x/mysql/templates/mysql-ephemeral.json → ...390x/mysql/templates/mysql-ephemeral.json b/...390x/mysql/templates/mysql-ephemeral.json → ...390x/mysql/templates/mysql-ephemeral.json
diff --git a/...90x/mysql/templates/mysql-persistent.json → ...90x/mysql/templates/mysql-persistent.json b/...90x/mysql/templates/mysql-persistent.json → ...90x/mysql/templates/mysql-persistent.json
diff --git a/...nginx/imagestreams/nginx-rhel7-s390x.json → ...nginx/imagestreams/nginx-rhel7-s390x.json b/...nginx/imagestreams/nginx-rhel7-s390x.json → ...nginx/imagestreams/nginx-rhel7-s390x.json
diff --git a/...-s390x/nginx/templates/nginx-example.json → ...-s390x/nginx/templates/nginx-example.json b/...-s390x/nginx/templates/nginx-example.json → ...-s390x/nginx/templates/nginx-example.json
diff --git a/...90x/nodejs/imagestreams/nodejs-rhel7.json → ...90x/nodejs/imagestreams/nodejs-rhel7.json b/...90x/nodejs/imagestreams/nodejs-rhel7.json → ...90x/nodejs/imagestreams/nodejs-rhel7.json
diff --git a/...js/templates/nodejs-mongo-persistent.json → ...js/templates/nodejs-mongo-persistent.json b/...js/templates/nodejs-mongo-persistent.json → ...js/templates/nodejs-mongo-persistent.json
diff --git a/...ejs/templates/nodejs-mongodb-example.json → ...ejs/templates/nodejs-mongodb-example.json b/...ejs/templates/nodejs-mongodb-example.json → ...ejs/templates/nodejs-mongodb-example.json
diff --git a/...p-s390x/perl/imagestreams/perl-rhel7.json → ...p-s390x/perl/imagestreams/perl-rhel7.json b/...p-s390x/perl/imagestreams/perl-rhel7.json → ...p-s390x/perl/imagestreams/perl-rhel7.json
diff --git a/...ocp-s390x/php/imagestreams/php-rhel7.json → ...ocp-s390x/php/imagestreams/php-rhel7.json b/...ocp-s390x/php/imagestreams/php-rhel7.json → ...ocp-s390x/php/imagestreams/php-rhel7.json
diff --git a/.../imagestreams/postgresql-rhel7-s390x.json → .../imagestreams/postgresql-rhel7-s390x.json b/.../imagestreams/postgresql-rhel7-s390x.json → .../imagestreams/postgresql-rhel7-s390x.json
diff --git a/...resql/templates/postgresql-ephemeral.json → ...resql/templates/postgresql-ephemeral.json b/...resql/templates/postgresql-ephemeral.json → ...resql/templates/postgresql-ephemeral.json
diff --git a/...esql/templates/postgresql-persistent.json → ...esql/templates/postgresql-persistent.json b/...esql/templates/postgresql-persistent.json → ...esql/templates/postgresql-persistent.json
diff --git a/...90x/python/imagestreams/python-rhel7.json → ...90x/python/imagestreams/python-rhel7.json b/...90x/python/imagestreams/python-rhel7.json → ...90x/python/imagestreams/python-rhel7.json
diff --git a/...ils/templates/rails-pgsql-persistent.json → ...ils/templates/rails-pgsql-persistent.json b/...ils/templates/rails-pgsql-persistent.json → ...ils/templates/rails-pgsql-persistent.json
diff --git a/...s/templates/rails-postgresql-example.json → ...s/templates/rails-postgresql-example.json b/...s/templates/rails-postgresql-example.json → ...s/templates/rails-postgresql-example.json
diff --git a/...s390x/redis/imagestreams/redis-rhel7.json → ...s390x/redis/imagestreams/redis-rhel7.json b/...s390x/redis/imagestreams/redis-rhel7.json → ...s390x/redis/imagestreams/redis-rhel7.json
diff --git a/...390x/redis/templates/redis-ephemeral.json → ...390x/redis/templates/redis-ephemeral.json b/...390x/redis/templates/redis-ephemeral.json → ...390x/redis/templates/redis-ephemeral.json
diff --git a/...90x/redis/templates/redis-persistent.json → ...90x/redis/templates/redis-persistent.json b/...90x/redis/templates/redis-persistent.json → ...90x/redis/templates/redis-persistent.json
diff --git a/...x/ruby/imagestreams/ruby-rhel7-s390x.json → ...x/ruby/imagestreams/ruby-rhel7-s390x.json b/...x/ruby/imagestreams/ruby-rhel7-s390x.json → ...x/ruby/imagestreams/ruby-rhel7-s390x.json
diff --git a/.../3scale/imagestreams/apicast-gateway.json → .../3scale/imagestreams/apicast-gateway.json b/.../3scale/imagestreams/apicast-gateway.json → .../3scale/imagestreams/apicast-gateway.json
diff --git a/...6_64/3scale/templates/3scale-gateway.json → ...6_64/3scale/templates/3scale-gateway.json b/...6_64/3scale/templates/3scale-gateway.json → ...6_64/3scale/templates/3scale-gateway.json
diff --git a/.../amq/imagestreams/jboss-amq-62-rhel7.json → .../amq/imagestreams/jboss-amq-62-rhel7.json b/.../amq/imagestreams/jboss-amq-62-rhel7.json → .../amq/imagestreams/jboss-amq-62-rhel7.json
diff --git a/.../amq/imagestreams/jboss-amq-63-rhel7.json → .../amq/imagestreams/jboss-amq-63-rhel7.json b/.../amq/imagestreams/jboss-amq-63-rhel7.json → .../amq/imagestreams/jboss-amq-63-rhel7.json
diff --git a/...ocp-x86_64/amq/templates/amq63-basic.json → ...ocp-x86_64/amq/templates/amq63-basic.json b/...ocp-x86_64/amq/templates/amq63-basic.json → ...ocp-x86_64/amq/templates/amq63-basic.json
diff --git a/...4/amq/templates/amq63-persistent-ssl.json → ...4/amq/templates/amq63-persistent-ssl.json b/...4/amq/templates/amq63-persistent-ssl.json → ...4/amq/templates/amq63-persistent-ssl.json
diff --git a/...86_64/amq/templates/amq63-persistent.json → ...86_64/amq/templates/amq63-persistent.json b/...86_64/amq/templates/amq63-persistent.json → ...86_64/amq/templates/amq63-persistent.json
diff --git a/...r/ocp-x86_64/amq/templates/amq63-ssl.json → ...r/ocp-x86_64/amq/templates/amq63-ssl.json b/...r/ocp-x86_64/amq/templates/amq63-ssl.json → ...r/ocp-x86_64/amq/templates/amq63-ssl.json
diff --git a/...ephp/templates/cakephp-mysql-example.json → ...ephp/templates/cakephp-mysql-example.json b/...ephp/templates/cakephp-mysql-example.json → ...ephp/templates/cakephp-mysql-example.json
diff --git a/...p/templates/cakephp-mysql-persistent.json → ...p/templates/cakephp-mysql-persistent.json b/...p/templates/cakephp-mysql-persistent.json → ...p/templates/cakephp-mysql-persistent.json
diff --git a/...ancer/templates/dancer-mysql-example.json → ...ancer/templates/dancer-mysql-example.json b/...ancer/templates/dancer-mysql-example.json → ...ancer/templates/dancer-mysql-example.json
diff --git a/...er/templates/dancer-mysql-persistent.json → ...er/templates/dancer-mysql-persistent.json b/...er/templates/dancer-mysql-persistent.json → ...er/templates/dancer-mysql-persistent.json
diff --git a/...ss-datagrid65-client-openshift-rhel7.json → ...ss-datagrid65-client-openshift-rhel7.json b/...ss-datagrid65-client-openshift-rhel7.json → ...ss-datagrid65-client-openshift-rhel7.json
diff --git a/...ams/jboss-datagrid65-openshift-rhel7.json → ...ams/jboss-datagrid65-openshift-rhel7.json b/...ams/jboss-datagrid65-openshift-rhel7.json → ...ams/jboss-datagrid65-openshift-rhel7.json
diff --git a/...ss-datagrid71-client-openshift-rhel7.json → ...ss-datagrid71-client-openshift-rhel7.json b/...ss-datagrid71-client-openshift-rhel7.json → ...ss-datagrid71-client-openshift-rhel7.json
diff --git a/...ams/jboss-datagrid71-openshift-rhel7.json → ...ams/jboss-datagrid71-openshift-rhel7.json b/...ams/jboss-datagrid71-openshift-rhel7.json → ...ams/jboss-datagrid71-openshift-rhel7.json
diff --git a/...ams/jboss-datagrid72-openshift-rhel7.json → ...ams/jboss-datagrid72-openshift-rhel7.json b/...ams/jboss-datagrid72-openshift-rhel7.json → ...ams/jboss-datagrid72-openshift-rhel7.json
diff --git a/...ams/jboss-datagrid73-openshift-rhel7.json → ...ams/jboss-datagrid73-openshift-rhel7.json b/...ams/jboss-datagrid73-openshift-rhel7.json → ...ams/jboss-datagrid73-openshift-rhel7.json
diff --git a/..._64/datagrid/templates/cache-service.json → ..._64/datagrid/templates/cache-service.json b/..._64/datagrid/templates/cache-service.json → ..._64/datagrid/templates/cache-service.json
diff --git a/.../datagrid/templates/datagrid-service.json → .../datagrid/templates/datagrid-service.json b/.../datagrid/templates/datagrid-service.json → .../datagrid/templates/datagrid-service.json
diff --git a/...ss-datavirt64-driver-openshift-rhel7.json → ...ss-datavirt64-driver-openshift-rhel7.json b/...ss-datavirt64-driver-openshift-rhel7.json → ...ss-datavirt64-driver-openshift-rhel7.json
diff --git a/...ams/jboss-datavirt64-openshift-rhel7.json → ...ams/jboss-datavirt64-openshift-rhel7.json b/...ams/jboss-datavirt64-openshift-rhel7.json → ...ams/jboss-datavirt64-openshift-rhel7.json
diff --git a/...avirt/templates/datavirt64-basic-s2i.json → ...avirt/templates/datavirt64-basic-s2i.json b/...avirt/templates/datavirt64-basic-s2i.json → ...avirt/templates/datavirt64-basic-s2i.json
diff --git a/...es/datavirt64-extensions-support-s2i.json → ...es/datavirt64-extensions-support-s2i.json b/...es/datavirt64-extensions-support-s2i.json → ...es/datavirt64-extensions-support-s2i.json
diff --git a/...tavirt/templates/datavirt64-ldap-s2i.json → ...tavirt/templates/datavirt64-ldap-s2i.json b/...tavirt/templates/datavirt64-ldap-s2i.json → ...tavirt/templates/datavirt64-ldap-s2i.json
diff --git a/...virt/templates/datavirt64-secure-s2i.json → ...virt/templates/datavirt64-secure-s2i.json b/...virt/templates/datavirt64-secure-s2i.json → ...virt/templates/datavirt64-secure-s2i.json
diff --git a/...oss-decisionserver64-openshift-rhel7.json → ...oss-decisionserver64-openshift-rhel7.json b/...oss-decisionserver64-openshift-rhel7.json → ...oss-decisionserver64-openshift-rhel7.json
diff --git a/...r/templates/decisionserver64-amq-s2i.json → ...r/templates/decisionserver64-amq-s2i.json b/...r/templates/decisionserver64-amq-s2i.json → ...r/templates/decisionserver64-amq-s2i.json
diff --git a/...templates/decisionserver64-basic-s2i.json → ...templates/decisionserver64-basic-s2i.json b/...templates/decisionserver64-basic-s2i.json → ...templates/decisionserver64-basic-s2i.json
diff --git a/...django/templates/django-psql-example.json → ...django/templates/django-psql-example.json b/...django/templates/django-psql-example.json → ...django/templates/django-psql-example.json
diff --git a/...ngo/templates/django-psql-persistent.json → ...ngo/templates/django-psql-persistent.json b/...ngo/templates/django-psql-persistent.json → ...ngo/templates/django-psql-persistent.json
diff --git a/..._64/dotnet/imagestreams/dotnet-rhel7.json → ..._64/dotnet/imagestreams/dotnet-rhel7.json b/..._64/dotnet/imagestreams/dotnet-rhel7.json → ..._64/dotnet/imagestreams/dotnet-rhel7.json
diff --git a/...et/imagestreams/dotnet-runtime-rhel7.json → ...et/imagestreams/dotnet-runtime-rhel7.json b/...et/imagestreams/dotnet-runtime-rhel7.json → ...et/imagestreams/dotnet-runtime-rhel7.json
diff --git a/...6_64/dotnet/templates/dotnet-example.json → ...6_64/dotnet/templates/dotnet-example.json b/...6_64/dotnet/templates/dotnet-example.json → ...6_64/dotnet/templates/dotnet-example.json
diff --git a/...et/templates/dotnet-pgsql-persistent.json → ...et/templates/dotnet-pgsql-persistent.json b/...et/templates/dotnet-pgsql-persistent.json → ...et/templates/dotnet-pgsql-persistent.json
diff --git a/.../imagestreams/eap-cd-openshift-rhel8.json → .../imagestreams/eap-cd-openshift-rhel8.json b/.../imagestreams/eap-cd-openshift-rhel8.json → .../imagestreams/eap-cd-openshift-rhel8.json
diff --git a/...reams/eap-cd-runtime-openshift-rhel8.json → ...reams/eap-cd-runtime-openshift-rhel8.json b/...reams/eap-cd-runtime-openshift-rhel8.json → ...reams/eap-cd-runtime-openshift-rhel8.json
diff --git a/...64/eap-cd/templates/eap-cd-basic-s2i.json → ...64/eap-cd/templates/eap-cd-basic-s2i.json b/...64/eap-cd/templates/eap-cd-basic-s2i.json → ...64/eap-cd/templates/eap-cd-basic-s2i.json
diff --git a/.../eap-cd/templates/eap-cd-starter-s2i.json → .../eap-cd/templates/eap-cd-starter-s2i.json b/.../eap-cd/templates/eap-cd-starter-s2i.json → .../eap-cd/templates/eap-cd-starter-s2i.json
diff --git a/...estreams/jboss-eap64-openshift-rhel7.json → ...estreams/jboss-eap64-openshift-rhel7.json b/...estreams/jboss-eap64-openshift-rhel7.json → ...estreams/jboss-eap64-openshift-rhel7.json
diff --git a/...estreams/jboss-eap70-openshift-rhel7.json → ...estreams/jboss-eap70-openshift-rhel7.json b/...estreams/jboss-eap70-openshift-rhel7.json → ...estreams/jboss-eap70-openshift-rhel7.json
diff --git a/...estreams/jboss-eap71-openshift-rhel7.json → ...estreams/jboss-eap71-openshift-rhel7.json b/...estreams/jboss-eap71-openshift-rhel7.json → ...estreams/jboss-eap71-openshift-rhel7.json
diff --git a/...estreams/jboss-eap72-openshift-rhel7.json → ...estreams/jboss-eap72-openshift-rhel7.json b/...estreams/jboss-eap72-openshift-rhel7.json → ...estreams/jboss-eap72-openshift-rhel7.json
diff --git a/...x86_64/eap/templates/eap72-basic-s2i.json → ...x86_64/eap/templates/eap72-basic-s2i.json b/...x86_64/eap/templates/eap72-basic-s2i.json → ...x86_64/eap/templates/eap72-basic-s2i.json
diff --git a/...x86_64/eap/templates/eap72-https-s2i.json → ...x86_64/eap/templates/eap72-https-s2i.json b/...x86_64/eap/templates/eap72-https-s2i.json → ...x86_64/eap/templates/eap72-https-s2i.json
diff --git a/...mplates/eap72-mongodb-persistent-s2i.json → ...mplates/eap72-mongodb-persistent-s2i.json b/...mplates/eap72-mongodb-persistent-s2i.json → ...mplates/eap72-mongodb-persistent-s2i.json
diff --git a/...6_64/eap/templates/eap72-mongodb-s2i.json → ...6_64/eap/templates/eap72-mongodb-s2i.json b/...6_64/eap/templates/eap72-mongodb-s2i.json → ...6_64/eap/templates/eap72-mongodb-s2i.json
diff --git a/...templates/eap72-mysql-persistent-s2i.json → ...templates/eap72-mysql-persistent-s2i.json b/...templates/eap72-mysql-persistent-s2i.json → ...templates/eap72-mysql-persistent-s2i.json
diff --git a/...x86_64/eap/templates/eap72-mysql-s2i.json → ...x86_64/eap/templates/eap72-mysql-s2i.json b/...x86_64/eap/templates/eap72-mysql-s2i.json → ...x86_64/eap/templates/eap72-mysql-s2i.json
diff --git a/...ates/eap72-postgresql-persistent-s2i.json → ...ates/eap72-postgresql-persistent-s2i.json b/...ates/eap72-postgresql-persistent-s2i.json → ...ates/eap72-postgresql-persistent-s2i.json
diff --git a/...4/eap/templates/eap72-postgresql-s2i.json → ...4/eap/templates/eap72-postgresql-s2i.json b/...4/eap/templates/eap72-postgresql-s2i.json → ...4/eap/templates/eap72-postgresql-s2i.json
diff --git a/...p-x86_64/eap/templates/eap72-sso-s2i.json → ...p-x86_64/eap/templates/eap72-sso-s2i.json b/...p-x86_64/eap/templates/eap72-sso-s2i.json → ...p-x86_64/eap/templates/eap72-sso-s2i.json
diff --git a/...p/templates/eap72-third-party-db-s2i.json → ...p/templates/eap72-third-party-db-s2i.json b/...p/templates/eap72-third-party-db-s2i.json → ...p/templates/eap72-third-party-db-s2i.json
diff --git a/.../fis/imagestreams/apicurito-ui-rhel7.json → .../fis/imagestreams/apicurito-ui-rhel7.json b/.../fis/imagestreams/apicurito-ui-rhel7.json → .../fis/imagestreams/apicurito-ui-rhel7.json
diff --git a/...magestreams/fis-java-openshift-rhel7.json → ...magestreams/fis-java-openshift-rhel7.json b/...magestreams/fis-java-openshift-rhel7.json → ...magestreams/fis-java-openshift-rhel7.json
diff --git a/...agestreams/fis-karaf-openshift-rhel7.json → ...agestreams/fis-karaf-openshift-rhel7.json b/...agestreams/fis-karaf-openshift-rhel7.json → ...agestreams/fis-karaf-openshift-rhel7.json
diff --git a/...reams/fuse-apicurito-generator-rhel7.json → ...reams/fuse-apicurito-generator-rhel7.json b/...reams/fuse-apicurito-generator-rhel7.json → ...reams/fuse-apicurito-generator-rhel7.json
diff --git a/...fis/imagestreams/fuse7-console-rhel7.json → ...fis/imagestreams/fuse7-console-rhel7.json b/...fis/imagestreams/fuse7-console-rhel7.json → ...fis/imagestreams/fuse7-console-rhel7.json
diff --git a/...agestreams/fuse7-eap-openshift-rhel7.json → ...agestreams/fuse7-eap-openshift-rhel7.json b/...agestreams/fuse7-eap-openshift-rhel7.json → ...agestreams/fuse7-eap-openshift-rhel7.json
diff --git a/...gestreams/fuse7-java-openshift-rhel7.json → ...gestreams/fuse7-java-openshift-rhel7.json b/...gestreams/fuse7-java-openshift-rhel7.json → ...gestreams/fuse7-java-openshift-rhel7.json
diff --git a/...estreams/fuse7-karaf-openshift-rhel7.json → ...estreams/fuse7-karaf-openshift-rhel7.json b/...estreams/fuse7-karaf-openshift-rhel7.json → ...estreams/fuse7-karaf-openshift-rhel7.json
diff --git a/...gestreams/jboss-fuse70-console-rhel7.json → ...gestreams/jboss-fuse70-console-rhel7.json b/...gestreams/jboss-fuse70-console-rhel7.json → ...gestreams/jboss-fuse70-console-rhel7.json
diff --git a/...ams/jboss-fuse70-eap-openshift-rhel7.json → ...ams/jboss-fuse70-eap-openshift-rhel7.json b/...ams/jboss-fuse70-eap-openshift-rhel7.json → ...ams/jboss-fuse70-eap-openshift-rhel7.json
diff --git a/...ms/jboss-fuse70-java-openshift-rhel7.json → ...ms/jboss-fuse70-java-openshift-rhel7.json b/...ms/jboss-fuse70-java-openshift-rhel7.json → ...ms/jboss-fuse70-java-openshift-rhel7.json
diff --git a/...s/jboss-fuse70-karaf-openshift-rhel7.json → ...s/jboss-fuse70-karaf-openshift-rhel7.json b/...s/jboss-fuse70-karaf-openshift-rhel7.json → ...s/jboss-fuse70-karaf-openshift-rhel7.json
diff --git a/...r/ocp-x86_64/fis/templates/apicurito.json → ...r/ocp-x86_64/fis/templates/apicurito.json b/...r/ocp-x86_64/fis/templates/apicurito.json → ...r/ocp-x86_64/fis/templates/apicurito.json
diff --git a/...-x86_64/fis/templates/fuse75-console.json → ...-x86_64/fis/templates/fuse75-console.json b/...-x86_64/fis/templates/fuse75-console.json → ...-x86_64/fis/templates/fuse75-console.json
diff --git a/...-x86_64/fis/templates/fuse76-console.json → ...-x86_64/fis/templates/fuse76-console.json b/...-x86_64/fis/templates/fuse76-console.json → ...-x86_64/fis/templates/fuse76-console.json
diff --git a/...fuse75-spring-boot-camel-rest-3scale.json → ...fuse75-spring-boot-camel-rest-3scale.json b/...fuse75-spring-boot-camel-rest-3scale.json → ...fuse75-spring-boot-camel-rest-3scale.json
diff --git a/...tes/s2i-fuse75-spring-boot-camel-xml.json → ...tes/s2i-fuse75-spring-boot-camel-xml.json b/...tes/s2i-fuse75-spring-boot-camel-xml.json → ...tes/s2i-fuse75-spring-boot-camel-xml.json
diff --git a/...mplates/s2i-fuse75-spring-boot-camel.json → ...mplates/s2i-fuse75-spring-boot-camel.json b/...mplates/s2i-fuse75-spring-boot-camel.json → ...mplates/s2i-fuse75-spring-boot-camel.json
diff --git a/...fuse76-spring-boot-camel-rest-3scale.json → ...fuse76-spring-boot-camel-rest-3scale.json b/...fuse76-spring-boot-camel-rest-3scale.json → ...fuse76-spring-boot-camel-rest-3scale.json
diff --git a/...tes/s2i-fuse76-spring-boot-camel-xml.json → ...tes/s2i-fuse76-spring-boot-camel-xml.json b/...tes/s2i-fuse76-spring-boot-camel-xml.json → ...tes/s2i-fuse76-spring-boot-camel-xml.json
diff --git a/...mplates/s2i-fuse76-spring-boot-camel.json → ...mplates/s2i-fuse76-spring-boot-camel.json b/...mplates/s2i-fuse76-spring-boot-camel.json → ...mplates/s2i-fuse76-spring-boot-camel.json
diff --git a/..._64/golang/imagestreams/golang-rhel7.json → ..._64/golang/imagestreams/golang-rhel7.json b/..._64/golang/imagestreams/golang-rhel7.json → ..._64/golang/imagestreams/golang-rhel7.json
diff --git a/...86_64/httpd/imagestreams/httpd-rhel7.json → ...86_64/httpd/imagestreams/httpd-rhel7.json b/...86_64/httpd/imagestreams/httpd-rhel7.json → ...86_64/httpd/imagestreams/httpd-rhel7.json
diff --git a/...x86_64/httpd/templates/httpd-example.json → ...x86_64/httpd/templates/httpd-example.json b/...x86_64/httpd/templates/httpd-example.json → ...x86_64/httpd/templates/httpd-example.json
diff --git a/...-x86_64/java/imagestreams/java-rhel7.json → ...-x86_64/java/imagestreams/java-rhel7.json b/...-x86_64/java/imagestreams/java-rhel7.json → ...-x86_64/java/imagestreams/java-rhel7.json
diff --git a/.../imagestreams/openjdk-11-rhel7-rhel7.json → .../imagestreams/openjdk-11-rhel7-rhel7.json b/.../imagestreams/openjdk-11-rhel7-rhel7.json → .../imagestreams/openjdk-11-rhel7-rhel7.json
diff --git a/.../imagestreams/openjdk-11-rhel8-rhel7.json → .../imagestreams/openjdk-11-rhel8-rhel7.json b/.../imagestreams/openjdk-11-rhel8-rhel7.json → .../imagestreams/openjdk-11-rhel8-rhel7.json
diff --git a/...a/imagestreams/openjdk-8-rhel8-rhel7.json → ...a/imagestreams/openjdk-8-rhel8-rhel7.json b/...a/imagestreams/openjdk-8-rhel8-rhel7.json → ...a/imagestreams/openjdk-8-rhel8-rhel7.json
diff --git a/...ams/redhat-openjdk18-openshift-rhel7.json → ...ams/redhat-openjdk18-openshift-rhel7.json b/...ams/redhat-openjdk18-openshift-rhel7.json → ...ams/redhat-openjdk18-openshift-rhel7.json
diff --git a/...java/templates/openjdk-web-basic-s2i.json → ...java/templates/openjdk-web-basic-s2i.json b/...java/templates/openjdk-web-basic-s2i.json → ...java/templates/openjdk-web-basic-s2i.json
diff --git a/...agestreams/jenkins-agent-maven-rhel7.json → ...agestreams/jenkins-agent-maven-rhel7.json b/...agestreams/jenkins-agent-maven-rhel7.json → ...agestreams/jenkins-agent-maven-rhel7.json
diff --git a/...gestreams/jenkins-agent-nodejs-rhel7.json → ...gestreams/jenkins-agent-nodejs-rhel7.json b/...gestreams/jenkins-agent-nodejs-rhel7.json → ...gestreams/jenkins-agent-nodejs-rhel7.json
diff --git a/...4/jenkins/imagestreams/jenkins-rhel7.json → ...4/jenkins/imagestreams/jenkins-rhel7.json b/...4/jenkins/imagestreams/jenkins-rhel7.json → ...4/jenkins/imagestreams/jenkins-rhel7.json
diff --git a/...emplates/jenkins-ephemeral-monitored.json → ...emplates/jenkins-ephemeral-monitored.json b/...emplates/jenkins-ephemeral-monitored.json → ...emplates/jenkins-ephemeral-monitored.json
diff --git a/.../jenkins/templates/jenkins-ephemeral.json → .../jenkins/templates/jenkins-ephemeral.json b/.../jenkins/templates/jenkins-ephemeral.json → .../jenkins/templates/jenkins-ephemeral.json
diff --git a/...mplates/jenkins-persistent-monitored.json → ...mplates/jenkins-persistent-monitored.json b/...mplates/jenkins-persistent-monitored.json → ...mplates/jenkins-persistent-monitored.json
diff --git a/...jenkins/templates/jenkins-persistent.json → ...jenkins/templates/jenkins-persistent.json b/...jenkins/templates/jenkins-persistent.json → ...jenkins/templates/jenkins-persistent.json
diff --git a/...4/mariadb/imagestreams/mariadb-rhel7.json → ...4/mariadb/imagestreams/mariadb-rhel7.json b/...4/mariadb/imagestreams/mariadb-rhel7.json → ...4/mariadb/imagestreams/mariadb-rhel7.json
diff --git a/.../mariadb/templates/mariadb-ephemeral.json → .../mariadb/templates/mariadb-ephemeral.json b/.../mariadb/templates/mariadb-ephemeral.json → .../mariadb/templates/mariadb-ephemeral.json
diff --git a/...mariadb/templates/mariadb-persistent.json → ...mariadb/templates/mariadb-persistent.json b/...mariadb/templates/mariadb-persistent.json → ...mariadb/templates/mariadb-persistent.json
diff --git a/...4/mongodb/imagestreams/mongodb-rhel7.json → ...4/mongodb/imagestreams/mongodb-rhel7.json b/...4/mongodb/imagestreams/mongodb-rhel7.json → ...4/mongodb/imagestreams/mongodb-rhel7.json
diff --git a/.../mongodb/templates/mongodb-ephemeral.json → .../mongodb/templates/mongodb-ephemeral.json b/.../mongodb/templates/mongodb-ephemeral.json → .../mongodb/templates/mongodb-ephemeral.json
diff --git a/...mongodb/templates/mongodb-persistent.json → ...mongodb/templates/mongodb-persistent.json b/...mongodb/templates/mongodb-persistent.json → ...mongodb/templates/mongodb-persistent.json
diff --git a/...86_64/mysql/imagestreams/mysql-rhel7.json → ...86_64/mysql/imagestreams/mysql-rhel7.json b/...86_64/mysql/imagestreams/mysql-rhel7.json → ...86_64/mysql/imagestreams/mysql-rhel7.json
diff --git a/...6_64/mysql/templates/mysql-ephemeral.json → ...6_64/mysql/templates/mysql-ephemeral.json b/...6_64/mysql/templates/mysql-ephemeral.json → ...6_64/mysql/templates/mysql-ephemeral.json
diff --git a/..._64/mysql/templates/mysql-persistent.json → ..._64/mysql/templates/mysql-persistent.json b/..._64/mysql/templates/mysql-persistent.json → ..._64/mysql/templates/mysql-persistent.json
diff --git a/...86_64/nginx/imagestreams/nginx-rhel7.json → ...86_64/nginx/imagestreams/nginx-rhel7.json b/...86_64/nginx/imagestreams/nginx-rhel7.json → ...86_64/nginx/imagestreams/nginx-rhel7.json
diff --git a/...x86_64/nginx/templates/nginx-example.json → ...x86_64/nginx/templates/nginx-example.json b/...x86_64/nginx/templates/nginx-example.json → ...x86_64/nginx/templates/nginx-example.json
diff --git a/..._64/nodejs/imagestreams/nodejs-rhel7.json → ..._64/nodejs/imagestreams/nodejs-rhel7.json b/..._64/nodejs/imagestreams/nodejs-rhel7.json → ..._64/nodejs/imagestreams/nodejs-rhel7.json
diff --git a/...js/templates/nodejs-mongo-persistent.json → ...js/templates/nodejs-mongo-persistent.json b/...js/templates/nodejs-mongo-persistent.json → ...js/templates/nodejs-mongo-persistent.json
diff --git a/...ejs/templates/nodejs-mongodb-example.json → ...ejs/templates/nodejs-mongodb-example.json b/...ejs/templates/nodejs-mongodb-example.json → ...ejs/templates/nodejs-mongodb-example.json
diff --git a/...-x86_64/perl/imagestreams/perl-rhel7.json → ...-x86_64/perl/imagestreams/perl-rhel7.json b/...-x86_64/perl/imagestreams/perl-rhel7.json → ...-x86_64/perl/imagestreams/perl-rhel7.json
diff --git a/...cp-x86_64/php/imagestreams/php-rhel7.json → ...cp-x86_64/php/imagestreams/php-rhel7.json b/...cp-x86_64/php/imagestreams/php-rhel7.json → ...cp-x86_64/php/imagestreams/php-rhel7.json
diff --git a/...gresql/imagestreams/postgresql-rhel7.json → ...gresql/imagestreams/postgresql-rhel7.json b/...gresql/imagestreams/postgresql-rhel7.json → ...gresql/imagestreams/postgresql-rhel7.json
diff --git a/...resql/templates/postgresql-ephemeral.json → ...resql/templates/postgresql-ephemeral.json b/...resql/templates/postgresql-ephemeral.json → ...resql/templates/postgresql-ephemeral.json
diff --git a/...esql/templates/postgresql-persistent.json → ...esql/templates/postgresql-persistent.json b/...esql/templates/postgresql-persistent.json → ...esql/templates/postgresql-persistent.json
diff --git a/...boss-processserver64-openshift-rhel7.json → ...boss-processserver64-openshift-rhel7.json b/...boss-processserver64-openshift-rhel7.json → ...boss-processserver64-openshift-rhel7.json
diff --git a/...essserver64-amq-mysql-persistent-s2i.json → ...essserver64-amq-mysql-persistent-s2i.json b/...essserver64-amq-mysql-persistent-s2i.json → ...essserver64-amq-mysql-persistent-s2i.json
diff --git a/...plates/processserver64-amq-mysql-s2i.json → ...plates/processserver64-amq-mysql-s2i.json b/...plates/processserver64-amq-mysql-s2i.json → ...plates/processserver64-amq-mysql-s2i.json
diff --git a/...rver64-amq-postgresql-persistent-s2i.json → ...rver64-amq-postgresql-persistent-s2i.json b/...rver64-amq-postgresql-persistent-s2i.json → ...rver64-amq-postgresql-persistent-s2i.json
diff --git a/...s/processserver64-amq-postgresql-s2i.json → ...s/processserver64-amq-postgresql-s2i.json b/...s/processserver64-amq-postgresql-s2i.json → ...s/processserver64-amq-postgresql-s2i.json
diff --git a/.../templates/processserver64-basic-s2i.json → .../templates/processserver64-basic-s2i.json b/.../templates/processserver64-basic-s2i.json → .../templates/processserver64-basic-s2i.json
diff --git a/...lates/processserver64-externaldb-s2i.json → ...lates/processserver64-externaldb-s2i.json b/...lates/processserver64-externaldb-s2i.json → ...lates/processserver64-externaldb-s2i.json
diff --git a/...processserver64-mysql-persistent-s2i.json → ...processserver64-mysql-persistent-s2i.json b/...processserver64-mysql-persistent-s2i.json → ...processserver64-mysql-persistent-s2i.json
diff --git a/.../templates/processserver64-mysql-s2i.json → .../templates/processserver64-mysql-s2i.json b/.../templates/processserver64-mysql-s2i.json → .../templates/processserver64-mysql-s2i.json
diff --git a/...ssserver64-postgresql-persistent-s2i.json → ...ssserver64-postgresql-persistent-s2i.json b/...ssserver64-postgresql-persistent-s2i.json → ...ssserver64-postgresql-persistent-s2i.json
diff --git a/..._64/python/imagestreams/python-rhel7.json → ..._64/python/imagestreams/python-rhel7.json b/..._64/python/imagestreams/python-rhel7.json → ..._64/python/imagestreams/python-rhel7.json
diff --git a/...ils/templates/rails-pgsql-persistent.json → ...ils/templates/rails-pgsql-persistent.json b/...ils/templates/rails-pgsql-persistent.json → ...ils/templates/rails-pgsql-persistent.json
diff --git a/...s/templates/rails-postgresql-example.json → ...s/templates/rails-postgresql-example.json b/...s/templates/rails-postgresql-example.json → ...s/templates/rails-postgresql-example.json
diff --git a/...86_64/redis/imagestreams/redis-rhel7.json → ...86_64/redis/imagestreams/redis-rhel7.json b/...86_64/redis/imagestreams/redis-rhel7.json → ...86_64/redis/imagestreams/redis-rhel7.json
diff --git a/...6_64/redis/templates/redis-ephemeral.json → ...6_64/redis/templates/redis-ephemeral.json b/...6_64/redis/templates/redis-ephemeral.json → ...6_64/redis/templates/redis-ephemeral.json
diff --git a/..._64/redis/templates/redis-persistent.json → ..._64/redis/templates/redis-persistent.json b/..._64/redis/templates/redis-persistent.json → ..._64/redis/templates/redis-persistent.json
diff --git a/...gestreams/rhdm-decisioncentral-rhel8.json → ...gestreams/rhdm-decisioncentral-rhel8.json b/...gestreams/rhdm-decisioncentral-rhel8.json → ...gestreams/rhdm-decisioncentral-rhel8.json
diff --git a/...dm/imagestreams/rhdm-kieserver-rhel8.json → ...dm/imagestreams/rhdm-kieserver-rhel8.json b/...dm/imagestreams/rhdm-kieserver-rhel8.json → ...dm/imagestreams/rhdm-kieserver-rhel8.json
diff --git a/...4/rhdm/templates/rhdm77-authoring-ha.json → ...4/rhdm/templates/rhdm77-authoring-ha.json b/...4/rhdm/templates/rhdm77-authoring-ha.json → ...4/rhdm/templates/rhdm77-authoring-ha.json
diff --git a/...6_64/rhdm/templates/rhdm77-authoring.json → ...6_64/rhdm/templates/rhdm77-authoring.json b/...6_64/rhdm/templates/rhdm77-authoring.json → ...6_64/rhdm/templates/rhdm77-authoring.json
diff --git a/...6_64/rhdm/templates/rhdm77-kieserver.json → ...6_64/rhdm/templates/rhdm77-kieserver.json b/...6_64/rhdm/templates/rhdm77-kieserver.json → ...6_64/rhdm/templates/rhdm77-kieserver.json
diff --git a/.../rhdm77-prod-immutable-kieserver-amq.json → .../rhdm77-prod-immutable-kieserver-amq.json b/.../rhdm77-prod-immutable-kieserver-amq.json → .../rhdm77-prod-immutable-kieserver-amq.json
diff --git a/...ates/rhdm77-prod-immutable-kieserver.json → ...ates/rhdm77-prod-immutable-kieserver.json b/...ates/rhdm77-prod-immutable-kieserver.json → ...ates/rhdm77-prod-immutable-kieserver.json
diff --git a/...hdm/templates/rhdm77-trial-ephemeral.json → ...hdm/templates/rhdm77-trial-ephemeral.json b/...hdm/templates/rhdm77-trial-ephemeral.json → ...hdm/templates/rhdm77-trial-ephemeral.json
diff --git a/...pam-businesscentral-monitoring-rhel8.json → ...pam-businesscentral-monitoring-rhel8.json b/...pam-businesscentral-monitoring-rhel8.json → ...pam-businesscentral-monitoring-rhel8.json
diff --git a/...estreams/rhpam-businesscentral-rhel8.json → ...estreams/rhpam-businesscentral-rhel8.json b/...estreams/rhpam-businesscentral-rhel8.json → ...estreams/rhpam-businesscentral-rhel8.json
diff --git a/...m/imagestreams/rhpam-kieserver-rhel8.json → ...m/imagestreams/rhpam-kieserver-rhel8.json b/...m/imagestreams/rhpam-kieserver-rhel8.json → ...m/imagestreams/rhpam-kieserver-rhel8.json
diff --git a/...imagestreams/rhpam-smartrouter-rhel8.json → ...imagestreams/rhpam-smartrouter-rhel8.json b/...imagestreams/rhpam-smartrouter-rhel8.json → ...imagestreams/rhpam-smartrouter-rhel8.json
diff --git a/...rhpam/templates/rhpam77-authoring-ha.json → ...rhpam/templates/rhpam77-authoring-ha.json b/...rhpam/templates/rhpam77-authoring-ha.json → ...rhpam/templates/rhpam77-authoring-ha.json
diff --git a/...64/rhpam/templates/rhpam77-authoring.json → ...64/rhpam/templates/rhpam77-authoring.json b/...64/rhpam/templates/rhpam77-authoring.json → ...64/rhpam/templates/rhpam77-authoring.json
diff --git a/...mplates/rhpam77-kieserver-externaldb.json → ...mplates/rhpam77-kieserver-externaldb.json b/...mplates/rhpam77-kieserver-externaldb.json → ...mplates/rhpam77-kieserver-externaldb.json
diff --git a/...am/templates/rhpam77-kieserver-mysql.json → ...am/templates/rhpam77-kieserver-mysql.json b/...am/templates/rhpam77-kieserver-mysql.json → ...am/templates/rhpam77-kieserver-mysql.json
diff --git a/...mplates/rhpam77-kieserver-postgresql.json → ...mplates/rhpam77-kieserver-postgresql.json b/...mplates/rhpam77-kieserver-postgresql.json → ...mplates/rhpam77-kieserver-postgresql.json
diff --git a/...6_64/rhpam/templates/rhpam77-managed.json → ...6_64/rhpam/templates/rhpam77-managed.json b/...6_64/rhpam/templates/rhpam77-managed.json → ...6_64/rhpam/templates/rhpam77-managed.json
diff --git a/...rhpam77-prod-immutable-kieserver-amq.json → ...rhpam77-prod-immutable-kieserver-amq.json b/...rhpam77-prod-immutable-kieserver-amq.json → ...rhpam77-prod-immutable-kieserver-amq.json
diff --git a/...tes/rhpam77-prod-immutable-kieserver.json → ...tes/rhpam77-prod-immutable-kieserver.json b/...tes/rhpam77-prod-immutable-kieserver.json → ...tes/rhpam77-prod-immutable-kieserver.json
diff --git a/...lates/rhpam77-prod-immutable-monitor.json → ...lates/rhpam77-prod-immutable-monitor.json b/...lates/rhpam77-prod-immutable-monitor.json → ...lates/rhpam77-prod-immutable-monitor.json
diff --git a/...-x86_64/rhpam/templates/rhpam77-prod.json → ...-x86_64/rhpam/templates/rhpam77-prod.json b/...-x86_64/rhpam/templates/rhpam77-prod.json → ...-x86_64/rhpam/templates/rhpam77-prod.json
diff --git a/...am/templates/rhpam77-trial-ephemeral.json → ...am/templates/rhpam77-trial-ephemeral.json b/...am/templates/rhpam77-trial-ephemeral.json → ...am/templates/rhpam77-trial-ephemeral.json
diff --git a/...-x86_64/ruby/imagestreams/ruby-rhel7.json → ...-x86_64/ruby/imagestreams/ruby-rhel7.json b/...-x86_64/ruby/imagestreams/ruby-rhel7.json → ...-x86_64/ruby/imagestreams/ruby-rhel7.json
diff --git a/...streams/redhat-sso70-openshift-rhel7.json → ...streams/redhat-sso70-openshift-rhel7.json b/...streams/redhat-sso70-openshift-rhel7.json → ...streams/redhat-sso70-openshift-rhel7.json
diff --git a/...streams/redhat-sso71-openshift-rhel7.json → ...streams/redhat-sso71-openshift-rhel7.json b/...streams/redhat-sso71-openshift-rhel7.json → ...streams/redhat-sso71-openshift-rhel7.json
diff --git a/...streams/redhat-sso72-openshift-rhel7.json → ...streams/redhat-sso72-openshift-rhel7.json b/...streams/redhat-sso72-openshift-rhel7.json → ...streams/redhat-sso72-openshift-rhel7.json
diff --git a/...streams/redhat-sso73-openshift-rhel7.json → ...streams/redhat-sso73-openshift-rhel7.json b/...streams/redhat-sso73-openshift-rhel7.json → ...streams/redhat-sso73-openshift-rhel7.json
diff --git a/...o/imagestreams/sso74-openshift-rhel8.json → ...o/imagestreams/sso74-openshift-rhel8.json b/...o/imagestreams/sso74-openshift-rhel8.json → ...o/imagestreams/sso74-openshift-rhel8.json
diff --git a/...ocp-x86_64/sso/templates/sso72-https.json → ...ocp-x86_64/sso/templates/sso72-https.json b/...ocp-x86_64/sso/templates/sso72-https.json → ...ocp-x86_64/sso/templates/sso72-https.json
diff --git a/...sso/templates/sso72-mysql-persistent.json → ...sso/templates/sso72-mysql-persistent.json b/...sso/templates/sso72-mysql-persistent.json → ...sso/templates/sso72-mysql-persistent.json
diff --git a/...ocp-x86_64/sso/templates/sso72-mysql.json → ...ocp-x86_64/sso/templates/sso72-mysql.json b/...ocp-x86_64/sso/templates/sso72-mysql.json → ...ocp-x86_64/sso/templates/sso72-mysql.json
diff --git a/...emplates/sso72-postgresql-persistent.json → ...emplates/sso72-postgresql-persistent.json b/...emplates/sso72-postgresql-persistent.json → ...emplates/sso72-postgresql-persistent.json
diff --git a/...86_64/sso/templates/sso72-postgresql.json → ...86_64/sso/templates/sso72-postgresql.json b/...86_64/sso/templates/sso72-postgresql.json → ...86_64/sso/templates/sso72-postgresql.json
diff --git a/...ocp-x86_64/sso/templates/sso73-https.json → ...ocp-x86_64/sso/templates/sso73-https.json b/...ocp-x86_64/sso/templates/sso73-https.json → ...ocp-x86_64/sso/templates/sso73-https.json
diff --git a/...sso/templates/sso73-mysql-persistent.json → ...sso/templates/sso73-mysql-persistent.json b/...sso/templates/sso73-mysql-persistent.json → ...sso/templates/sso73-mysql-persistent.json
diff --git a/...ocp-x86_64/sso/templates/sso73-mysql.json → ...ocp-x86_64/sso/templates/sso73-mysql.json b/...ocp-x86_64/sso/templates/sso73-mysql.json → ...ocp-x86_64/sso/templates/sso73-mysql.json
diff --git a/.../sso/templates/sso73-ocp4-x509-https.json → .../sso/templates/sso73-ocp4-x509-https.json b/.../sso/templates/sso73-ocp4-x509-https.json → .../sso/templates/sso73-ocp4-x509-https.json
diff --git a/...tes/sso73-ocp4-x509-mysql-persistent.json → ...tes/sso73-ocp4-x509-mysql-persistent.json b/...tes/sso73-ocp4-x509-mysql-persistent.json → ...tes/sso73-ocp4-x509-mysql-persistent.json
diff --git a/...so73-ocp4-x509-postgresql-persistent.json → ...so73-ocp4-x509-postgresql-persistent.json b/...so73-ocp4-x509-postgresql-persistent.json → ...so73-ocp4-x509-postgresql-persistent.json
diff --git a/...emplates/sso73-postgresql-persistent.json → ...emplates/sso73-postgresql-persistent.json b/...emplates/sso73-postgresql-persistent.json → ...emplates/sso73-postgresql-persistent.json
diff --git a/...86_64/sso/templates/sso73-postgresql.json → ...86_64/sso/templates/sso73-postgresql.json b/...86_64/sso/templates/sso73-postgresql.json → ...86_64/sso/templates/sso73-postgresql.json
diff --git a/...ocp-x86_64/sso/templates/sso74-https.json → ...ocp-x86_64/sso/templates/sso74-https.json b/...ocp-x86_64/sso/templates/sso74-https.json → ...ocp-x86_64/sso/templates/sso74-https.json
diff --git a/.../sso/templates/sso74-ocp4-x509-https.json → .../sso/templates/sso74-ocp4-x509-https.json b/.../sso/templates/sso74-ocp4-x509-https.json → .../sso/templates/sso74-ocp4-x509-https.json
diff --git a/...so74-ocp4-x509-postgresql-persistent.json → ...so74-ocp4-x509-postgresql-persistent.json b/...so74-ocp4-x509-postgresql-persistent.json → ...so74-ocp4-x509-postgresql-persistent.json
diff --git a/...emplates/sso74-postgresql-persistent.json → ...emplates/sso74-postgresql-persistent.json b/...emplates/sso74-postgresql-persistent.json → ...emplates/sso74-postgresql-persistent.json
diff --git a/...86_64/sso/templates/sso74-postgresql.json → ...86_64/sso/templates/sso74-postgresql.json b/...86_64/sso/templates/sso74-postgresql.json → ...86_64/sso/templates/sso74-postgresql.json
diff --git a/...-webserver30-tomcat7-openshift-rhel7.json → ...-webserver30-tomcat7-openshift-rhel7.json b/...-webserver30-tomcat7-openshift-rhel7.json → ...-webserver30-tomcat7-openshift-rhel7.json
diff --git a/...-webserver30-tomcat8-openshift-rhel7.json → ...-webserver30-tomcat8-openshift-rhel7.json b/...-webserver30-tomcat8-openshift-rhel7.json → ...-webserver30-tomcat8-openshift-rhel7.json
diff --git a/...-webserver31-tomcat7-openshift-rhel7.json → ...-webserver31-tomcat7-openshift-rhel7.json b/...-webserver31-tomcat7-openshift-rhel7.json → ...-webserver31-tomcat7-openshift-rhel7.json
diff --git a/...-webserver31-tomcat8-openshift-rhel7.json → ...-webserver31-tomcat8-openshift-rhel7.json b/...-webserver31-tomcat8-openshift-rhel7.json → ...-webserver31-tomcat8-openshift-rhel7.json
diff --git a/...-webserver50-tomcat9-openshift-rhel7.json → ...-webserver50-tomcat9-openshift-rhel7.json b/...-webserver50-tomcat9-openshift-rhel7.json → ...-webserver50-tomcat9-openshift-rhel7.json
diff --git a/...er/templates/jws31-tomcat7-basic-s2i.json → ...er/templates/jws31-tomcat7-basic-s2i.json b/...er/templates/jws31-tomcat7-basic-s2i.json → ...er/templates/jws31-tomcat7-basic-s2i.json
diff --git a/...er/templates/jws31-tomcat7-https-s2i.json → ...er/templates/jws31-tomcat7-https-s2i.json b/...er/templates/jws31-tomcat7-https-s2i.json → ...er/templates/jws31-tomcat7-https-s2i.json
diff --git a/...jws31-tomcat7-mongodb-persistent-s2i.json → ...jws31-tomcat7-mongodb-persistent-s2i.json b/...jws31-tomcat7-mongodb-persistent-s2i.json → ...jws31-tomcat7-mongodb-persistent-s2i.json
diff --git a/.../templates/jws31-tomcat7-mongodb-s2i.json → .../templates/jws31-tomcat7-mongodb-s2i.json b/.../templates/jws31-tomcat7-mongodb-s2i.json → .../templates/jws31-tomcat7-mongodb-s2i.json
diff --git a/...s/jws31-tomcat7-mysql-persistent-s2i.json → ...s/jws31-tomcat7-mysql-persistent-s2i.json b/...s/jws31-tomcat7-mysql-persistent-s2i.json → ...s/jws31-tomcat7-mysql-persistent-s2i.json
diff --git a/...er/templates/jws31-tomcat7-mysql-s2i.json → ...er/templates/jws31-tomcat7-mysql-s2i.json b/...er/templates/jws31-tomcat7-mysql-s2i.json → ...er/templates/jws31-tomcat7-mysql-s2i.json
diff --git a/...31-tomcat7-postgresql-persistent-s2i.json → ...31-tomcat7-postgresql-persistent-s2i.json b/...31-tomcat7-postgresql-persistent-s2i.json → ...31-tomcat7-postgresql-persistent-s2i.json
diff --git a/...mplates/jws31-tomcat7-postgresql-s2i.json → ...mplates/jws31-tomcat7-postgresql-s2i.json b/...mplates/jws31-tomcat7-postgresql-s2i.json → ...mplates/jws31-tomcat7-postgresql-s2i.json
diff --git a/...er/templates/jws31-tomcat8-basic-s2i.json → ...er/templates/jws31-tomcat8-basic-s2i.json b/...er/templates/jws31-tomcat8-basic-s2i.json → ...er/templates/jws31-tomcat8-basic-s2i.json
diff --git a/...er/templates/jws31-tomcat8-https-s2i.json → ...er/templates/jws31-tomcat8-https-s2i.json b/...er/templates/jws31-tomcat8-https-s2i.json → ...er/templates/jws31-tomcat8-https-s2i.json
diff --git a/...jws31-tomcat8-mongodb-persistent-s2i.json → ...jws31-tomcat8-mongodb-persistent-s2i.json b/...jws31-tomcat8-mongodb-persistent-s2i.json → ...jws31-tomcat8-mongodb-persistent-s2i.json
diff --git a/.../templates/jws31-tomcat8-mongodb-s2i.json → .../templates/jws31-tomcat8-mongodb-s2i.json b/.../templates/jws31-tomcat8-mongodb-s2i.json → .../templates/jws31-tomcat8-mongodb-s2i.json
diff --git a/...s/jws31-tomcat8-mysql-persistent-s2i.json → ...s/jws31-tomcat8-mysql-persistent-s2i.json b/...s/jws31-tomcat8-mysql-persistent-s2i.json → ...s/jws31-tomcat8-mysql-persistent-s2i.json
diff --git a/...er/templates/jws31-tomcat8-mysql-s2i.json → ...er/templates/jws31-tomcat8-mysql-s2i.json b/...er/templates/jws31-tomcat8-mysql-s2i.json → ...er/templates/jws31-tomcat8-mysql-s2i.json
diff --git a/...31-tomcat8-postgresql-persistent-s2i.json → ...31-tomcat8-postgresql-persistent-s2i.json b/...31-tomcat8-postgresql-persistent-s2i.json → ...31-tomcat8-postgresql-persistent-s2i.json
diff --git a/...er/templates/jws50-tomcat9-basic-s2i.json → ...er/templates/jws50-tomcat9-basic-s2i.json b/...er/templates/jws50-tomcat9-basic-s2i.json → ...er/templates/jws50-tomcat9-basic-s2i.json
diff --git a/...er/templates/jws50-tomcat9-https-s2i.json → ...er/templates/jws50-tomcat9-https-s2i.json b/...er/templates/jws50-tomcat9-https-s2i.json → ...er/templates/jws50-tomcat9-https-s2i.json
diff --git a/...jws50-tomcat9-mongodb-persistent-s2i.json → ...jws50-tomcat9-mongodb-persistent-s2i.json b/...jws50-tomcat9-mongodb-persistent-s2i.json → ...jws50-tomcat9-mongodb-persistent-s2i.json
diff --git a/.../templates/jws50-tomcat9-mongodb-s2i.json → .../templates/jws50-tomcat9-mongodb-s2i.json b/.../templates/jws50-tomcat9-mongodb-s2i.json → .../templates/jws50-tomcat9-mongodb-s2i.json
diff --git a/...s/jws50-tomcat9-mysql-persistent-s2i.json → ...s/jws50-tomcat9-mysql-persistent-s2i.json b/...s/jws50-tomcat9-mysql-persistent-s2i.json → ...s/jws50-tomcat9-mysql-persistent-s2i.json
diff --git a/...er/templates/jws50-tomcat9-mysql-s2i.json → ...er/templates/jws50-tomcat9-mysql-s2i.json b/...er/templates/jws50-tomcat9-mysql-s2i.json → ...er/templates/jws50-tomcat9-mysql-s2i.json
diff --git a/...50-tomcat9-postgresql-persistent-s2i.json → ...50-tomcat9-postgresql-persistent-s2i.json b/...50-tomcat9-postgresql-persistent-s2i.json → ...50-tomcat9-postgresql-persistent-s2i.json