Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1990988: Refreshing samples for OCP 4.9 #381

Merged
merged 1 commit into from Aug 13, 2021
Merged

Bug 1990988: Refreshing samples for OCP 4.9 #381

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 22 additions & 2 deletions assets/operator/ocp-aarch64/mariadb/imagestreams/mariadb-rhel-aarch64.json
View file
Open in desktop
Expand Up @@ -16,15 +16,15 @@
{
"name": "latest",
"annotations": {
"description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.",
"description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.",
"iconClass": "icon-mariadb",
"openshift.io/display-name": "MariaDB (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,mariadb"
},
"from": {
"kind": "ImageStreamTag",
"name": "10.3-el8"
"name": "10.5-el8"
},
"generation": null,
"importPolicy": {},
Expand All @@ -51,6 +51,26 @@
"referencePolicy": {
"type": "Local"
}
},
{
"name": "10.5-el8",
"annotations": {
"description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.",
"iconClass": "icon-mariadb",
"openshift.io/display-name": "MariaDB 10.5 (RHEL 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,mariadb",
"version": "10.5"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhel8/mariadb-105:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
},
Expand Down
22 changes: 0 additions & 22 deletions assets/operator/ocp-aarch64/nginx/imagestreams/nginx-rhel-aarch64.json
View file
Open in desktop
Expand Up @@ -77,28 +77,6 @@
"referencePolicy": {
"type": "Local"
}
},
{
"name": "1.14-el8",
"annotations": {
"description": "Build and serve static content via Nginx HTTP server and a reverse proxy (nginx) on RHEL 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.14/README.md.",
"iconClass": "icon-nginx",
"openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.14 (RHEL 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/nginx-ex.git",
"supports": "nginx",
"tags": "builder,nginx",
"version": "1.14"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhel8/nginx-114:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
},
Expand Down
20 changes: 10 additions & 10 deletions assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json
View file
Open in desktop
Expand Up @@ -56,19 +56,19 @@
}
},
{
"name": "12-ubi8",
"name": "14-ubi8-minimal",
"annotations": {
"description": "Build and run Node.js 12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.",
"description": "Build and run Node.js 14 applications on UBI 8 Minimal. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.",
"iconClass": "icon-nodejs",
"openshift.io/display-name": "Node.js 12 (UBI 8)",
"openshift.io/display-name": "Node.js 14 (UBI 8 Minimal)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git",
"tags": "builder,nodejs",
"version": "12"
"version": "14"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/nodejs-12:latest"
"name": "registry.redhat.io/ubi8/nodejs-14-minimal:latest"
},
"generation": null,
"importPolicy": {},
Expand All @@ -77,19 +77,19 @@
}
},
{
"name": "10-ubi8",
"name": "12-ubi8",
"annotations": {
"description": "Build and run Node.js 10 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/10/README.md.",
"description": "Build and run Node.js 12 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/12/README.md.",
"iconClass": "icon-nodejs",
"openshift.io/display-name": "Node.js 10 (UBI 8)",
"openshift.io/display-name": "Node.js 12 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git",
"tags": "builder,nodejs",
"version": "10"
"version": "12"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/nodejs-10:latest"
"name": "registry.redhat.io/ubi8/nodejs-12:latest"
},
"generation": null,
"importPolicy": {},
Expand Down
4 changes: 2 additions & 2 deletions assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-example.json
View file
Open in desktop
Expand Up @@ -422,8 +422,8 @@
{
"name": "NODEJS_VERSION",
"displayName": "Version of NodeJS Image",
"description": "Version of NodeJS image to be used (10-ubi8, 12-ubi8, or latest).",
"value": "12-ubi8",
"description": "Version of NodeJS image to be used (12-ubi8, 14-ubi8, or latest).",
"value": "14-ubi8",
"required": true
},
{
Expand Down
6 changes: 3 additions & 3 deletions assets/operator/ocp-aarch64/nodejs/templates/nodejs-postgresql-persistent.json
View file
Open in desktop
Expand Up @@ -383,7 +383,7 @@
},
"volumeMounts": [
{
"mountPath": "/var/lib/postgresql/data",
"mountPath": "/var/lib/pgsql/data",
"name": "${DATABASE_SERVICE_NAME}-data"
}
]
Expand Down Expand Up @@ -439,8 +439,8 @@
{
"name": "NODEJS_VERSION",
"displayName": "Version of NodeJS Image",
"description": "Version of NodeJS image to be used (10-ubi8, 12-ubi8, or latest).",
"value": "12-ubi8",
"description": "Version of NodeJS image to be used (12-ubi8, 14-ubi8, or latest).",
"value": "14-ubi8",
"required": true
},
{
Expand Down
22 changes: 0 additions & 22 deletions assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json
View file
Open in desktop
Expand Up @@ -77,28 +77,6 @@
"referencePolicy": {
"type": "Local"
}
},
{
"name": "7.2-ubi8",
"annotations": {
"description": "Build and run PHP 7.2 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/7.2/README.md.",
"iconClass": "icon-php",
"openshift.io/display-name": "PHP 7.2 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git",
"supports": "php:7.2,php",
"tags": "builder,php",
"version": "7.2"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/php-72:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
},
Expand Down
22 changes: 21 additions & 1 deletion assets/operator/ocp-aarch64/postgresql/imagestreams/postgresql-rhel-aarch64.json
View file
Open in desktop
Expand Up @@ -24,7 +24,27 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "12-el8"
"name": "13-el8"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "13-el8",
"annotations": {
"description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
"iconClass": "icon-postgresql",
"openshift.io/display-name": "PostgreSQL 13 (RHEL 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,postgresql",
"version": "13"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhel8/postgresql-13:latest"
},
"generation": null,
"importPolicy": {},
Expand Down
26 changes: 24 additions & 2 deletions assets/operator/ocp-aarch64/python/imagestreams/python-rhel-aarch64.json
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
{
"name": "latest",
"annotations": {
"description": "Build and run Python applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.8/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Python available on OpenShift, including major version updates.",
"description": "Build and run Python applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.9/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Python available on OpenShift, including major version updates.",
"iconClass": "icon-python",
"openshift.io/display-name": "Python (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
Expand All @@ -26,7 +26,29 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "3.8-ubi8"
"name": "3.9-ubi8"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "3.9-ubi8",
"annotations": {
"description": "Build and run Python 3.9 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.9/README.md.",
"iconClass": "icon-python",
"openshift.io/display-name": "Python 3.9 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/django-ex.git",
"supports": "python:3.9,python",
"tags": "builder,python",
"version": "3.9"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/python-39:latest"
},
"generation": null,
"importPolicy": {},
Expand Down
44 changes: 42 additions & 2 deletions assets/operator/ocp-ppc64le/mariadb/imagestreams/mariadb-rhel.json
View file
Open in desktop
Expand Up @@ -16,15 +16,15 @@
{
"name": "latest",
"annotations": {
"description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.",
"description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.",
"iconClass": "icon-mariadb",
"openshift.io/display-name": "MariaDB (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,mariadb"
},
"from": {
"kind": "ImageStreamTag",
"name": "10.3-el8"
"name": "10.5-el8"
},
"generation": null,
"importPolicy": {},
Expand Down Expand Up @@ -91,6 +91,46 @@
"referencePolicy": {
"type": "Local"
}
},
{
"name": "10.5-el7",
"annotations": {
"description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.",
"iconClass": "icon-mariadb",
"openshift.io/display-name": "MariaDB 10.5 (RHEL 7)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,mariadb",
"version": "10.5"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "10.5-el8",
"annotations": {
"description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.",
"iconClass": "icon-mariadb",
"openshift.io/display-name": "MariaDB 10.5 (RHEL 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"tags": "database,mariadb",
"version": "10.5"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/rhel8/mariadb-105:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
},
Expand Down
60 changes: 0 additions & 60 deletions assets/operator/ocp-ppc64le/mongodb/imagestreams/mongodb-rhel7.json
View file
Open in desktop

This file was deleted.